[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  ebacf25ae33639257665c929f3a3a08c3618dfdb (commit)
      from  a892766934c8e1b9de5645c526716efe4b14a133 (commit)


- Log -----------------------------------------------------------------
commit ebacf25ae33639257665c929f3a3a08c3618dfdb
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)
    
    (cherry picked from commit 9ae4e664da0692f27bfe0d1a34db29ed815203c8)

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

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

diff --git a/apps/speed.c b/apps/speed.c
index a736969..e98fea3 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -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());