commit 485a50ae152d5d709ade0af07749f8ef3fde3a51
author Joel Klinghed <the_jk@opera.com> Fri May 29 15:02:09 2015 +0200
committer Adam Langley <agl@google.com> Tue Jun 02 18:14:41 2015 +0000
tree 151ec6366f1889a0df4a42493bb2a26ff99c2f52
parent e216288109b857ff3b6820e2eebcfe8d660b3d43

Match the ifdef check in bsaes-armv7.S

bsaes-armv7.S implements bsaes_cbc_encrypt if #if __ARM_MAX_ARCH__ >= 7
but e_aes.c instead used #if __ARM_ARCH >= 7 causing duplicate symbols
for linkers that care about that

Change-Id: I10ad8e24be75fdc03b0670869a53078b0477950b
Reviewed-on: https://boringssl-review.googlesource.com/4943
Reviewed-by: Adam Langley <agl@google.com>

crypto/cipher/e_aes.c

diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c
index eacbd10..41d0aec 100644
--- a/crypto/cipher/e_aes.c
+++ b/crypto/cipher/e_aes.c
@@ -115,7 +115,7 @@
     (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64))
 #include "../arm_arch.h"
 
-#if defined(OPENSSL_ARM) && __ARM_ARCH__ >= 7
+#if defined(OPENSSL_ARM) && __ARM_MAX_ARCH__ >= 7
 #define BSAES
 static char bsaes_capable(void) {
   return CRYPTO_is_NEON_capable();