[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/evp Don't define the...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99374828242f
branches:  trunk
changeset: 321280:99374828242f
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 09 01:33:57 2018 +0000

description:
Don't define the v8 functions for v7!

diffstat:

 crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 1810c919665d -r 99374828242f crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
--- a/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c       Thu Mar 08 23:27:12 2018 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c       Fri Mar 09 01:33:57 2018 +0000
@@ -981,13 +981,15 @@
 
 #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