summaryrefslogtreecommitdiffstats
path: root/third_party/boringssl
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-05-15 12:52:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 19:53:35 +0000
commite365ba1ac3fa8a8441b0d2fbf28a71a8bc40f185 (patch)
treeb0bbecd966bc00dfe384371b88f5df6bd57b7612 /third_party/boringssl
parent74b599fa1571ffa3b950eae4224936e78f8c1441 (diff)
downloadchromium_src-e365ba1ac3fa8a8441b0d2fbf28a71a8bc40f185.zip
chromium_src-e365ba1ac3fa8a8441b0d2fbf28a71a8bc40f185.tar.gz
chromium_src-e365ba1ac3fa8a8441b0d2fbf28a71a8bc40f185.tar.bz2
Roll src/third_party/boringssl/src 771a138:a07c0fc
Summary of changes available at: https://boringssl.googlesource.com/boringssl/+log/771a138..a07c0fc This pulls in the SSL_get_current_cipher fix. BUG=none Review URL: https://codereview.chromium.org/1126233010 Cr-Commit-Position: refs/heads/master@{#330174}
Diffstat (limited to 'third_party/boringssl')
-rw-r--r--third_party/boringssl/boringssl_tests.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi
index cec6780..58dc9ad 100644
--- a/third_party/boringssl/boringssl_tests.gypi
+++ b/third_party/boringssl/boringssl_tests.gypi
@@ -83,7 +83,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/cipher/cipher_test.c',
+ 'src/crypto/cipher/cipher_test.cc',
'<@(boringssl_test_support_sources)',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.