[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  9ae4e664da0692f27bfe0d1a34db29ed815203c8 (commit)
      from  66e59702f1effae94e88e3e586e9b736151d8d98 (commit)


- Log -----------------------------------------------------------------
commit 9ae4e664da0692f27bfe0d1a34db29ed815203c8
Author: Jonathan Protzenko <protz at microsoft.com>
Date:   Wed May 17 09:09:01 2017 -0700

    Fix speed command for alternation of ciphers and digests.
    
    CLA: trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3487)

-----------------------------------------------------------------------

Summary of changes:
 apps/speed.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/speed.c b/apps/speed.c
index f64bea9..ee55bfd 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());