From: Richard Levitte <levitte@openssl.org>
Date: Sat, 28 Jan 2017 23:08:01 +0000 (+0100)
Subject: test/evp_test.c: If no algorithm was specified, don't try to check for DES
X-Git-Tag: OpenSSL_1_1_1-pre1~2587
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31b69e9a26c5b127ce273bc5834b9e13e5e25556;p=oweals%2Fopenssl.git

test/evp_test.c: If no algorithm was specified, don't try to check for DES

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2319)
---

diff --git a/test/evp_test.c b/test/evp_test.c
index e1a5f14328..b924f833a0 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;