summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Protzenko <protz@microsoft.com>2017-05-17 18:09:01 +0200
committerRich Salz <rsalz@openssl.org>2017-06-09 18:46:44 +0200
commit9ae4e664da0692f27bfe0d1a34db29ed815203c8 (patch)
tree04036f3f0ef62e63701b1df1e9b23f31198560c3
parentAdd support for using engine-backed keys in spkac (diff)
downloadopenssl-9ae4e664da0692f27bfe0d1a34db29ed815203c8.tar.xz
openssl-9ae4e664da0692f27bfe0d1a34db29ed815203c8.zip
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)
-rw-r--r--apps/speed.c1
1 files changed, 1 insertions, 0 deletions
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());