From: Jonathan Protzenko <protz@microsoft.com>
Date: Wed, 17 May 2017 16:09:01 +0000 (-0700)
Subject: Fix speed command for alternation of ciphers and digests.
X-Git-Tag: OpenSSL_1_1_1-pre1~1346
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=9ae4e664da0692f27bfe0d1a34db29ed815203c8;ds=sidebyside

Fix speed command for alternation of ciphers and digests.

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)
---

diff --git a/apps/speed.c b/apps/speed.c
index f64bea9c68..ee55bfdcd7 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1357,6 +1357,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());