Fix speed command for alternation of ciphers and digests.
authorJonathan Protzenko <protz@microsoft.com>
Wed, 17 May 2017 16:09:01 +0000 (09:09 -0700)
committerRich Salz <rsalz@openssl.org>
Fri, 9 Jun 2017 16:54:03 +0000 (12:54 -0400)
CLA: trivial

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3487)

(cherry picked from commit 9ae4e664da0692f27bfe0d1a34db29ed815203c8)

apps/speed.c

index a73696946f0771c4bde9e9905aeafa2785f8633d..e98fea3b2aaa2935579ef5a0ff57ac4588b88d71 100644 (file)
@@ -1378,6 +1378,7 @@ int speed_main(int argc, char **argv)
             usertime = 0;
             break;
         case OPT_EVP:
+            evp_md = NULL;
             evp_cipher = EVP_get_cipherbyname(opt_arg());
             if (evp_cipher == NULL)
                 evp_md = EVP_get_digestbyname(opt_arg());