Restore previous behaviour of only running one algorithm when -evp alg is used.

Submitted by: Eric Young <eay@pobox.com>
Reviewed-by: Ben Laurie <ben@openssl.org>

diff --git a/apps/speed.c b/apps/speed.c
index 49efa7b4c9dbcc374b33dff91de1dafa6cfb056f..b4722f1a95b76bf75b22d0ffd66797870d3b451d 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -944,7 +944,7 @@ int speed_main(int argc, char **argv)
 #endif
 
     /* No parameters; turn on everything. */
 #endif
 
     /* No parameters; turn on everything. */

-    if (argc == 0) {
+    if ((argc == 0) && !doit[D_EVP]) {

         for (i = 0; i < ALGOR_NUM; i++)
             if (i != D_EVP)
                 doit[i] = 1;
         for (i = 0; i < ALGOR_NUM; i++)
             if (i != D_EVP)
                 doit[i] = 1;