mirror of
https://github.com/openssl/openssl.git
synced 2024-11-24 02:23:51 +08:00
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)
This commit is contained in:
parent
15821a48e5
commit
33c09341bb
14
apps/speed.c
14
apps/speed.c
@ -3950,12 +3950,22 @@ skip_hmac:
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (k = 0; k < ALGOR_NUM; k++) {
|
for (k = 0; k < ALGOR_NUM; k++) {
|
||||||
|
const char *alg_name = names[k];
|
||||||
|
|
||||||
if (!doit[k])
|
if (!doit[k])
|
||||||
continue;
|
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)
|
if (mr)
|
||||||
printf("+F:%u:%s", k, names[k]);
|
printf("+F:%u:%s", k, alg_name);
|
||||||
else
|
else
|
||||||
printf("%-13s", names[k]);
|
printf("%-13s", alg_name);
|
||||||
for (testnum = 0; testnum < size_num; testnum++) {
|
for (testnum = 0; testnum < size_num; testnum++) {
|
||||||
if (results[k][testnum] > 10000 && !mr)
|
if (results[k][testnum] > 10000 && !mr)
|
||||||
printf(" %11.2fk", results[k][testnum] / 1e3);
|
printf(" %11.2fk", results[k][testnum] / 1e3);
|
||||||
|
Loading…
Reference in New Issue
Block a user