summaryrefslogtreecommitdiff
path: root/linux-arm
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-10-30 13:15:30 -0700
committerAdam Langley <agl@google.com>2015-10-30 13:39:01 -0700
commitfdeb488e6332a17729db5a04236e48a46a019272 (patch)
treeb4e43f0c1d2161af97e2b7e030644ca1d54a839c /linux-arm
parent6e19d4dc059301bed57d7dae7750c69fecb51b15 (diff)
downloadboringssl-fdeb488e6332a17729db5a04236e48a46a019272.tar.gz
external/boringssl: sync with upstream.
See the following URL for a list of the changes included in this sync: https://boringssl.googlesource.com/boringssl/+log/d98dc1311e20193ac188e359e91aeaaf5cc3a7e2..51a01a5cd44b3bdfab5220847000f13fc85f000b Change-Id: I36535827f652536dfd687c1646bbea1535fc8e44
Diffstat (limited to 'linux-arm')
-rw-r--r--linux-arm/crypto/aes/bsaes-armv7.S2
-rw-r--r--linux-arm/crypto/modes/ghash-armv4.S3
2 files changed, 0 insertions, 5 deletions
diff --git a/linux-arm/crypto/aes/bsaes-armv7.S b/linux-arm/crypto/aes/bsaes-armv7.S
index 85262d58..a3ebec88 100644
--- a/linux-arm/crypto/aes/bsaes-armv7.S
+++ b/linux-arm/crypto/aes/bsaes-armv7.S
@@ -47,7 +47,6 @@
@
@ <ard.biesheuvel@linaro.org>
-#if defined(__arm__)
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
@@ -2575,5 +2574,4 @@ bsaes_xts_decrypt:
.size bsaes_xts_decrypt,.-bsaes_xts_decrypt
#endif
-#endif
#endif \ No newline at end of file
diff --git a/linux-arm/crypto/modes/ghash-armv4.S b/linux-arm/crypto/modes/ghash-armv4.S
index f868c2d5..0a43989e 100644
--- a/linux-arm/crypto/modes/ghash-armv4.S
+++ b/linux-arm/crypto/modes/ghash-armv4.S
@@ -1,5 +1,4 @@
#if defined(__arm__)
-#if defined(__arm__)
#include <openssl/arm_arch.h>
.syntax unified
@@ -536,6 +535,4 @@ gcm_ghash_neon:
.byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
.align 2
.align 2
-
-#endif
#endif \ No newline at end of file