diff options
author | Tobias Thierer <tobiast@google.com> | 2019-10-09 20:48:13 +0100 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2019-10-09 22:01:16 +0100 |
commit | 01e077a02e249d3daca78c662328fbf3eb556fa6 (patch) | |
tree | d745c0835cc8b4175a106373cabf1824abcba406 /linux-arm | |
parent | 470a930d9734686d23d8e4cba31c7319d47b915b (diff) | |
download | boringssl-01e077a02e249d3daca78c662328fbf3eb556fa6.tar.gz |
external/boringssl: Sync to 56b6c714c9cae5963681ed9dd9f6cabf294e3f80.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/6e7255c17e1a7348a2377fbc804441dd284806e2..56b6c714c9cae5963681ed9dd9f6cabf294e3f80
Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases
Change-Id: I9977c8fa204dd39e5b6c71abdb85d055e842bf4e
Diffstat (limited to 'linux-arm')
-rw-r--r-- | linux-arm/crypto/chacha/chacha-armv4.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/aes-armv4.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/aesv8-armx32.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/armv4-mont.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/bsaes-armv7.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/ghash-armv4.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/ghashv8-armx32.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/sha1-armv4-large.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/sha256-armv4.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/sha512-armv4.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/vpaes-armv7.S | 1 | ||||
-rw-r--r-- | linux-arm/crypto/test/trampoline-armv4.S | 1 |
12 files changed, 12 insertions, 0 deletions
diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S index aed7ca64..f9202a35 100644 --- a/linux-arm/crypto/chacha/chacha-armv4.S +++ b/linux-arm/crypto/chacha/chacha-armv4.S @@ -1488,5 +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 diff --git a/linux-arm/crypto/fipsmodule/aes-armv4.S b/linux-arm/crypto/fipsmodule/aes-armv4.S index b2966b4a..e4b09b35 100644 --- a/linux-arm/crypto/fipsmodule/aes-armv4.S +++ b/linux-arm/crypto/fipsmodule/aes-armv4.S @@ -1217,5 +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 diff --git a/linux-arm/crypto/fipsmodule/aesv8-armx32.S b/linux-arm/crypto/fipsmodule/aesv8-armx32.S index 3a2d2e43..b768742f 100644 --- a/linux-arm/crypto/fipsmodule/aesv8-armx32.S +++ b/linux-arm/crypto/fipsmodule/aesv8-armx32.S @@ -776,5 +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 diff --git a/linux-arm/crypto/fipsmodule/armv4-mont.S b/linux-arm/crypto/fipsmodule/armv4-mont.S index 12ebe40c..ffbc2ef5 100644 --- a/linux-arm/crypto/fipsmodule/armv4-mont.S +++ b/linux-arm/crypto/fipsmodule/armv4-mont.S @@ -972,5 +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 diff --git a/linux-arm/crypto/fipsmodule/bsaes-armv7.S b/linux-arm/crypto/fipsmodule/bsaes-armv7.S index f6cec3db..6058d472 100644 --- a/linux-arm/crypto/fipsmodule/bsaes-armv7.S +++ b/linux-arm/crypto/fipsmodule/bsaes-armv7.S @@ -1524,5 +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 diff --git a/linux-arm/crypto/fipsmodule/ghash-armv4.S b/linux-arm/crypto/fipsmodule/ghash-armv4.S index a0fa53c6..800f4503 100644 --- a/linux-arm/crypto/fipsmodule/ghash-armv4.S +++ b/linux-arm/crypto/fipsmodule/ghash-armv4.S @@ -586,5 +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 diff --git a/linux-arm/crypto/fipsmodule/ghashv8-armx32.S b/linux-arm/crypto/fipsmodule/ghashv8-armx32.S index 65c9f22a..50333c8a 100644 --- a/linux-arm/crypto/fipsmodule/ghashv8-armx32.S +++ b/linux-arm/crypto/fipsmodule/ghashv8-armx32.S @@ -248,5 +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 diff --git a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S index 2b70a325..afb0a003 100644 --- a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S +++ b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S @@ -1506,5 +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 diff --git a/linux-arm/crypto/fipsmodule/sha256-armv4.S b/linux-arm/crypto/fipsmodule/sha256-armv4.S index 19280753..1cf4285a 100644 --- a/linux-arm/crypto/fipsmodule/sha256-armv4.S +++ b/linux-arm/crypto/fipsmodule/sha256-armv4.S @@ -2834,5 +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 diff --git a/linux-arm/crypto/fipsmodule/sha512-armv4.S b/linux-arm/crypto/fipsmodule/sha512-armv4.S index c44fcc6c..d59a389d 100644 --- a/linux-arm/crypto/fipsmodule/sha512-armv4.S +++ b/linux-arm/crypto/fipsmodule/sha512-armv4.S @@ -1889,5 +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 diff --git a/linux-arm/crypto/fipsmodule/vpaes-armv7.S b/linux-arm/crypto/fipsmodule/vpaes-armv7.S index 9124ce20..a10e7232 100644 --- a/linux-arm/crypto/fipsmodule/vpaes-armv7.S +++ b/linux-arm/crypto/fipsmodule/vpaes-armv7.S @@ -1231,5 +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 diff --git a/linux-arm/crypto/test/trampoline-armv4.S b/linux-arm/crypto/test/trampoline-armv4.S index e526e993..c184bb37 100644 --- a/linux-arm/crypto/test/trampoline-armv4.S +++ b/linux-arm/crypto/test/trampoline-armv4.S @@ -375,5 +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 |