Roll BoringSSL.
This change pulls in the following changes:
7bdec13 Export pqueue functions.
c92c2d7 Prune some dead quirks and document the SSL_OP_ALL ones.
859ec3c Add SSL_CTX_set_keylog_bio.
1f20799 Fix ARM build with OPENSSL_NO_ASM.
df90a64 Remove MD5, SHA-224, and SHA-512 handling from s3_cbc.c.
39ebf53 Check the server did not use a TLS 1.2 cipher suite pre-TLS 1.2.
120a674 Fix the return values for most of SRTP.
5c24a1d Add a test for SSL_OP_TLS_D5_BUG.
f852599 Fix doc.config for header files being moved.
f0fd373 Remove remnants of EVP_CIPHER-based AES_GCM cipher.
8a5825e Don't export obj_dat.h.
b2cb0ec Fix minor issues found by Clang's analysis.
ed8270a Fix crash as server when resuming with SNI.
04dbb7f Add tests for pqueue
BUG=none
Review URL: https://codereview.chromium.org/540523002
Cr-Commit-Position: refs/heads/master@{#293554}
diff --git a/DEPS b/DEPS
index 34e7bf648..9a36d606 100644
--- a/DEPS
+++ b/DEPS
@@ -67,7 +67,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
- 'boringssl_revision': '6c7aed048ca0a335e02dfee10976c5dc8620783e',
+ 'boringssl_revision': '7bdec13c03744049ba5f776b6418cbcfe61356cd',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss
# and whatever else without interference from each other.
diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi
index 529c094..04f0c43b 100644
--- a/third_party/boringssl/boringssl_tests.gypi
+++ b/third_party/boringssl/boringssl_tests.gypi
@@ -206,6 +206,26 @@
'src/crypto/x509/pkcs7_test.c',
],
},
+ {
+ 'target_name': 'boringssl_pqueue_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'boringssl.gyp:boringssl',
+ ],
+ 'sources': [
+ 'src/ssl/pqueue/pqueue_test.c',
+ ],
+ },
+ {
+ 'target_name': 'boringssl_ssl_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'boringssl.gyp:boringssl',
+ ],
+ 'sources': [
+ 'src/ssl/ssl_test.c',
+ ],
+ },
],
'variables': {
'boringssl_test_targets': [
@@ -227,8 +247,10 @@
'boringssl_md5_test',
'boringssl_pkcs12_test',
'boringssl_pkcs7_test',
+ 'boringssl_pqueue_test',
'boringssl_rsa_test',
'boringssl_sha1_test',
+ 'boringssl_ssl_test',
],
}
}
diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc
index a87a111..9ed97d55 100644
--- a/third_party/boringssl/boringssl_unittest.cc
+++ b/third_party/boringssl/boringssl_unittest.cc
@@ -219,3 +219,11 @@
TEST(BoringSSL, ExampleSign) {
TestSimple("example_sign");
}
+
+TEST(BoringSSL, SSL) {
+ TestSimple("ssl_test");
+}
+
+TEST(BoringSSL, PQueue) {
+ TestSimple("pqueue_test");
+}
diff --git a/third_party/boringssl/update_gypi_and_asm.py b/third_party/boringssl/update_gypi_and_asm.py
index 3cb3c0e..d996876f 100644
--- a/third_party/boringssl/update_gypi_and_asm.py
+++ b/third_party/boringssl/update_gypi_and_asm.py
@@ -202,6 +202,7 @@
gypi.write(' }\n}\n')
test_c_files = FindCFiles(os.path.join('src', 'crypto'), OnlyTests)
+ test_c_files += FindCFiles(os.path.join('src', 'ssl'), OnlyTests)
with open('boringssl_tests.gypi', 'w+') as test_gypi:
test_gypi.write(FILE_HEADER + '{\n \'targets\': [\n')
