aboutsummaryrefslogtreecommitdiff
path: root/crypto/modes
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/modes
parentf97a8af2f3f3573f0759693117c9d33d2a63c27e (diff)
downloadopenssl-64fd90fbe99dde18de3fc7c3a6b06793d87a4aad.zip
openssl-64fd90fbe99dde18de3fc7c3a6b06793d87a4aad.tar.gz
openssl-64fd90fbe99dde18de3fc7c3a6b06793d87a4aad.tar.bz2
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/modes')
-rw-r--r--crypto/modes/build.info6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/modes/build.info b/crypto/modes/build.info
index 4ae0d8b..b741be8 100644
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -52,10 +52,14 @@ $COMMON=cbc128.c ctr128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c \
wrap128.c $MODESASM
SOURCE[../../libcrypto]=$COMMON \
cts128.c ocb128.c siv128.c
+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]=$MODESDEF
-SOURCE[../../providers/libfips.a]=$COMMON
DEFINE[../../providers/libfips.a]=$MODESDEF
+DEFINE[../../providers/libimplementations.a]=$MODESDEF
+
INCLUDE[gcm128.o]=..