summaryrefslogtreecommitdiff
path: root/crypto/aes
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2019-10-15 12:35:41 +1000
committerShane Lontis <shane.lontis@oracle.com>2019-10-16 16:10:39 +1000
commit64fd90fbe99dde18de3fc7c3a6b06793d87a4aad (patch)
tree8c1870ea8b90719689752e9fccd2f919bf67dc84 /crypto/aes
parentf97a8af2f3f3573f0759693117c9d33d2a63c27e (diff)
downloadopenssl-new-64fd90fbe99dde18de3fc7c3a6b06793d87a4aad.tar.gz
Fix missing Assembler defines
Implementations are now spread across several libraries, so the assembler related defines need to be applied to all affected libraries and modules. AES_ASM define was missing from libimplementations.a which disabled AESNI aarch64 changes were made by xkqian. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10180)
Diffstat (limited to 'crypto/aes')
-rw-r--r--crypto/aes/build.info8
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index 59c009761e..291bf2af9b 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -61,9 +61,15 @@ ENDIF
$COMMON=aes_misc.c aes_ecb.c $AESASM
SOURCE[../../libcrypto]=$COMMON aes_cfb.c aes_ofb.c aes_ige.c aes_wrap.c
-DEFINE[../../libcrypto]=$AESDEF
SOURCE[../../providers/libfips.a]=$COMMON
+
+# Implementations are now spread across several libraries, so the defines
+# need to be applied to all affected libraries and modules.
+DEFINE[../../libcrypto]=$AESDEF
DEFINE[../../providers/libfips.a]=$AESDEF
+DEFINE[../../providers/libimplementations.a]=$AESDEF
+# fipsprov.c needs access to AESNI.
+DEFINE[../../providers/fips]=$AESDEF
GENERATE[aes-ia64.s]=asm/aes-ia64.S