diff options
author | Jörg Sommer <joerg@jo-so.de> | 2023-06-15 18:16:49 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-06-28 11:05:14 +0200 |
commit | 33c09341bb081682535be0450ff6032df47ea141 (patch) | |
tree | b02dc3c34ca47e9d65c6f5cef91762219b94cc06 /apps | |
parent | 15821a48e558d595895fc8cf1c9c038d7c455550 (diff) |
openssl speed -multi -evp prints wrong algorithm name
When running `openssl speed -evp md5` the result shows `md5` as algorithm
name. But when adding the option `-multi 2` it gives `evp` as algorithm
name.
Signed-off-by: Jörg Sommer <joerg@jo-so.de>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21216)
Diffstat (limited to 'apps')
-rw-r--r-- | apps/speed.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/speed.c b/apps/speed.c index de4f9994db..b7804096c4 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -3950,12 +3950,22 @@ skip_hmac: } for (k = 0; k < ALGOR_NUM; k++) { + const char *alg_name = names[k]; + if (!doit[k]) continue; + + if (k == D_EVP) { + if (evp_cipher == NULL) + alg_name = evp_md_name; + else if ((alg_name = EVP_CIPHER_get0_name(evp_cipher)) == NULL) + app_bail_out("failed to get name of cipher '%s'\n", evp_cipher); + } + if (mr) - printf("+F:%u:%s", k, names[k]); + printf("+F:%u:%s", k, alg_name); else - printf("%-13s", names[k]); + printf("%-13s", alg_name); for (testnum = 0; testnum < size_num; testnum++) { if (results[k][testnum] > 10000 && !mr) printf(" %11.2fk", results[k][testnum] / 1e3); |