Module Name: src
Committed By: christos
Date: Wed Mar 7 16:06:29 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
Log Message:
Enable AES_ASM explicitly not by just looking at the processor, like we
do for other archs!
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.12 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.13
--- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.12 Thu Feb 8 16:51:28 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Wed Mar 7 11:06:29 2018
@@ -979,7 +979,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m
#endif
-#if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__))
+#if defined(OPENSSL_CPUID_OBJ) && defined(AES_ASM) && (defined(__arm__) || defined(__arm) || defined(__aarch64__))
# include "arm_arch.h"
# if __ARM_MAX_ARCH__>=7
# if defined(BSAES_ASM)
