Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openssl 3 performance #646

Closed
wants to merge 1 commit into from
Closed

openssl 3 performance #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 28 additions & 25 deletions crypto/cipher/aes_gcm_ossl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,6 @@ static srtp_err_status_t srtp_aes_gcm_openssl_alloc(srtp_cipher_t **c,
return (srtp_err_status_alloc_fail);
}

gcm->ctx = EVP_CIPHER_CTX_new();
if (gcm->ctx == NULL) {
srtp_crypto_free(gcm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

/* set pointers */
(*c)->state = gcm;

/* setup cipher attributes */
switch (key_len) {
case SRTP_AES_GCM_128_KEY_LEN_WSALT:
Expand All @@ -140,6 +129,32 @@ static srtp_err_status_t srtp_aes_gcm_openssl_alloc(srtp_cipher_t **c,
/* set key size */
(*c)->key_len = key_len;

/* fetch cipher*/
if ((*c)->algorithm == SRTP_AES_GCM_128) {
gcm->cipher = EVP_CIPHER_fetch(NULL, "AES-128-GCM", NULL);
} else {
gcm->cipher = EVP_CIPHER_fetch(NULL, "AES-256-GCM", NULL);
}

if (gcm->cipher == NULL) {
srtp_crypto_free(gcm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

gcm->ctx = EVP_CIPHER_CTX_new();
if (gcm->ctx == NULL) {
EVP_CIPHER_free(gcm->cipher);
srtp_crypto_free(gcm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

/* set pointers */
(*c)->state = gcm;

return (srtp_err_status_ok);
}

Expand All @@ -153,6 +168,7 @@ static srtp_err_status_t srtp_aes_gcm_openssl_dealloc(srtp_cipher_t *c)
ctx = (srtp_aes_gcm_ctx_t *)c->state;
if (ctx) {
EVP_CIPHER_CTX_free(ctx->ctx);
EVP_CIPHER_free(ctx->cipher);
/* zeroize the key material */
octet_string_set_to_zero(ctx, sizeof(srtp_aes_gcm_ctx_t));
srtp_crypto_free(ctx);
Expand All @@ -174,28 +190,15 @@ static srtp_err_status_t srtp_aes_gcm_openssl_context_init(void *cv,
const uint8_t *key)
{
srtp_aes_gcm_ctx_t *c = (srtp_aes_gcm_ctx_t *)cv;
const EVP_CIPHER *evp;

c->dir = srtp_direction_any;

debug_print(srtp_mod_aes_gcm, "key: %s",
srtp_octet_string_hex_string(key, c->key_size));

switch (c->key_size) {
case SRTP_AES_256_KEY_LEN:
evp = EVP_aes_256_gcm();
break;
case SRTP_AES_128_KEY_LEN:
evp = EVP_aes_128_gcm();
break;
default:
return (srtp_err_status_bad_param);
break;
}

EVP_CIPHER_CTX_reset(c->ctx);

if (!EVP_CipherInit_ex(c->ctx, evp, NULL, key, NULL, 0)) {
if (!EVP_CipherInit_ex(c->ctx, c->cipher, NULL, key, NULL, 0)) {
return (srtp_err_status_init_fail);
}

Expand Down
57 changes: 29 additions & 28 deletions crypto/cipher/aes_icm_ossl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,6 @@ static srtp_err_status_t srtp_aes_icm_openssl_alloc(srtp_cipher_t **c,
return srtp_err_status_alloc_fail;
}

icm->ctx = EVP_CIPHER_CTX_new();
if (icm->ctx == NULL) {
srtp_crypto_free(icm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

/* set pointers */
(*c)->state = icm;

/* setup cipher parameters */
switch (key_len) {
case SRTP_AES_ICM_128_KEY_LEN_WSALT:
Expand All @@ -172,6 +161,33 @@ static srtp_err_status_t srtp_aes_icm_openssl_alloc(srtp_cipher_t **c,
/* set key size */
(*c)->key_len = key_len;

/* fetch cipher*/
if ((*c)->algorithm == SRTP_AES_ICM_128) {
icm->cipher = EVP_CIPHER_fetch(NULL, "AES-128-CTR", NULL);
} else if ((*c)->algorithm == SRTP_AES_ICM_192) {
icm->cipher = EVP_CIPHER_fetch(NULL, "AES-192-CTR", NULL);
} else {
icm->cipher = EVP_CIPHER_fetch(NULL, "AES-256-CTR", NULL);
}
if (icm->cipher == NULL) {
srtp_crypto_free(icm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

icm->ctx = EVP_CIPHER_CTX_new();
if (icm->ctx == NULL) {
EVP_CIPHER_free(icm->cipher);
srtp_crypto_free(icm);
srtp_crypto_free(*c);
*c = NULL;
return srtp_err_status_alloc_fail;
}

/* set pointers */
(*c)->state = icm;

return srtp_err_status_ok;
}

Expand All @@ -192,6 +208,7 @@ static srtp_err_status_t srtp_aes_icm_openssl_dealloc(srtp_cipher_t *c)
ctx = (srtp_aes_icm_ctx_t *)c->state;
if (ctx != NULL) {
EVP_CIPHER_CTX_free(ctx->ctx);
EVP_CIPHER_free(ctx->cipher);
/* zeroize the key material */
octet_string_set_to_zero(ctx, sizeof(srtp_aes_icm_ctx_t));
srtp_crypto_free(ctx);
Expand All @@ -216,7 +233,6 @@ static srtp_err_status_t srtp_aes_icm_openssl_context_init(void *cv,
const uint8_t *key)
{
srtp_aes_icm_ctx_t *c = (srtp_aes_icm_ctx_t *)cv;
const EVP_CIPHER *evp;

/*
* set counter and initial values to 'offset' value, being careful not to
Expand All @@ -235,24 +251,9 @@ static srtp_err_status_t srtp_aes_icm_openssl_context_init(void *cv,
srtp_octet_string_hex_string(key, c->key_size));
debug_print(srtp_mod_aes_icm, "offset: %s", v128_hex_string(&c->offset));

switch (c->key_size) {
case SRTP_AES_256_KEY_LEN:
evp = EVP_aes_256_ctr();
break;
case SRTP_AES_192_KEY_LEN:
evp = EVP_aes_192_ctr();
break;
case SRTP_AES_128_KEY_LEN:
evp = EVP_aes_128_ctr();
break;
default:
return srtp_err_status_bad_param;
break;
}

EVP_CIPHER_CTX_reset(c->ctx);

if (!EVP_EncryptInit_ex(c->ctx, evp, NULL, key, NULL)) {
if (!EVP_EncryptInit_ex(c->ctx, c->cipher, NULL, key, NULL)) {
return srtp_err_status_fail;
}

Expand Down
1 change: 1 addition & 0 deletions crypto/include/aes_gcm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
typedef struct {
int key_size;
int tag_len;
EVP_CIPHER * cipher;
EVP_CIPHER_CTX *ctx;
srtp_cipher_direction_t dir;
} srtp_aes_gcm_ctx_t;
Expand Down
1 change: 1 addition & 0 deletions crypto/include/aes_icm_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ typedef struct {
v128_t counter; /* holds the counter value */
v128_t offset; /* initial offset value */
int key_size;
EVP_CIPHER *cipher;
EVP_CIPHER_CTX *ctx;
} srtp_aes_icm_ctx_t;

Expand Down