test/evp_test.c: If no algorithm was specified, don't try to check for DES
authorRichard Levitte <levitte@openssl.org>
Sat, 28 Jan 2017 23:08:01 +0000 (00:08 +0100)
committerRichard Levitte <levitte@openssl.org>
Sun, 29 Jan 2017 00:41:26 +0000 (01:41 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2319)
(cherry picked from commit 31b69e9a26c5b127ce273bc5834b9e13e5e25556)

test/evp_test.c

index 02ae0a5b8055702b42b492ef71cc8027d6823b4c..f6cec05c10e8006e020d97ed6571a0859bb7b3cc 100644 (file)
@@ -1245,7 +1245,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;