diff options
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | net/android/keystore_openssl.cc | 20 | ||||
-rw-r--r-- | net/ssl/openssl_platform_key_mac.cc | 20 | ||||
-rw-r--r-- | net/ssl/openssl_platform_key_win.cc | 1 | ||||
-rw-r--r-- | third_party/boringssl/BUILD.gn | 3 | ||||
-rw-r--r-- | third_party/boringssl/boringssl.gyp | 3 | ||||
-rw-r--r-- | third_party/boringssl/boringssl.gypi | 60 | ||||
-rw-r--r-- | third_party/boringssl/boringssl_nacl.gyp | 3 | ||||
-rw-r--r-- | third_party/boringssl/boringssl_tests.gypi | 32 | ||||
-rw-r--r-- | third_party/boringssl/boringssl_unittest.cc | 8 | ||||
-rw-r--r-- | third_party/boringssl/err_data.c | 1296 |
11 files changed, 755 insertions, 693 deletions
@@ -62,7 +62,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': 'af0e32cb84f0c9cc65b9233a3414d2562642b342', + 'boringssl_revision': 'b0acb7743f6c1e4b8307b5898598be4f13095f49', # 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/net/android/keystore_openssl.cc b/net/android/keystore_openssl.cc index 3907e59..c9d3089 100644 --- a/net/android/keystore_openssl.cc +++ b/net/android/keystore_openssl.cc @@ -290,22 +290,24 @@ const RSA_METHOD android_rsa_method = { 0 /* references */, 1 /* is_static */ } /* common */, - NULL /* app_data */, + nullptr /* app_data */, - NULL /* init */, - NULL /* finish */, + nullptr /* init */, + nullptr /* finish */, RsaMethodSize, - NULL /* sign */, - NULL /* verify */, + nullptr /* sign */, + nullptr /* verify */, RsaMethodEncrypt, RsaMethodSignRaw, RsaMethodDecrypt, RsaMethodVerifyRaw, - NULL /* private_transform */, - NULL /* mod_exp */, - NULL /* bn_mod_exp */, + nullptr /* private_transform */, + nullptr /* mod_exp */, + nullptr /* bn_mod_exp */, RSA_FLAG_OPAQUE, - NULL /* keygen */, + nullptr /* keygen */, + nullptr /* multi_prime_keygen */, + nullptr /* supports_digest */, }; // Setup an EVP_PKEY to wrap an existing platform RSA PrivateKey object. diff --git a/net/ssl/openssl_platform_key_mac.cc b/net/ssl/openssl_platform_key_mac.cc index 34857af..2b65db2 100644 --- a/net/ssl/openssl_platform_key_mac.cc +++ b/net/ssl/openssl_platform_key_mac.cc @@ -305,22 +305,24 @@ const RSA_METHOD mac_rsa_method = { 0 /* references */, 1 /* is_static */ } /* common */, - NULL /* app_data */, + nullptr /* app_data */, - NULL /* init */, - NULL /* finish */, + nullptr /* init */, + nullptr /* finish */, RsaMethodSize, - NULL /* sign */, - NULL /* verify */, + nullptr /* sign */, + nullptr /* verify */, RsaMethodEncrypt, RsaMethodSignRaw, RsaMethodDecrypt, RsaMethodVerifyRaw, - NULL /* private_transform */, - NULL /* mod_exp */, - NULL /* bn_mod_exp */, + nullptr /* private_transform */, + nullptr /* mod_exp */, + nullptr /* bn_mod_exp */, RSA_FLAG_OPAQUE, - NULL /* keygen */, + nullptr /* keygen */, + nullptr /* multi_prime_keygen */, + nullptr /* supports_digest */, }; crypto::ScopedEVP_PKEY CreateRSAWrapper(SecKeyRef key, diff --git a/net/ssl/openssl_platform_key_win.cc b/net/ssl/openssl_platform_key_win.cc index d394f18..b6a9c0c 100644 --- a/net/ssl/openssl_platform_key_win.cc +++ b/net/ssl/openssl_platform_key_win.cc @@ -432,6 +432,7 @@ const RSA_METHOD win_rsa_method = { nullptr, // bn_mod_exp RSA_FLAG_OPAQUE, nullptr, // keygen + nullptr, // multi_prime_keygen RsaMethodSupportsDigest, }; diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index 8ce890d..a8fe16e 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -37,7 +37,8 @@ if (is_win && !is_msan) { } component("boringssl") { - sources = gypi_values.boringssl_lib_sources + sources = gypi_values.boringssl_crypto_sources + sources += gypi_values.boringssl_ssl_sources public_configs = [ ":openssl_config" ] diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp index 3079d0b..5118fc7 100644 --- a/third_party/boringssl/boringssl.gyp +++ b/third_party/boringssl/boringssl.gyp @@ -11,7 +11,8 @@ 'boringssl.gypi', ], 'sources': [ - '<@(boringssl_lib_sources)', + '<@(boringssl_crypto_sources)', + '<@(boringssl_ssl_sources)', ], 'defines': [ 'BORINGSSL_IMPLEMENTATION', diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi index c17bcd0..808280d 100644 --- a/third_party/boringssl/boringssl.gypi +++ b/third_party/boringssl/boringssl.gypi @@ -6,7 +6,37 @@ { 'variables': { - 'boringssl_lib_sources': [ + 'boringssl_ssl_sources': [ + 'src/ssl/d1_both.c', + 'src/ssl/d1_clnt.c', + 'src/ssl/d1_lib.c', + 'src/ssl/d1_meth.c', + 'src/ssl/d1_pkt.c', + 'src/ssl/d1_srtp.c', + 'src/ssl/d1_srvr.c', + 'src/ssl/pqueue/pqueue.c', + 'src/ssl/s3_both.c', + 'src/ssl/s3_clnt.c', + 'src/ssl/s3_enc.c', + 'src/ssl/s3_lib.c', + 'src/ssl/s3_meth.c', + 'src/ssl/s3_pkt.c', + 'src/ssl/s3_srvr.c', + 'src/ssl/ssl_aead_ctx.c', + 'src/ssl/ssl_algs.c', + 'src/ssl/ssl_asn1.c', + 'src/ssl/ssl_cert.c', + 'src/ssl/ssl_cipher.c', + 'src/ssl/ssl_lib.c', + 'src/ssl/ssl_rsa.c', + 'src/ssl/ssl_sess.c', + 'src/ssl/ssl_stat.c', + 'src/ssl/ssl_txt.c', + 'src/ssl/t1_enc.c', + 'src/ssl/t1_lib.c', + 'src/ssl/t1_reneg.c', + ], + 'boringssl_crypto_sources': [ 'err_data.c', 'src/crypto/aes/aes.c', 'src/crypto/aes/mode_wrappers.c', @@ -271,34 +301,6 @@ 'src/crypto/x509v3/v3_skey.c', 'src/crypto/x509v3/v3_sxnet.c', 'src/crypto/x509v3/v3_utl.c', - 'src/ssl/d1_both.c', - 'src/ssl/d1_clnt.c', - 'src/ssl/d1_lib.c', - 'src/ssl/d1_meth.c', - 'src/ssl/d1_pkt.c', - 'src/ssl/d1_srtp.c', - 'src/ssl/d1_srvr.c', - 'src/ssl/pqueue/pqueue.c', - 'src/ssl/s3_both.c', - 'src/ssl/s3_clnt.c', - 'src/ssl/s3_enc.c', - 'src/ssl/s3_lib.c', - 'src/ssl/s3_meth.c', - 'src/ssl/s3_pkt.c', - 'src/ssl/s3_srvr.c', - 'src/ssl/ssl_aead_ctx.c', - 'src/ssl/ssl_algs.c', - 'src/ssl/ssl_asn1.c', - 'src/ssl/ssl_cert.c', - 'src/ssl/ssl_cipher.c', - 'src/ssl/ssl_lib.c', - 'src/ssl/ssl_rsa.c', - 'src/ssl/ssl_sess.c', - 'src/ssl/ssl_stat.c', - 'src/ssl/ssl_txt.c', - 'src/ssl/t1_enc.c', - 'src/ssl/t1_lib.c', - 'src/ssl/t1_reneg.c', ], 'boringssl_linux_aarch64_sources': [ 'linux-aarch64/crypto/aes/aesv8-armx.S', diff --git a/third_party/boringssl/boringssl_nacl.gyp b/third_party/boringssl/boringssl_nacl.gyp index cfd43b9..e560c29 100644 --- a/third_party/boringssl/boringssl_nacl.gyp +++ b/third_party/boringssl/boringssl_nacl.gyp @@ -23,7 +23,8 @@ 'boringssl.gypi' ], 'sources': [ - '<@(boringssl_lib_sources)', + '<@(boringssl_crypto_sources)', + '<@(boringssl_ssl_sources)', ], 'defines': [ 'OPENSSL_NO_ASM', diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi index 1175a86..9413d8c 100644 --- a/third_party/boringssl/boringssl_tests.gypi +++ b/third_party/boringssl/boringssl_tests.gypi @@ -349,7 +349,7 @@ 'boringssl.gyp:boringssl', ], 'sources': [ - 'src/crypto/rsa/rsa_test.c', + 'src/crypto/rsa/rsa_test.cc', '<@(boringssl_test_support_sources)', ], # TODO(davidben): Fix size_t truncations in BoringSSL. @@ -385,6 +385,34 @@ 'msvs_disabled_warnings': [ 4267, ], }, { + 'target_name': 'boringssl_tab_test', + 'type': 'executable', + 'dependencies': [ + 'boringssl.gyp:boringssl', + ], + 'sources': [ + 'src/crypto/x509v3/tab_test.c', + '<@(boringssl_test_support_sources)', + ], + # TODO(davidben): Fix size_t truncations in BoringSSL. + # https://crbug.com/429039 + 'msvs_disabled_warnings': [ 4267, ], + }, + { + 'target_name': 'boringssl_v3name_test', + 'type': 'executable', + 'dependencies': [ + 'boringssl.gyp:boringssl', + ], + 'sources': [ + 'src/crypto/x509v3/v3name_test.c', + '<@(boringssl_test_support_sources)', + ], + # TODO(davidben): Fix size_t truncations in BoringSSL. + # https://crbug.com/429039 + 'msvs_disabled_warnings': [ 4267, ], + }, + { 'target_name': 'boringssl_pqueue_test', 'type': 'executable', 'dependencies': [ @@ -447,7 +475,9 @@ 'boringssl_refcount_test', 'boringssl_rsa_test', 'boringssl_ssl_test', + 'boringssl_tab_test', 'boringssl_thread_test', + 'boringssl_v3name_test', ], } } diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc index 7dfe91c..46c68a8 100644 --- a/third_party/boringssl/boringssl_unittest.cc +++ b/third_party/boringssl/boringssl_unittest.cc @@ -288,6 +288,14 @@ TEST(BoringSSL, SSL) { TestSimple("ssl_test"); } +TEST(BoringSSL, TabTest) { + TestSimple("tab_test"); +} + TEST(BoringSSL, Thread) { TestSimple("thread_test"); } + +TEST(BoringSSL, V3NameTest) { + TestSimple("v3name_test"); +} diff --git a/third_party/boringssl/err_data.c b/third_party/boringssl/err_data.c index 5a79137..2eca1e0 100644 --- a/third_party/boringssl/err_data.c +++ b/third_party/boringssl/err_data.c @@ -86,29 +86,30 @@ const uint32_t kOpenSSLFunctionValues[] = { 0x1033196d, 0x10339983, 0x10341993, - 0x103499a6, - 0x103519b4, - 0x103599c3, - 0x103619e3, - 0x10369a02, - 0x10371a1f, - 0x10379a3c, - 0x10381a51, - 0x10389a73, - 0x10391a92, - 0x10399ab1, - 0x103a1ac8, - 0x103a9adf, - 0x103b1ae8, - 0x103b9af3, - 0x103c1b0d, - 0x103c9b15, - 0x103d1b1d, - 0x103d9b24, - 0x103e1b37, - 0x103e9b49, - 0x103f1b5c, - 0x103f9b65, + 0x103499bb, + 0x103519c9, + 0x103599d8, + 0x103619f8, + 0x10369a17, + 0x10371a34, + 0x10379a51, + 0x10381a66, + 0x10389a88, + 0x10391aa7, + 0x10399ac6, + 0x103a1add, + 0x103a9af4, + 0x103b1afd, + 0x103b9b08, + 0x103c1b22, + 0x103c9b2a, + 0x103d1b32, + 0x103d99a6, + 0x103e1b4b, + 0x103e9b5d, + 0x103f1b70, + 0x103f9b79, + 0x10401b39, 0x14320a4e, 0x14328a5c, 0x14330a68, @@ -218,65 +219,65 @@ const uint32_t kOpenSSLFunctionValues[] = { 0x28330ac8, 0x28338acd, 0x28340ad8, - 0x2c322b00, - 0x2c32ab0c, - 0x2c332b1f, - 0x2c33ab30, - 0x2c342b49, - 0x2c34ab71, - 0x2c352b88, - 0x2c35aba5, - 0x2c362bc2, - 0x2c36abdf, - 0x2c372bf8, - 0x2c37ac11, - 0x2c382c27, - 0x2c38ac35, - 0x2c392c47, - 0x2c39ac64, - 0x2c3a2c81, - 0x2c3aac8f, - 0x2c3b2cad, - 0x2c3baccb, - 0x2c3c2ce6, - 0x2c3cacfa, - 0x2c3d2d0c, - 0x2c3dad1c, - 0x2c3e2d2a, - 0x2c3ead3a, - 0x2c3f2d4a, - 0x2c3fad65, - 0x2c402d76, - 0x2c40ad91, - 0x2c412da5, - 0x2c41adb8, - 0x2c422dd7, - 0x2c42adeb, - 0x2c432dfe, - 0x2c43ae0d, - 0x2c442e1c, - 0x2c44ae33, - 0x2c452e4e, - 0x2c45ae66, - 0x2c462e7a, - 0x2c46ae8d, - 0x2c472e9e, - 0x2c47aeaf, - 0x2c482ec0, - 0x2c48aed1, - 0x2c492ee0, - 0x2c49aeed, - 0x2c4a2efa, - 0x2c4aaf07, - 0x2c4b2f10, - 0x2c4baf24, - 0x2c4c2f33, - 0x2c4caf41, - 0x2c4d2f63, - 0x2c4daf74, - 0x2c4e2f85, - 0x2c4eaf50, - 0x2c4f2b62, + 0x2c322b5b, + 0x2c32ab67, + 0x2c332b7a, + 0x2c33ab8b, + 0x2c342ba4, + 0x2c34abcc, + 0x2c352be3, + 0x2c35ac00, + 0x2c362c1d, + 0x2c36ac3a, + 0x2c372c53, + 0x2c37ac6c, + 0x2c382c82, + 0x2c38ac90, + 0x2c392ca2, + 0x2c39acbf, + 0x2c3a2cdc, + 0x2c3aacea, + 0x2c3b2d08, + 0x2c3bad26, + 0x2c3c2d41, + 0x2c3cad55, + 0x2c3d2d67, + 0x2c3dad77, + 0x2c3e2d85, + 0x2c3ead95, + 0x2c3f2da5, + 0x2c3fadc0, + 0x2c402dd1, + 0x2c40adec, + 0x2c412e00, + 0x2c41ae13, + 0x2c422e32, + 0x2c42ae46, + 0x2c432e59, + 0x2c43ae68, + 0x2c442e77, + 0x2c44ae8e, + 0x2c452ea9, + 0x2c45aec1, + 0x2c462ed5, + 0x2c46aee8, + 0x2c472ef9, + 0x2c47af0a, + 0x2c482f1b, + 0x2c48af2c, + 0x2c492f3b, + 0x2c49af48, + 0x2c4a2f55, + 0x2c4aaf62, + 0x2c4b2f6b, + 0x2c4baf7f, + 0x2c4c2f8e, + 0x2c4caf9c, + 0x2c4d2fbe, + 0x2c4dafcf, + 0x2c4e2fe0, + 0x2c4eafab, + 0x2c4f2bbd, 0x30320000, 0x30328018, 0x3033002c, @@ -416,182 +417,185 @@ const uint32_t kOpenSSLFunctionValues[] = { 0x3c5210d2, 0x3c528b87, 0x3c530b3f, - 0x40321ba5, - 0x40329bbf, - 0x40331be7, - 0x40339bff, - 0x40341c1d, - 0x40349c64, - 0x40351c7b, - 0x40359c97, - 0x40361cb3, - 0x40369ccd, - 0x40371cec, - 0x40379d0b, - 0x40381d23, - 0x40389d40, - 0x40391d63, - 0x40399d80, - 0x403a1d9e, - 0x403a9dae, - 0x403b1dc3, - 0x403b9ddf, - 0x403c1df9, - 0x403c9e04, - 0x403d1e27, - 0x403d9e4b, - 0x403e1e61, - 0x403e9e6b, - 0x403f1e77, - 0x403f9e88, - 0x40401ea0, - 0x40409ea8, - 0x40411eb1, - 0x40419eba, - 0x40421ee2, - 0x40429ef6, - 0x40431f01, - 0x40439f0d, - 0x40441f61, - 0x40449f6d, - 0x40451f7a, - 0x40459f8d, - 0x40461fa5, - 0x40469fbd, - 0x40471fd3, - 0x40479fee, - 0x40482009, - 0x4048a01d, - 0x40492036, - 0x4049a04f, - 0x404a2069, - 0x404aa073, - 0x404b2083, - 0x404ba0a4, - 0x404c20bf, - 0x404ca0cd, - 0x404d20da, - 0x404da0ee, - 0x404e2106, - 0x404ea114, - 0x404f213e, - 0x404fa155, - 0x40502167, - 0x4050a198, - 0x405121c9, - 0x4051a1de, - 0x40522201, - 0x4052a221, - 0x40532236, - 0x4053a246, - 0x4054a252, - 0x40552268, - 0x4055a286, - 0x40562293, - 0x4056a29d, - 0x405722ab, - 0x4057a2c6, - 0x405822e1, - 0x4058a300, - 0x40592315, - 0x4059a32a, - 0x405a2347, - 0x405aa35b, - 0x405b2377, - 0x405ba38d, - 0x405c23aa, - 0x405ca3bc, - 0x405d23d3, - 0x405da3e4, - 0x405e2400, - 0x405ea414, - 0x405f2424, - 0x405fa440, - 0x40602455, - 0x4060a46b, - 0x40612488, - 0x4061a4a1, - 0x406224cb, - 0x4062a4d4, - 0x406324e4, - 0x4063a51d, - 0x40642533, - 0x4064a551, - 0x40652566, - 0x4065a583, - 0x4066259a, - 0x4066a5b8, - 0x406725d5, - 0x4067a5ec, - 0x4068260a, - 0x4068a621, - 0x40692639, - 0x4069a64a, - 0x406a265d, - 0x406aa670, - 0x406b2684, - 0x406ba6a8, - 0x406c26c3, - 0x406ca6e4, - 0x406d2708, - 0x406da723, - 0x406e2744, - 0x406ea759, - 0x406f2772, - 0x406fa77f, - 0x4070278d, - 0x4070a79a, - 0x407127b7, - 0x4071a7d7, - 0x407227f2, - 0x4072a80b, - 0x40732822, - 0x4073a83c, - 0x40742860, - 0x4074a876, - 0x4075288a, - 0x4075a89f, - 0x407628b9, - 0x4076a8cb, - 0x407728e0, - 0x4077a906, - 0x40782923, - 0x4078a946, - 0x4079296c, - 0x4079a989, - 0x407a29ac, - 0x407aa9c8, - 0x407b29e4, - 0x407ba9f6, - 0x407c2a03, - 0x407e2a10, - 0x407eaa26, - 0x407f2a3e, - 0x407faa51, - 0x40802a66, - 0x4080aa7f, - 0x40812a9d, - 0x4081aabd, - 0x40822ac6, - 0x4082aae2, - 0x40832aeb, - 0x4083a123, - 0x408421b2, - 0x4084a182, - 0x4085250c, - 0x4085a4f0, - 0x40861c3c, - 0x40869c4f, - 0x40871f41, - 0x40879f50, - 0x40881bcb, - 0x40889eca, - 0x40891f28, - 0x4089a4b4, - 0x408a1b70, - 0x408a9b81, - 0x408b1b93, - 0x408ba1ef, + 0x40321bb9, + 0x40329bd3, + 0x40331bfb, + 0x40339c13, + 0x40341c31, + 0x40349c78, + 0x40351c8f, + 0x40359cab, + 0x40361cc7, + 0x40369ce1, + 0x40371d00, + 0x40379d1f, + 0x40381d37, + 0x40389d54, + 0x40391d77, + 0x40399d94, + 0x403a1dc9, + 0x403a9e23, + 0x403b1e38, + 0x403b9e54, + 0x403c1e6e, + 0x403c9e79, + 0x403d1e9c, + 0x403d9ec0, + 0x403e1ed6, + 0x403e9ee0, + 0x403f1eec, + 0x403f9efd, + 0x40401f15, + 0x40409f1d, + 0x40411f26, + 0x40419f2f, + 0x40421f57, + 0x40429f6b, + 0x40431f76, + 0x40439f82, + 0x40441fd6, + 0x40449fe2, + 0x40451fef, + 0x4045a002, + 0x4046201a, + 0x4046a032, + 0x40472048, + 0x4047a063, + 0x4048207e, + 0x4048a092, + 0x404920ab, + 0x4049a0c4, + 0x404a20de, + 0x404aa0e8, + 0x404b1deb, + 0x404b9e0a, + 0x404c20f8, + 0x404ca106, + 0x404d2113, + 0x404da127, + 0x404e213f, + 0x404ea14d, + 0x404f2177, + 0x404fa18e, + 0x405021a0, + 0x4050a1d1, + 0x40512202, + 0x4051a217, + 0x4052223a, + 0x4052a25a, + 0x4053226f, + 0x4053a27f, + 0x4054a28b, + 0x405522a1, + 0x4055a2e1, + 0x405622ee, + 0x4056a2f8, + 0x40572306, + 0x4057a321, + 0x4058233c, + 0x4058a35b, + 0x40592370, + 0x4059a385, + 0x405a23a2, + 0x405aa3b6, + 0x405b23d2, + 0x405ba3e8, + 0x405c2405, + 0x405ca417, + 0x405d242e, + 0x405da43f, + 0x405e245b, + 0x405ea46f, + 0x405f247f, + 0x405fa49b, + 0x406024b0, + 0x4060a4c6, + 0x406124e3, + 0x4061a4fc, + 0x40622526, + 0x4062a52f, + 0x4063253f, + 0x4063a578, + 0x4064258e, + 0x4064a5ac, + 0x406525c1, + 0x4065a5de, + 0x406625f5, + 0x4066a613, + 0x40672630, + 0x4067a647, + 0x40682665, + 0x4068a67c, + 0x40692694, + 0x4069a6a5, + 0x406a26b8, + 0x406aa6cb, + 0x406b26df, + 0x406ba703, + 0x406c271e, + 0x406ca73f, + 0x406d2763, + 0x406da77e, + 0x406e279f, + 0x406ea7b4, + 0x406f27cd, + 0x406fa7da, + 0x407027e8, + 0x4070a7f5, + 0x40712812, + 0x4071a832, + 0x4072284d, + 0x4072a866, + 0x4073287d, + 0x4073a897, + 0x407428bb, + 0x4074a8d1, + 0x407528e5, + 0x4075a8fa, + 0x40762914, + 0x4076a926, + 0x4077293b, + 0x4077a961, + 0x4078297e, + 0x4078a9a1, + 0x407929c7, + 0x4079a9e4, + 0x407a2a07, + 0x407aaa23, + 0x407b2a3f, + 0x407baa51, + 0x407c2a5e, + 0x407e2a6b, + 0x407eaa81, + 0x407f2a99, + 0x407faaac, + 0x40802ac1, + 0x4080aada, + 0x40812af8, + 0x4081ab18, + 0x40822b21, + 0x4082ab3d, + 0x40832b46, + 0x4083a15c, + 0x408421eb, + 0x4084a1bb, + 0x40852567, + 0x4085a54b, + 0x40861c50, + 0x40869c63, + 0x40871fb6, + 0x40879fc5, + 0x40881bdf, + 0x40889f3f, + 0x40891f9d, + 0x4089a50f, + 0x408a1b84, + 0x408a9b95, + 0x408b1ba7, + 0x408ba228, + 0x408c1db2, + 0x408c9dd9, + 0x408d22bf, 0x4432042a, 0x4432843c, 0x44330445, @@ -629,63 +633,63 @@ const uint32_t kOpenSSLFunctionValues[] = { 0x4c3998fe, 0x4c3a1916, 0x4c3a9929, - 0x50322f96, - 0x5032afab, - 0x50332fbc, - 0x5033afcf, - 0x50342fe0, - 0x5034aff3, - 0x50353002, - 0x5035b017, - 0x50363027, - 0x5036b036, - 0x50373047, - 0x5037b057, - 0x50383068, - 0x5038b07b, - 0x5039308d, - 0x5039b0a3, - 0x503a30b5, - 0x503ab0c6, - 0x503b30d7, - 0x503bb0e8, - 0x503c30f3, - 0x503cb0ff, - 0x503d310a, - 0x503db115, - 0x503e3122, - 0x503eb137, - 0x503f3145, - 0x503fb159, - 0x5040316c, - 0x5040b17d, - 0x50413197, - 0x5041b1a6, - 0x504231af, - 0x5042b1be, - 0x504331d0, - 0x5043b1dc, - 0x504431e4, - 0x5044b1f7, - 0x50453208, - 0x5045b21e, - 0x5046322a, - 0x5046b23e, - 0x5047324c, - 0x5047b260, - 0x5048327a, - 0x5048b28e, - 0x504932a4, - 0x5049b2bb, - 0x504a32cd, - 0x504ab2e1, - 0x504b32f6, - 0x504bb30d, - 0x504c3321, - 0x504cb32a, - 0x504d3332, - 0x504db341, - 0x504e3351, + 0x50322ff1, + 0x5032b006, + 0x50333017, + 0x5033b02a, + 0x5034303b, + 0x5034b04e, + 0x5035305d, + 0x5035b072, + 0x50363082, + 0x5036b091, + 0x503730a2, + 0x5037b0b2, + 0x503830c3, + 0x5038b0d6, + 0x503930e8, + 0x5039b0fe, + 0x503a3110, + 0x503ab121, + 0x503b3132, + 0x503bb143, + 0x503c314e, + 0x503cb15a, + 0x503d3165, + 0x503db170, + 0x503e317d, + 0x503eb192, + 0x503f31a0, + 0x503fb1b4, + 0x504031c7, + 0x5040b1d8, + 0x504131f2, + 0x5041b201, + 0x5042320a, + 0x5042b219, + 0x5043322b, + 0x5043b237, + 0x5044323f, + 0x5044b252, + 0x50453263, + 0x5045b279, + 0x50463285, + 0x5046b299, + 0x504732a7, + 0x5047b2bb, + 0x504832d5, + 0x5048b2e9, + 0x504932ff, + 0x5049b316, + 0x504a3328, + 0x504ab33c, + 0x504b3351, + 0x504bb368, + 0x504c337c, + 0x504cb385, + 0x504d338d, + 0x504db39c, + 0x504e33ac, 0x68321109, 0x6832911a, 0x6833112a, @@ -1096,6 +1100,7 @@ const char kOpenSSLFunctionStringData[] = "BN_BLINDING_invert_ex\0" "BN_BLINDING_new\0" "BN_BLINDING_update\0" + "RSA_add_pkcs1_prefix\0" "RSA_check_key\0" "RSA_new_method\0" "RSA_padding_add_PKCS1_OAEP_mgf1\0" @@ -1114,7 +1119,7 @@ const char kOpenSSLFunctionStringData[] = "decrypt\0" "encrypt\0" "keygen\0" - "pkcs1_prefixed_msg\0" + "keygen_multiprime\0" "private_transform\0" "rsa_setup_blinding\0" "sign_raw\0" @@ -1141,7 +1146,11 @@ const char kOpenSSLFunctionStringData[] = "SSL_CTX_use_certificate_chain_file\0" "SSL_CTX_use_certificate_file\0" "SSL_CTX_use_psk_identity_hint\0" + "SSL_SESSION_from_bytes\0" "SSL_SESSION_new\0" + "SSL_SESSION_parse\0" + "SSL_SESSION_parse_octet_string\0" + "SSL_SESSION_parse_string\0" "SSL_SESSION_print_fp\0" "SSL_SESSION_set1_id_context\0" "SSL_SESSION_to_bytes_full\0" @@ -1179,8 +1188,6 @@ const char kOpenSSLFunctionStringData[] = "SSL_use_psk_identity_hint\0" "SSL_write\0" "d2i_SSL_SESSION\0" - "d2i_SSL_SESSION_get_octet_string\0" - "d2i_SSL_SESSION_get_string\0" "do_ssl3_write\0" "dtls1_accept\0" "dtls1_buffer_record\0" @@ -1203,6 +1210,7 @@ const char kOpenSSLFunctionStringData[] = "ssl3_accept\0" "ssl3_cert_verify_hash\0" "ssl3_check_cert_and_algorithm\0" + "ssl3_check_certificate_for_cipher\0" "ssl3_connect\0" "ssl3_ctrl\0" "ssl3_ctx_ctrl\0" @@ -1438,40 +1446,42 @@ const uint32_t kOpenSSLReasonValues[] = { 0x10340dd4, 0x103494b6, 0x103514cb, - 0x103594de, - 0x103614f7, - 0x1036950c, - 0x1037152a, - 0x10379539, - 0x10381555, - 0x10389570, - 0x1039157f, - 0x1039959b, - 0x103a15b6, - 0x103a95cd, - 0x103b15de, - 0x103b95f2, - 0x103c1611, - 0x103c9620, - 0x103d1637, - 0x103d964a, + 0x103594fd, + 0x10361516, + 0x1036952b, + 0x10371549, + 0x10379558, + 0x10381574, + 0x1038958f, + 0x1039159e, + 0x103995ba, + 0x103a15d5, + 0x103a95ec, + 0x103b15fd, + 0x103b9611, + 0x103c1630, + 0x103c963f, + 0x103d1656, + 0x103d9669, 0x103e0b5f, - 0x103e965d, - 0x103f1670, - 0x103f968a, - 0x1040169a, - 0x104096ae, - 0x104116c4, - 0x104196dc, - 0x104216f1, - 0x10429705, - 0x10431717, + 0x103e969a, + 0x103f16ad, + 0x103f96c7, + 0x104016d7, + 0x104096eb, + 0x10411701, + 0x10419719, + 0x1042172e, + 0x10429742, + 0x10431754, 0x104385d0, 0x104408b4, - 0x1044972c, - 0x10451743, - 0x10459758, - 0x10461766, + 0x10449769, + 0x10451780, + 0x10459795, + 0x104617a3, + 0x1046967c, + 0x104714de, 0x14320b42, 0x14328b50, 0x14330b5f, @@ -1542,43 +1552,43 @@ const uint32_t kOpenSSLReasonValues[] = { 0x28328b8e, 0x28330b5f, 0x28338ba1, - 0x2c322ab3, - 0x2c32aac1, - 0x2c332ad3, - 0x2c33aae5, - 0x2c342af9, - 0x2c34ab0b, - 0x2c352b26, - 0x2c35ab38, - 0x2c362b4b, + 0x2c322b08, + 0x2c32ab16, + 0x2c332b28, + 0x2c33ab3a, + 0x2c342b4e, + 0x2c34ab60, + 0x2c352b7b, + 0x2c35ab8d, + 0x2c362ba0, 0x2c3682f3, - 0x2c372b58, - 0x2c37ab6a, - 0x2c382b7d, - 0x2c38ab8b, - 0x2c392b9b, - 0x2c39abad, - 0x2c3a2bc1, - 0x2c3aabd2, + 0x2c372bad, + 0x2c37abbf, + 0x2c382bd2, + 0x2c38abe0, + 0x2c392bf0, + 0x2c39ac02, + 0x2c3a2c16, + 0x2c3aac27, 0x2c3b134c, - 0x2c3babe3, - 0x2c3c2bf7, - 0x2c3cac0d, - 0x2c3d2c26, - 0x2c3dac54, - 0x2c3e2c62, - 0x2c3eac7a, - 0x2c3f2c92, - 0x2c3fac9f, - 0x2c402cc2, - 0x2c40ace1, + 0x2c3bac38, + 0x2c3c2c4c, + 0x2c3cac62, + 0x2c3d2c7b, + 0x2c3daca9, + 0x2c3e2cb7, + 0x2c3eaccf, + 0x2c3f2ce7, + 0x2c3facf4, + 0x2c402d17, + 0x2c40ad36, 0x2c4111b6, - 0x2c41acf2, - 0x2c422d05, + 0x2c41ad47, + 0x2c422d5a, 0x2c429128, - 0x2c432d16, + 0x2c432d6b, 0x2c4386a2, - 0x2c442c43, + 0x2c442c98, 0x30320000, 0x30328015, 0x3033001f, @@ -1701,214 +1711,215 @@ const uint32_t kOpenSSLReasonValues[] = { 0x3c3e8da4, 0x3c3f0bb7, 0x3c3f8d8d, - 0x4032177d, - 0x40329793, - 0x403317c1, - 0x403397cb, - 0x403417e2, - 0x40349800, - 0x40351810, - 0x40359822, - 0x4036182f, - 0x4036983b, - 0x40371850, - 0x40379865, - 0x40381877, - 0x40389882, - 0x40391894, + 0x403217ba, + 0x403297d0, + 0x403317fe, + 0x40339808, + 0x4034181f, + 0x4034983d, + 0x4035184d, + 0x4035985f, + 0x4036186c, + 0x40369878, + 0x4037188d, + 0x403798a2, + 0x403818b4, + 0x403898bf, + 0x403918d1, 0x40398dd4, - 0x403a18a4, - 0x403a98b7, - 0x403b18d8, - 0x403b98e9, - 0x403c18f9, + 0x403a18e1, + 0x403a98f4, + 0x403b1915, + 0x403b9926, + 0x403c1936, 0x403c8064, - 0x403d1905, - 0x403d9921, - 0x403e1937, - 0x403e9946, - 0x403f1959, - 0x403f9973, - 0x40401981, - 0x40409996, - 0x404119aa, - 0x404199c7, - 0x404219e0, - 0x404299fb, - 0x40431a14, - 0x40439a27, - 0x40441a3b, - 0x40449a53, - 0x40451a63, - 0x40459a71, - 0x40461a8f, + 0x403d1942, + 0x403d995e, + 0x403e1974, + 0x403e9983, + 0x403f1996, + 0x403f99b0, + 0x404019be, + 0x404099d3, + 0x404119e7, + 0x40419a04, + 0x40421a1d, + 0x40429a38, + 0x40431a51, + 0x40439a64, + 0x40441a78, + 0x40449a90, + 0x40451aa0, + 0x40459aae, + 0x40461acc, 0x40468094, - 0x40471aa4, - 0x40479ab6, - 0x40481ada, - 0x40489afa, - 0x40491b0e, - 0x40499b23, - 0x404a1b3c, - 0x404a9b76, - 0x404b1b90, - 0x404b9bae, - 0x404c1bc9, - 0x404c9be3, - 0x404d1bfa, - 0x404d9c22, - 0x404e1c39, - 0x404e9c55, - 0x404f1c71, - 0x404f9c92, - 0x40501cb4, - 0x40509cd0, - 0x40511ce4, - 0x40519cf1, - 0x40521d08, - 0x40529d18, - 0x40531d28, - 0x40539d3c, - 0x40541d57, - 0x40549d67, - 0x40551d7e, - 0x40559d8d, - 0x40561da8, - 0x40569dc0, - 0x40571ddc, - 0x40579df5, - 0x40581e08, - 0x40589e1d, - 0x40591e40, - 0x40599e4e, - 0x405a1e5b, - 0x405a9e74, - 0x405b1e8c, - 0x405b9e9f, - 0x405c1eb4, - 0x405c9ec6, - 0x405d1edb, - 0x405d9eeb, - 0x405e1f04, - 0x405e9f18, - 0x405f1f28, - 0x405f9f40, - 0x40601f51, - 0x40609f64, - 0x40611f75, - 0x40619f93, - 0x40621fa4, - 0x40629fb1, - 0x40631fc8, - 0x4063a009, - 0x40642020, - 0x4064a02d, - 0x4065203b, - 0x4065a05d, - 0x40662085, - 0x4066a09a, - 0x406720b1, - 0x4067a0c2, - 0x406820d3, - 0x4068a0e4, - 0x406920f9, - 0x4069a110, - 0x406a2121, - 0x406aa13a, - 0x406b2155, - 0x406ba16c, - 0x406c21d9, - 0x406ca1fa, - 0x406d220d, - 0x406da22e, - 0x406e2249, - 0x406ea264, - 0x406f2285, - 0x406fa2ab, - 0x407022cb, - 0x4070a2e7, - 0x40712474, - 0x4071a497, - 0x407224ad, - 0x4072a4cc, - 0x407324e4, - 0x4073a504, - 0x4074272e, - 0x4074a753, - 0x4075276e, - 0x4075a78d, - 0x407627bc, - 0x4076a7e4, - 0x407727fd, - 0x4077a81c, - 0x40782841, - 0x4078a858, - 0x4079286b, - 0x4079a888, + 0x40471ae1, + 0x40479af3, + 0x40481b17, + 0x40489b37, + 0x40491b4b, + 0x40499b60, + 0x404a1b79, + 0x404a9bb3, + 0x404b1bcd, + 0x404b9beb, + 0x404c1c06, + 0x404c9c20, + 0x404d1c37, + 0x404d9c5f, + 0x404e1c76, + 0x404e9c92, + 0x404f1cae, + 0x404f9ccf, + 0x40501cf1, + 0x40509d0d, + 0x40511d21, + 0x40519d2e, + 0x40521d45, + 0x40529d55, + 0x40531d65, + 0x40539d79, + 0x40541d94, + 0x40549da4, + 0x40551dbb, + 0x40559dca, + 0x40561de5, + 0x40569dfd, + 0x40571e19, + 0x40579e32, + 0x40581e45, + 0x40589e5a, + 0x40591e7d, + 0x40599e8b, + 0x405a1e98, + 0x405a9eb1, + 0x405b1ec9, + 0x405b9edc, + 0x405c1ef1, + 0x405c9f03, + 0x405d1f18, + 0x405d9f28, + 0x405e1f41, + 0x405e9f55, + 0x405f1f65, + 0x405f9f7d, + 0x40601f8e, + 0x40609fa1, + 0x40611fb2, + 0x40619fd0, + 0x40621fe1, + 0x40629fee, + 0x40632005, + 0x4063a046, + 0x4064205d, + 0x4064a06a, + 0x40652078, + 0x4065a09a, + 0x406620c2, + 0x4066a0d7, + 0x406720ee, + 0x4067a0ff, + 0x40682110, + 0x4068a121, + 0x40692136, + 0x4069a14d, + 0x406a215e, + 0x406aa177, + 0x406b2192, + 0x406ba1a9, + 0x406c2216, + 0x406ca237, + 0x406d224a, + 0x406da26b, + 0x406e2286, + 0x406ea2a1, + 0x406f22c2, + 0x406fa2e8, + 0x40702308, + 0x4070a324, + 0x407124b1, + 0x4071a4d4, + 0x407224ea, + 0x4072a509, + 0x40732521, + 0x4073a541, + 0x4074276b, + 0x4074a790, + 0x407527ab, + 0x4075a7ca, + 0x407627f9, + 0x4076a821, + 0x40772852, + 0x4077a871, + 0x40782896, + 0x4078a8ad, + 0x407928c0, + 0x4079a8dd, 0x407a0782, - 0x407aa89a, - 0x407b28ad, - 0x407ba8c6, - 0x407c28de, + 0x407aa8ef, + 0x407b2902, + 0x407ba91b, + 0x407c2933, 0x407c90b0, - 0x407d28f2, - 0x407da90c, - 0x407e291d, - 0x407ea931, - 0x407f293f, - 0x407fa95a, + 0x407d2947, + 0x407da961, + 0x407e2972, + 0x407ea986, + 0x407f2994, + 0x407fa9af, 0x40801279, - 0x4080a97f, - 0x408129a1, - 0x4081a9bc, - 0x408229d1, - 0x4082a9e9, - 0x40832a01, - 0x4083aa18, - 0x40842a2e, - 0x4084aa3a, - 0x40852a4d, - 0x4085aa62, - 0x40862a74, - 0x4086aa89, - 0x40872a92, - 0x40879c10, + 0x4080a9d4, + 0x408129f6, + 0x4081aa11, + 0x40822a26, + 0x4082aa3e, + 0x40832a56, + 0x4083aa6d, + 0x40842a83, + 0x4084aa8f, + 0x40852aa2, + 0x4085aab7, + 0x40862ac9, + 0x4086aade, + 0x40872ae7, + 0x40879c4d, 0x40880083, - 0x40889fe8, + 0x4088a025, 0x40890a0a, - 0x4089a184, - 0x408a1b5f, - 0x408aa1ae, - 0x41f4239f, - 0x41f92431, - 0x41fe2324, - 0x41fea555, - 0x41ff2646, - 0x420323b8, - 0x420823da, - 0x4208a416, - 0x42092308, - 0x4209a450, - 0x420a235f, - 0x420aa33f, - 0x420b237f, - 0x420ba3f8, - 0x420c2662, - 0x420ca522, - 0x420d253c, - 0x420da573, - 0x4212258d, - 0x42172629, - 0x4217a5cf, - 0x421c25f1, - 0x421f25ac, - 0x42212679, - 0x4226260c, - 0x422b2712, - 0x422ba6db, - 0x422c26fa, - 0x422ca6b5, - 0x422d2694, + 0x4089a1c1, + 0x408a1b9c, + 0x408aa1eb, + 0x408b283a, + 0x41f423dc, + 0x41f9246e, + 0x41fe2361, + 0x41fea592, + 0x41ff2683, + 0x420323f5, + 0x42082417, + 0x4208a453, + 0x42092345, + 0x4209a48d, + 0x420a239c, + 0x420aa37c, + 0x420b23bc, + 0x420ba435, + 0x420c269f, + 0x420ca55f, + 0x420d2579, + 0x420da5b0, + 0x421225ca, + 0x42172666, + 0x4217a60c, + 0x421c262e, + 0x421f25e9, + 0x422126b6, + 0x42262649, + 0x422b274f, + 0x422ba718, + 0x422c2737, + 0x422ca6f2, + 0x422d26d1, 0x443206ad, 0x443286bc, 0x443306c8, @@ -1951,69 +1962,69 @@ const uint32_t kOpenSSLReasonValues[] = { 0x4c3d10b0, 0x4c3d943c, 0x4c3e1449, - 0x50322d28, - 0x5032ad37, - 0x50332d42, - 0x5033ad52, - 0x50342d6b, - 0x5034ad85, - 0x50352d93, - 0x5035ada9, - 0x50362dbb, - 0x5036add1, - 0x50372dea, - 0x5037adfd, - 0x50382e15, - 0x5038ae26, - 0x50392e3b, - 0x5039ae4f, - 0x503a2e6f, - 0x503aae85, - 0x503b2e9d, - 0x503baeaf, - 0x503c2ecb, - 0x503caee2, - 0x503d2efb, - 0x503daf11, - 0x503e2f1e, - 0x503eaf34, - 0x503f2f46, + 0x50322d7d, + 0x5032ad8c, + 0x50332d97, + 0x5033ada7, + 0x50342dc0, + 0x5034adda, + 0x50352de8, + 0x5035adfe, + 0x50362e10, + 0x5036ae26, + 0x50372e3f, + 0x5037ae52, + 0x50382e6a, + 0x5038ae7b, + 0x50392e90, + 0x5039aea4, + 0x503a2ec4, + 0x503aaeda, + 0x503b2ef2, + 0x503baf04, + 0x503c2f20, + 0x503caf37, + 0x503d2f50, + 0x503daf66, + 0x503e2f73, + 0x503eaf89, + 0x503f2f9b, 0x503f8348, - 0x50402f59, - 0x5040af69, - 0x50412f83, - 0x5041af92, - 0x50422fac, - 0x5042afc9, - 0x50432fd9, - 0x5043afe9, - 0x50442ff8, + 0x50402fae, + 0x5040afbe, + 0x50412fd8, + 0x5041afe7, + 0x50423001, + 0x5042b01e, + 0x5043302e, + 0x5043b03e, + 0x5044304d, 0x50448414, - 0x5045300c, - 0x5045b02a, - 0x5046303d, - 0x5046b053, - 0x50473065, - 0x5047b07a, - 0x504830a0, - 0x5048b0ae, - 0x504930c1, - 0x5049b0d6, - 0x504a30ec, - 0x504ab0fc, - 0x504b311c, - 0x504bb12f, - 0x504c3152, - 0x504cb180, - 0x504d3192, - 0x504db1af, - 0x504e31ca, - 0x504eb1e6, - 0x504f31f8, - 0x504fb20f, - 0x5050321e, + 0x50453061, + 0x5045b07f, + 0x50463092, + 0x5046b0a8, + 0x504730ba, + 0x5047b0cf, + 0x504830f5, + 0x5048b103, + 0x50493116, + 0x5049b12b, + 0x504a3141, + 0x504ab151, + 0x504b3171, + 0x504bb184, + 0x504c31a7, + 0x504cb1d5, + 0x504d31e7, + 0x504db204, + 0x504e321f, + 0x504eb23b, + 0x504f324d, + 0x504fb264, + 0x50503273, 0x50508687, - 0x50513231, + 0x50513286, 0x58320e12, 0x68320dd4, 0x68328b8e, @@ -2329,6 +2340,7 @@ const char kOpenSSLReasonStringData[] = "BAD_RSA_PARAMETERS\0" "BLOCK_TYPE_IS_NOT_01\0" "BN_NOT_INITIALIZED\0" + "CANNOT_RECOVER_MULTI_PRIME_KEY\0" "CRT_PARAMS_ALREADY_GIVEN\0" "CRT_VALUES_INCORRECT\0" "DATA_LEN_NOT_EQUAL_TO_MOD_LEN\0" @@ -2346,6 +2358,7 @@ const char kOpenSSLReasonStringData[] = "INVALID_MESSAGE_LENGTH\0" "KEY_SIZE_TOO_SMALL\0" "LAST_OCTET_INVALID\0" + "MUST_HAVE_AT_LEAST_TWO_PRIMES\0" "NO_PUBLIC_EXPONENT\0" "NULL_BEFORE_BLOCK_MISSING\0" "N_NOT_EQUAL_P_Q\0" @@ -2530,6 +2543,7 @@ const char kOpenSSLReasonStringData[] = "TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST\0" "TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG\0" "TOO_MANY_EMPTY_FRAGMENTS\0" + "TOO_MANY_WARNING_ALERTS\0" "UNABLE_TO_FIND_ECDH_PARAMETERS\0" "UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS\0" "UNEXPECTED_GROUP_CLOSE\0" |