summaryrefslogtreecommitdiff
path: root/linux-arm
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2019-10-15 21:48:16 +0100
committerTobias Thierer <tobiast@google.com>2019-10-15 21:48:19 +0100
commitb201fcdfabbaf68f7f382b5d3a82fec8dd879f0b (patch)
tree910683d628405c5aebfb27a0d70e46bfb19b8a7b /linux-arm
parent2b1e39e4167dea92a34e4346895c9d59453d8672 (diff)
downloadboringssl-b201fcdfabbaf68f7f382b5d3a82fec8dd879f0b.tar.gz
external/boringssl: Sync to a7a75f208caea8a303615724d4cc5f4e8dfb9695.
This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/4ca15d5dcbe6e8051a4654df7c971ea8307abfe0..a7a75f208caea8a303615724d4cc5f4e8dfb9695 Test: atest CtsLibcoreTestCases Change-Id: Ie997cc5a7f8f03b271d58b5d89d43f67e4df68b0
Diffstat (limited to 'linux-arm')
-rw-r--r--linux-arm/crypto/chacha/chacha-armv4.S2
-rw-r--r--linux-arm/crypto/fipsmodule/aes-armv4.S2
-rw-r--r--linux-arm/crypto/fipsmodule/aesv8-armx32.S2
-rw-r--r--linux-arm/crypto/fipsmodule/armv4-mont.S2
-rw-r--r--linux-arm/crypto/fipsmodule/bsaes-armv7.S2
-rw-r--r--linux-arm/crypto/fipsmodule/ghash-armv4.S2
-rw-r--r--linux-arm/crypto/fipsmodule/ghashv8-armx32.S2
-rw-r--r--linux-arm/crypto/fipsmodule/sha1-armv4-large.S2
-rw-r--r--linux-arm/crypto/fipsmodule/sha256-armv4.S2
-rw-r--r--linux-arm/crypto/fipsmodule/sha512-armv4.S2
-rw-r--r--linux-arm/crypto/fipsmodule/vpaes-armv7.S2
-rw-r--r--linux-arm/crypto/test/trampoline-armv4.S2
12 files changed, 12 insertions, 12 deletions
diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S
index f9202a35..363aeee5 100644
--- a/linux-arm/crypto/chacha/chacha-armv4.S
+++ b/linux-arm/crypto/chacha/chacha-armv4.S
@@ -1488,6 +1488,6 @@ ChaCha20_neon:
.size ChaCha20_neon,.-ChaCha20_neon
.comm OPENSSL_armcap_P,4,4
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/aes-armv4.S b/linux-arm/crypto/fipsmodule/aes-armv4.S
index e4b09b35..cfe2a366 100644
--- a/linux-arm/crypto/fipsmodule/aes-armv4.S
+++ b/linux-arm/crypto/fipsmodule/aes-armv4.S
@@ -1217,6 +1217,6 @@ _armv4_AES_decrypt:
.byte 65,69,83,32,102,111,114,32,65,82,77,118,52,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
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/aesv8-armx32.S b/linux-arm/crypto/fipsmodule/aesv8-armx32.S
index b768742f..5d6e22d0 100644
--- a/linux-arm/crypto/fipsmodule/aesv8-armx32.S
+++ b/linux-arm/crypto/fipsmodule/aesv8-armx32.S
@@ -776,6 +776,6 @@ aes_hw_ctr32_encrypt_blocks:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,pc}
.size aes_hw_ctr32_encrypt_blocks,.-aes_hw_ctr32_encrypt_blocks
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/armv4-mont.S b/linux-arm/crypto/fipsmodule/armv4-mont.S
index ffbc2ef5..02968947 100644
--- a/linux-arm/crypto/fipsmodule/armv4-mont.S
+++ b/linux-arm/crypto/fipsmodule/armv4-mont.S
@@ -972,6 +972,6 @@ bn_mul8x_mont_neon:
.comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/bsaes-armv7.S b/linux-arm/crypto/fipsmodule/bsaes-armv7.S
index 6058d472..69a8fcac 100644
--- a/linux-arm/crypto/fipsmodule/bsaes-armv7.S
+++ b/linux-arm/crypto/fipsmodule/bsaes-armv7.S
@@ -1524,6 +1524,6 @@ bsaes_ctr32_encrypt_blocks:
@ out to retain a constant-time implementation.
.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/ghash-armv4.S b/linux-arm/crypto/fipsmodule/ghash-armv4.S
index 800f4503..42cce583 100644
--- a/linux-arm/crypto/fipsmodule/ghash-armv4.S
+++ b/linux-arm/crypto/fipsmodule/ghash-armv4.S
@@ -586,6 +586,6 @@ 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
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/ghashv8-armx32.S b/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
index 50333c8a..d6842945 100644
--- a/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
+++ b/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
@@ -248,6 +248,6 @@ gcm_ghash_v8:
.byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,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
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
index afb0a003..61deddf8 100644
--- a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
+++ b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
@@ -1506,6 +1506,6 @@ sha1_block_data_order_armv8:
.comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/sha256-armv4.S b/linux-arm/crypto/fipsmodule/sha256-armv4.S
index 1cf4285a..aee04785 100644
--- a/linux-arm/crypto/fipsmodule/sha256-armv4.S
+++ b/linux-arm/crypto/fipsmodule/sha256-armv4.S
@@ -2834,6 +2834,6 @@ sha256_block_data_order_armv8:
.comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/sha512-armv4.S b/linux-arm/crypto/fipsmodule/sha512-armv4.S
index d59a389d..a06d41fe 100644
--- a/linux-arm/crypto/fipsmodule/sha512-armv4.S
+++ b/linux-arm/crypto/fipsmodule/sha512-armv4.S
@@ -1889,6 +1889,6 @@ sha512_block_data_order_neon:
.comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/fipsmodule/vpaes-armv7.S b/linux-arm/crypto/fipsmodule/vpaes-armv7.S
index a10e7232..e5ad6ed9 100644
--- a/linux-arm/crypto/fipsmodule/vpaes-armv7.S
+++ b/linux-arm/crypto/fipsmodule/vpaes-armv7.S
@@ -1231,6 +1231,6 @@ vpaes_ctr32_encrypt_blocks:
vldmia sp!, {d8,d9,d10,d11,d12,d13,d14,d15}
ldmia sp!, {r7,r8,r9,r10,r11, pc} @ return
.size vpaes_ctr32_encrypt_blocks,.-vpaes_ctr32_encrypt_blocks
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
diff --git a/linux-arm/crypto/test/trampoline-armv4.S b/linux-arm/crypto/test/trampoline-armv4.S
index c184bb37..5c788b35 100644
--- a/linux-arm/crypto/test/trampoline-armv4.S
+++ b/linux-arm/crypto/test/trampoline-armv4.S
@@ -375,6 +375,6 @@ abi_test_clobber_d15:
vmov s31, r0
bx lr
.size abi_test_clobber_d15,.-abi_test_clobber_d15
-.section .note.GNU-stack,"",%progbits
#endif
#endif // !OPENSSL_NO_ASM
+.section .note.GNU-stack,"",%progbits
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 05:47:10 +0000