diff options
author | agl <agl@chromium.org> | 2014-08-27 15:06:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 22:07:35 +0000 |
commit | 1867be14e3beac7a778a1c1084fe167597e43ac3 (patch) | |
tree | aae75133673a3924115377c88dae7bbf86f816e2 /third_party/boringssl | |
parent | 2358b2eb6f7031a637b5b991e424b942291c402e (diff) | |
download | chromium_src-1867be14e3beac7a778a1c1084fe167597e43ac3.zip chromium_src-1867be14e3beac7a778a1c1084fe167597e43ac3.tar.gz chromium_src-1867be14e3beac7a778a1c1084fe167597e43ac3.tar.bz2 |
Roll BoringSSL.
Brings in the following commits:
1f3591d Export CBS_asn1_ber_to_der.
25c93ff Fix BN_sub documentation.
854dd65 Refactor server-side CertificateVerify handling.
5b8f104 Revise hash management for reading the Finished message.
880b14e Compute the Channel ID hash after ssl_get_message.
590cbe9 Introduce a hash_message parameter to ssl_get_message.
912806b Fix build (broken by MD4_CTX redefine).
bbac844 Add missing <errno.h> include.
3cb50e0 Move a variable declaration to function start.
98ad22e Fix "integer constant is too large for 'long' type" errors.
58f9095 Remove hack in parsing PKCS#12.
0eb1aae Readd EC_GROUP_get_curve_GFp.
539112f Readd EVP_CIPHER_CTX_set_key_length.
c9eb7ea Readd MD4.
8da9906 Rename some message functions for consistency.
e58c4f5 Add a test to ensure False Start occurs.
ef86550 Remove logic for non-signing client certificates.
a08e49d Add basic TLS Channel ID tests.
4e99c52 Fix FalseStart-SessionTicketsDisabled tests.
2561dc3 Introduce a mechanism for base64 options.
d698f32 Introduce EVP_DecodeBase64.
3a66e28 Update ssl3_get_channel_id for the simpler ECDSA_do_verify.
d30a990 Implement TLS Channel ID in runner.go
f9b96fa Fix flipped DTLS checks.
2a0c496 Fix duplicate test name.
8e16b6e Add PKCS#12 parser.
9c01e00 Rework support for ASN.1 BER.
cc8fcf4 Add 40-bit RC2 support.
9169c96 Implement client side of TLS signed certificate stamps extension.
c44d2f4 Convert all zero-argument functions to '(void)'
BUG=none
Review URL: https://codereview.chromium.org/511703002
Cr-Commit-Position: refs/heads/master@{#292240}
Diffstat (limited to 'third_party/boringssl')
-rw-r--r-- | third_party/boringssl/boringssl.gypi | 3 | ||||
-rw-r--r-- | third_party/boringssl/boringssl_tests.gypi | 11 | ||||
-rw-r--r-- | third_party/boringssl/boringssl_unittest.cc | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi index f194850..a562c28 100644 --- a/third_party/boringssl/boringssl.gypi +++ b/third_party/boringssl/boringssl.gypi @@ -81,6 +81,7 @@ 'src/crypto/bn/sqrt.c', 'src/crypto/buf/buf.c', 'src/crypto/buf/buf_error.c', + 'src/crypto/bytestring/ber.c', 'src/crypto/bytestring/cbb.c', 'src/crypto/bytestring/cbs.c', 'src/crypto/chacha/chacha_generic.c', @@ -93,6 +94,7 @@ 'src/crypto/cipher/e_chacha20poly1305.c', 'src/crypto/cipher/e_des.c', 'src/crypto/cipher/e_null.c', + 'src/crypto/cipher/e_rc2.c', 'src/crypto/cipher/e_rc4.c', 'src/crypto/conf/conf.c', 'src/crypto/conf/conf_error.c', @@ -148,6 +150,7 @@ 'src/crypto/ex_data_impl.c', 'src/crypto/hmac/hmac.c', 'src/crypto/lhash/lhash.c', + 'src/crypto/md4/md4.c', 'src/crypto/md5/md5.c', 'src/crypto/mem.c', 'src/crypto/modes/cbc.c', diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi index f0e12de..529c094 100644 --- a/third_party/boringssl/boringssl_tests.gypi +++ b/third_party/boringssl/boringssl_tests.gypi @@ -167,6 +167,16 @@ ], }, { + 'target_name': 'boringssl_pkcs12_test', + 'type': 'executable', + 'dependencies': [ + 'boringssl.gyp:boringssl', + ], + 'sources': [ + 'src/crypto/pkcs8/pkcs12_test.c', + ], + }, + { 'target_name': 'boringssl_rsa_test', 'type': 'executable', 'dependencies': [ @@ -215,6 +225,7 @@ 'boringssl_hmac_test', 'boringssl_lhash_test', 'boringssl_md5_test', + 'boringssl_pkcs12_test', 'boringssl_pkcs7_test', 'boringssl_rsa_test', 'boringssl_sha1_test', diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc index b2a22e5..a87a111 100644 --- a/third_party/boringssl/boringssl_unittest.cc +++ b/third_party/boringssl/boringssl_unittest.cc @@ -208,6 +208,10 @@ TEST(BoringSSL, PKCS7) { TestSimple("pkcs7_test"); } +TEST(BoringSSL, PKCS12) { + TestSimple("pkcs12_test"); +} + TEST(BoringSSL, ExampleMul) { TestSimple("example_mul"); } |