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

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  1968ea9850f7e50609284756ca78e465e5ee4fb9 (commit)
      from  b649ffcaea38864270ad6c2362ed0ef639749707 (commit)


- Log -----------------------------------------------------------------
commit 1968ea9850f7e50609284756ca78e465e5ee4fb9
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)
    (cherry picked from commit 31b69e9a26c5b127ce273bc5834b9e13e5e25556)

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

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 02ae0a5..f6cec05 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -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;