kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Match the ifdef check in bsaes-armv7.S

Browse Source 
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>
This commit is contained in:
Joel Klinghed 2015-05-29 15:02:09 +02:00 committed by Adam Langley
parent e216288109
commit 485a50ae15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/cipher/e_aes.c
View File

@ -115,7 +115,7 @@ static char bsaes_capable(void) {
(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();