[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  31b69e9a26c5b127ce273bc5834b9e13e5e25556 (commit)
      from  d2828c8bdba2ec71a352cfc8a170ea2f5a9d0525 (commit)


- Log -----------------------------------------------------------------
commit 31b69e9a26c5b127ce273bc5834b9e13e5e25556
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jan 29 00:08:01 2017 +0100

    test/evp_test.c: If no algorithm was specified, don't try to check for DES
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2319)

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

Summary of changes:
 test/evp_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/evp_test.c b/test/evp_test.c
index e1a5f14..b924f83 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1252,7 +1252,7 @@ static int mac_test_run(struct evp_test *t)
     size_t mac_len;
 
 #ifdef OPENSSL_NO_DES
-    if (strstr(mdata->alg, "DES") != NULL) {
+    if (mdata->alg != NULL && strstr(mdata->alg, "DES") != NULL) {
         /* Skip DES */
         err = NULL;
         goto err;