[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  8a0f65f06b0b0fa0411175bcd764c818d9c52469 (commit)
      from  d0364dcc42b151cfc08d860efb15cd48d87302c6 (commit)


- Log -----------------------------------------------------------------
commit 8a0f65f06b0b0fa0411175bcd764c818d9c52469
Author: Juergen Christ <jchrist at linux.ibm.com>
Date:   Wed May 12 13:54:20 2021 +0200

    Fix provider library build wrt. AES
    
    Commit c7978e506b2d1300accd9e696656f9cc94196e6d ("Fix missing $CPUIDDEF in
    libdefault.a") revealed another problem in the build system on s390.  The
    build of the provider libraries includes the AES system without the proper
    defines.  This causes a build error on s390 now since the CPUIDDEF is present
    but the prototypes for various AES functions implemented in assembler are
    missing due to missing preprocessor defines.  Fix this by adding the missing
    defines to all provider libraries.
    
    Signed-off-by: Juergen Christ <jchrist at linux.ibm.com>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15244)

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

Summary of changes:
 crypto/aes/build.info | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index b17f7e5c1f..edf6c8106e 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -71,6 +71,13 @@ SOURCE[../../providers/libfips.a]=$COMMON
 DEFINE[../../libcrypto]=$AESDEF
 DEFINE[../../providers/libfips.a]=$AESDEF
 DEFINE[../../providers/libdefault.a]=$AESDEF
+# We only need to include the AESDEF stuff in the legacy provider when it's a
+# separate module and it's dynamically linked with libcrypto.  Otherwise, it
+# already gets everything that the static libcrypto.a has, and doesn't need it
+# added again.
+IF[{- !$disabled{module} && !$disabled{shared} -}]
+  DEFINE[../providers/liblegacy.a]=$AESDEF
+ENDIF
 
 GENERATE[aes-ia64.s]=asm/aes-ia64.S
 GENERATE[bsaes-armv8.S]=asm/bsaes-armv8.S