[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  582043dae7c283cb9f116946a7a1df0c53b5f192 (commit)
      from  9c11e8ec1f20959a174b7a8a37da67eecf65d28b (commit)


- Log -----------------------------------------------------------------
commit 582043dae7c283cb9f116946a7a1df0c53b5f192
Author: Pauli <pauli at openssl.org>
Date:   Thu Apr 22 11:04:28 2021 +1000

    Runchecker fix for the no-autoerrinit build
    
    In this case, there was a slight different error output format that wasn't
    being accounted for in the error test.
    
    Fixes #14961
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14976)

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

Summary of changes:
 test/errtest.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/errtest.c b/test/errtest.c
index a5e35d6320..1d4a708e07 100644
--- a/test/errtest.c
+++ b/test/errtest.c
@@ -74,8 +74,12 @@ static int test_print_error_format(void)
         goto err;
     }
 
-# ifndef OPENSSL_NO_ERR
+# if !defined(OPENSSL_NO_ERR)
+#  if defined(OPENSSL_NO_AUTOERRINIT)
+    lib = "lib(2)";
+#  else
     lib = "system library";
+#  endif
     reason = strerror(syserr);
 # else
     lib = "lib(2)";