aboutsummaryrefslogtreecommitdiff
path: root/third_party/boringssl/linux-x86/crypto/chacha
diff options
context:
space:
mode:
authorJordan Bayles <jophba@chromium.org>2020-04-29 17:00:07 -0700
committerJordan Bayles <jophba@chromium.org>2020-04-30 10:16:14 +0000
commit74021fe10ede19348eba640cb5ab8efe4406d30a (patch)
treea4232f8d1406c86b7475cc999be901a1993f40fe /third_party/boringssl/linux-x86/crypto/chacha
parent04c6e0bed4d884f6ca108671bf27183480b1c9b9 (diff)
downloadopenscreen-74021fe10ede19348eba640cb5ab8efe4406d30a.tar.gz
Update BoringSSL in sync with Chrome
The current version of BoringSSL is over two years old, whereas Chrome is linked against a version from this year. This patch updates Open Screen to depend on the newer version of OpenSSL. Change-Id: Ib4107bc9780971c747fc91125b9acb7ffe1ec172 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2173700 Reviewed-by: Jordan Bayles <jophba@chromium.org> Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
Diffstat (limited to 'third_party/boringssl/linux-x86/crypto/chacha')
-rw-r--r--third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S7
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S b/third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S
index 519081bb..feceb5d9 100644
--- a/third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S
+++ b/third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S
@@ -1,4 +1,10 @@
+# This file is generated from a similarly-named Perl script in the BoringSSL
+# source tree. Do not edit by hand.
+
#if defined(__i386__)
+#if defined(BORINGSSL_PREFIX)
+#include <boringssl_prefix_symbols_asm.h>
+#endif
.text
.globl ChaCha20_ctr32
.hidden ChaCha20_ctr32
@@ -966,3 +972,4 @@ ChaCha20_ssse3:
.byte 60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111
.byte 114,103,62,0
#endif
+.section .note.GNU-stack,"",@progbits