summaryrefslogtreecommitdiffstats
path: root/third_party/boringssl
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-12-01 02:49:34 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-01 10:52:05 +0000
commit2a811e4ed5377002e71911765d75300c23a59c34 (patch)
tree020e4eeeaaf0209e0b8cb88bee2fbb2f877063bf /third_party/boringssl
parenta2e0273128676e66b3d579be723657063865f0a8 (diff)
downloadchromium_src-2a811e4ed5377002e71911765d75300c23a59c34.zip
chromium_src-2a811e4ed5377002e71911765d75300c23a59c34.tar.gz
chromium_src-2a811e4ed5377002e71911765d75300c23a59c34.tar.bz2
Roll src/third_party/boringssl/src 3ac32b1ed..fde89b43c
https://boringssl.googlesource.com/boringssl/+log/3ac32b1eda0da7a99d9c2b6c605fe50af80ccd90..fde89b43c347155798dee8b1210c2c5faabe25f8 This switches Chromium to using the new callback for SSLKEYLOGFILE. In doing so, it fixes some std::string/base::FilePath confusion and pushes the writing to a background thread. See https://boringssl.googlesource.com/boringssl/+/d28f59c27bac60d3206f0c302b7cb37f9cd88f43 It does not fix the setting to come in via the URLRequestContext. That is left for after the singleton SSL_CTX is fixed. (Otherwise we'll have to the callback unconditionally, making the SSL stack do unnecessary work in preparing the log line.) BUG=none Review URL: https://codereview.chromium.org/1466403002 Cr-Commit-Position: refs/heads/master@{#362377}
Diffstat (limited to 'third_party/boringssl')
-rw-r--r--third_party/boringssl/boringssl.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi
index c3ffa5b..096c903 100644
--- a/third_party/boringssl/boringssl.gypi
+++ b/third_party/boringssl/boringssl.gypi
@@ -324,6 +324,7 @@
'linux-arm/crypto/sha/sha512-armv4.S',
'src/crypto/chacha/chacha_vec_arm.S',
'src/crypto/cpu-arm-asm.S',
+ 'src/crypto/curve25519/asm/x25519-arm.S',
'src/crypto/poly1305/poly1305_arm_asm.S',
],
'boringssl_linux_x86_sources': [