openssl speed -multi -evp prints wrong algorithm name

[thirdparty/openssl.git] / apps / speed.c

diff --git a/apps/speed.c b/apps/speed.c
index de4f9994db3b798718c93ad63500d10c27c027cd..b7804096c4c7173ef0edf5f132a16111dc159d07 100644 (file)
--- 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);