diff options
| author | Adam Langley <agl@google.com> | 2015-09-24 10:57:52 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-09-24 11:04:03 -0700 |
| commit | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /linux-arm/crypto/aes/bsaes-armv7.S | |
| parent | 08656b61d075740bfb24ddcce65223146259fc02 (diff) | |
| download | external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2 | |
external/boringssl: sync with upstream.
This change imports the current version of BoringSSL. The only local
change now is that |BORINGSSL_201509| is defined in base.h. This allows
this change to be made without (hopefully) breaking the build.
This change will need https://android-review.googlesource.com/172744 to
be landed afterwards to update a test.
Change-Id: I6d1f463f7785a2423bd846305af91c973c326104
Diffstat (limited to 'linux-arm/crypto/aes/bsaes-armv7.S')
| -rw-r--r-- | linux-arm/crypto/aes/bsaes-armv7.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-arm/crypto/aes/bsaes-armv7.S b/linux-arm/crypto/aes/bsaes-armv7.S index 204ee3e..85262d5 100644 --- a/linux-arm/crypto/aes/bsaes-armv7.S +++ b/linux-arm/crypto/aes/bsaes-armv7.S @@ -1,3 +1,4 @@ +#if defined(__arm__) @ ==================================================================== @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL @@ -48,7 +49,7 @@ #if defined(__arm__) #ifndef __KERNEL__ -# include "arm_arch.h" +# include <openssl/arm_arch.h> # define VFP_ABI_PUSH vstmdb sp!,{d8-d15} # define VFP_ABI_POP vldmia sp!,{d8-d15} @@ -2575,3 +2576,4 @@ bsaes_xts_decrypt: .size bsaes_xts_decrypt,.-bsaes_xts_decrypt #endif #endif +#endif
\ No newline at end of file |