diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-26 17:57:16 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-01 14:39:54 +0200 |
| commit | 5050fd5b3b7d18eec966469726180efb6c72c594 (patch) | |
| tree | e053f3428efc6a235a8a5aadea37cb4a1dade30a /apps/speed.c | |
| parent | b064eebb5080178de9641a0520e2f22b5846e0f3 (diff) | |
| download | openssl-5050fd5b3b7d18eec966469726180efb6c72c594.zip openssl-5050fd5b3b7d18eec966469726180efb6c72c594.tar.gz openssl-5050fd5b3b7d18eec966469726180efb6c72c594.tar.bz2 | |
Avoid going through NID when unnecessary
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14703)
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/speed.c b/apps/speed.c index 727341a..25c384d 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1758,7 +1758,7 @@ int speed_main(int argc, char **argv) } else if (!(EVP_CIPHER_flags(evp_cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) { BIO_printf(bio_err, "%s is not an AEAD cipher\n", - OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher))); + EVP_CIPHER_name(evp_cipher)); goto end; } } @@ -1770,7 +1770,7 @@ int speed_main(int argc, char **argv) } else if (!(EVP_CIPHER_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { BIO_printf(bio_err, "%s is not a multi-block capable\n", - OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher))); + EVP_CIPHER_name(evp_cipher)); goto end; } else if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with -mb"); @@ -2219,7 +2219,7 @@ int speed_main(int argc, char **argv) goto end; } - names[D_EVP] = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)); + names[D_EVP] = EVP_CIPHER_name(evp_cipher); if (EVP_CIPHER_mode(evp_cipher) == EVP_CIPH_CCM_MODE) { loopfunc = EVP_Update_loop_ccm; @@ -3633,7 +3633,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single, if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY, sizeof(no_key), no_key)) app_bail_out("failed to set AEAD key\n"); - if ((alg_name = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher))) == NULL) + if ((alg_name = EVP_CIPHER_name(evp_cipher)) == NULL) app_bail_out("failed to get cipher name\n"); for (j = 0; j < num; j++) { |