Module Name: src
Committed By: christos
Date: Fri Mar 9 01:33:58 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
Log Message:
Don't define the v8 functions for v7!
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
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.13 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.14
--- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.13 Wed Mar 7 11:06:29 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Thu Mar 8 20:33:57 2018
@@ -981,13 +981,15 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m
#if defined(OPENSSL_CPUID_OBJ) && defined(AES_ASM) && (defined(__arm__) || defined(__arm) || defined(__aarch64__))
# include "arm_arch.h"
-# if __ARM_MAX_ARCH__>=7
+# if __ARM_MAX_ARCH__>= 7
# if defined(BSAES_ASM)
# define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
# endif
# if defined(VPAES_ASM)
# define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
# endif
+# endif
+# if __ARM_MAX_ARCH__>= 8
# define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
# define HWAES_set_encrypt_key aes_v8_set_encrypt_key
# define HWAES_set_decrypt_key aes_v8_set_decrypt_key
