[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  18caaa2ec41246267fc3e59160dbc19301d988a1 (commit)
      from  f816aa47ac140c3d083416aa9c1c396096d9a92c (commit)


- Log -----------------------------------------------------------------
commit 18caaa2ec41246267fc3e59160dbc19301d988a1
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Tue Oct 8 17:56:09 2019 +1000

    Fix CMP test error on platforms which set OPENSSL_FUNC to '(unknown function)'
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10119)

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

Summary of changes:
 test/cmp_ctx_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c
index 16ce9c5c7e..3c8d75f4e0 100644
--- a/test/cmp_ctx_test.c
+++ b/test/cmp_ctx_test.c
@@ -240,7 +240,8 @@ static int test_log_cb(const char *func, const char *file, int line,
 {
     test_log_cb_res =
 # ifndef PEDANTIC
-        strcmp(func, "execute_cmp_ctx_log_cb_test") == 0 &&
+        (strcmp(func, "execute_cmp_ctx_log_cb_test") == 0
+         || strcmp(func, "(unknown function)") == 0) &&
 # endif
         (strcmp(file, OPENSSL_FILE) == 0 || strcmp(file, "(no file)") == 0)
         && (line == test_log_line || line == 0)