diff options
| author | davidben <davidben@chromium.org> | 2015-01-06 13:08:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 21:09:22 +0000 |
| commit | c8dc58c297262677b250d632c974358130bd1e9a (patch) | |
| tree | 74b8550da9395a2f3a0357f174e74ef8bf5e0004 /third_party/boringssl | |
| parent | 9b891315f7af505fd9d0a4078589adf00925b518 (diff) | |
| download | chromium_src-c8dc58c297262677b250d632c974358130bd1e9a.zip chromium_src-c8dc58c297262677b250d632c974358130bd1e9a.tar.gz chromium_src-c8dc58c297262677b250d632c974358130bd1e9a.tar.bz2 | |
Roll BoringSSL 306e520:aac2f6a
This is https://codereview.chromium.org/835193005 rolled a little further and
with some additional changes:
It fixes the FallbackSCSV tests to no longer be a no-op. It also accounts for
BoringSSL's handling of a handshake_failure in response to a ClientHello to
match NSS's behavior and our test expectations. See https://crbug.com/446505
for details.
Summary of changes available at:
https://boringssl.googlesource.com/boringssl/+log/306e520..aac2f6a
BUG=446505
Review URL: https://codereview.chromium.org/834313002
Cr-Commit-Position: refs/heads/master@{#310144}
Diffstat (limited to 'third_party/boringssl')
| -rw-r--r-- | third_party/boringssl/boringssl.gypi | 7 | ||||
| -rw-r--r-- | third_party/boringssl/boringssl_tests.gypi | 14 | ||||
| -rw-r--r-- | third_party/boringssl/boringssl_unittest.cc | 4 |
3 files changed, 20 insertions, 5 deletions
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi index af009d7..5fd17d6 100644 --- a/third_party/boringssl/boringssl.gypi +++ b/third_party/boringssl/boringssl.gypi @@ -151,6 +151,8 @@ 'src/crypto/evp/sign.c', 'src/crypto/ex_data.c', 'src/crypto/ex_data_impl.c', + 'src/crypto/hkdf/hkdf.c', + 'src/crypto/hkdf/hkdf_error.c', 'src/crypto/hmac/hmac.c', 'src/crypto/lhash/lhash.c', 'src/crypto/md4/md4.c', @@ -287,11 +289,6 @@ 'src/ssl/d1_srtp.c', 'src/ssl/d1_srvr.c', 'src/ssl/pqueue/pqueue.c', - 'src/ssl/s23_clnt.c', - 'src/ssl/s23_lib.c', - 'src/ssl/s23_meth.c', - 'src/ssl/s23_pkt.c', - 'src/ssl/s23_srvr.c', 'src/ssl/s3_both.c', 'src/ssl/s3_cbc.c', 'src/ssl/s3_clnt.c', diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi index cf2aff4..100fb1b 100644 --- a/third_party/boringssl/boringssl_tests.gypi +++ b/third_party/boringssl/boringssl_tests.gypi @@ -202,6 +202,19 @@ 'msvs_disabled_warnings': [ 4267, ], }, { + 'target_name': 'boringssl_hkdf_test', + 'type': 'executable', + 'dependencies': [ + 'boringssl.gyp:boringssl', + ], + 'sources': [ + 'src/crypto/hkdf/hkdf_test.c', + ], + # TODO(davidben): Fix size_t truncations in BoringSSL. + # https://crbug.com/429039 + 'msvs_disabled_warnings': [ 4267, ], + }, + { 'target_name': 'boringssl_hmac_test', 'type': 'executable', 'dependencies': [ @@ -324,6 +337,7 @@ 'boringssl_evp_test', 'boringssl_example_mul', 'boringssl_gcm_test', + 'boringssl_hkdf_test', 'boringssl_hmac_test', 'boringssl_lhash_test', 'boringssl_pkcs12_test', diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc index 6d54ad2..f7e475d 100644 --- a/third_party/boringssl/boringssl_unittest.cc +++ b/third_party/boringssl/boringssl_unittest.cc @@ -234,3 +234,7 @@ TEST(BoringSSL, SSL) { TEST(BoringSSL, PQueue) { TestSimple("pqueue_test"); } + +TEST(BoringSSL, HKDF) { + TestSimple("hkdf_test"); +} |