Commit e447037a authored by eroman's avatar eroman Committed by Commit bot

Roll BoringSSL 347f025..a87de9b.

Changes:

a87de9b Define WIN32_LEAN_AND_MEAN in the build system, not in the code.
4a0f0c4 Change CMakeLists.txt to two-space indent.
2e38008 Define _HAS_EXCEPTIONS=0 to avoid MSVC C4530 warning.
bcc4fa8 Add unit-tests for PBKDF2.
507c1ee Honor the standard BUILD_SHARED_LIBS cmake variable.
f4600ad Add missing OPENSSL_EXPORTs.
f058dae Revert "Add a test for CONF_parse_list."
dc94b54 Clean up use of Windows Platform SDK headers.
33970e6 Enable bssl client/s_client and server/s_server on Windows.
9a9a193 Build with -fvisibility=hidden.
afdaeee Enable bssl (md5sum, sha256sum, etc.) on Windows.
2fe7f2d Initialize HMAC keys to zero.
1d75c8b Improve compatibility with CMake 3.0 and later
ed30c0d Improve the documentation in BUILDING
b7f3144 Add a style guide.
69ad27f Run x86 perlasm on UNIX with -fPIC.
36eb7d5 Fix buffer size in aead_test.c.
53cbd6c Fix unused variable warning in OPENSSL_NO_ASM build.
bed8f73 Fix build after mistake addressing comments in cca4d599.
cca4d59 Add digest sum handling to the tool.
cd5c892 Add a test for CONF_parse_list.
fd4eb60 Remove duplication of common DH parameters.
b4a494c Reformat SSL/TLS headers.

For more details see: https://boringssl.googlesource.com/boringssl/+log/347f025..a87de9b

Review URL: https://codereview.chromium.org/890443002

Cr-Commit-Position: refs/heads/master@{#313784}
parent 2c78036b
......@@ -74,7 +74,7 @@ vars = {
# 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': '347f025d752980f62757f3f01321c4ec970ba94c',
'boringssl_revision': 'a87de9b39b5a9b1d6e9ed6d18167946397581df1',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss
# and whatever else without interference from each other.
......
......@@ -201,6 +201,19 @@
# https://crbug.com/429039
'msvs_disabled_warnings': [ 4267, ],
},
{
'target_name': 'boringssl_pbkdf_test',
'type': 'executable',
'dependencies': [
'boringssl.gyp:boringssl',
],
'sources': [
'src/crypto/evp/pbkdf_test.c',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
'msvs_disabled_warnings': [ 4267, ],
},
{
'target_name': 'boringssl_hkdf_test',
'type': 'executable',
......@@ -340,6 +353,7 @@
'boringssl_hkdf_test',
'boringssl_hmac_test',
'boringssl_lhash_test',
'boringssl_pbkdf_test',
'boringssl_pkcs12_test',
'boringssl_pkcs7_test',
'boringssl_pqueue_test',
......
......@@ -232,6 +232,10 @@ TEST(BoringSSL, PQueue) {
TestSimple("pqueue_test");
}
TEST(BoringSSL, HKDF) {
TEST(BoringSSL, HKDF) {
TestSimple("hkdf_test");
}
TEST(BoringSSL, PBKDF) {
TestSimple("pbkdf_test");
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment