[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  cd3fe0e09c97700005ed96c8113907cbdfc45edf (commit)
      from  7d9533bfa2fe5a5bf2bb19ff6c70558f6caeb92d (commit)


- Log -----------------------------------------------------------------
commit cd3fe0e09c97700005ed96c8113907cbdfc45edf
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Dec 16 04:15:02 2016 +0100

    evp_test: when function and reason strings aren't available, just skip
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2093)

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

Summary of changes:
 test/evp_test.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/evp_test.c b/test/evp_test.c
index e52ff0c..b6a7c28 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -372,6 +372,12 @@ static int check_test_error(struct evp_test *t)
     func = ERR_func_error_string(err);
     reason = ERR_reason_error_string(err);
 
+    if (func == NULL && reason == NULL) {
+        fprintf(stderr, "Test line %d: expected error \"%s:%s\", no strings available.  Skipping...\n",
+                t->start_line, t->func, t->reason);
+        return 1;
+    }
+
     if (strcmp(func, t->func) == 0 && strcmp(reason, t->reason) == 0)
         return 1;