Revert of Roll src/third_party/boringssl/src 68de407:de12d6c

third_party/boringssl/err_data.c

Index: third_party/boringssl/err_data.c
diff --git a/third_party/boringssl/err_data.c b/third_party/boringssl/err_data.c
index 68397e4bbe72d88685191fece23502cd917b9bb0..16b52e71d3e133e61c0b12dba81ebb7466e3b452 100644
--- a/third_party/boringssl/err_data.c
+++ b/third_party/boringssl/err_data.c
@@ -216,65 +216,65 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x28330aa9,
     0x28338aae,
     0x28340ab9,
-    0x2c322a70,
-    0x2c32aa7c,
-    0x2c332a8f,
-    0x2c33aaa0,
-    0x2c342ab9,
-    0x2c34aae1,
-    0x2c352af8,
-    0x2c35ab15,
-    0x2c362b32,
-    0x2c36ab4f,
-    0x2c372b68,
-    0x2c37ab81,
-    0x2c382b97,
-    0x2c38aba5,
-    0x2c392bb7,
-    0x2c39abd4,
-    0x2c3a2bf1,
-    0x2c3aabff,
-    0x2c3b2c1d,
-    0x2c3bac3b,
-    0x2c3c2c56,
-    0x2c3cac6a,
-    0x2c3d2c7c,
-    0x2c3dac8c,
-    0x2c3e2c9a,
-    0x2c3eacaa,
-    0x2c3f2cba,
-    0x2c3facd5,
-    0x2c402ce6,
-    0x2c40ad01,
-    0x2c412d15,
-    0x2c41ad28,
-    0x2c422d47,
-    0x2c42ad5b,
-    0x2c432d6e,
-    0x2c43ad7d,
-    0x2c442d8c,
-    0x2c44ada3,
-    0x2c452dbe,
-    0x2c45add6,
-    0x2c462dea,
-    0x2c46adfd,
-    0x2c472e0e,
-    0x2c47ae1f,
-    0x2c482e30,
-    0x2c48ae41,
-    0x2c492e50,
-    0x2c49ae5d,
-    0x2c4a2e6a,
-    0x2c4aae77,
-    0x2c4b2e80,
-    0x2c4bae94,
-    0x2c4c2ea3,
-    0x2c4caeb1,
-    0x2c4d2ed3,
-    0x2c4daee4,
-    0x2c4e2ef5,
-    0x2c4eaec0,
-    0x2c4f2ad2,
+    0x2c322a27,
+    0x2c32aa33,
+    0x2c332a46,
+    0x2c33aa57,
+    0x2c342a70,
+    0x2c34aa98,
+    0x2c352aaf,
+    0x2c35aacc,
+    0x2c362ae9,
+    0x2c36ab06,
+    0x2c372b1f,
+    0x2c37ab38,
+    0x2c382b4e,
+    0x2c38ab5c,
+    0x2c392b6e,
+    0x2c39ab8b,
+    0x2c3a2ba8,
+    0x2c3aabb6,
+    0x2c3b2bd4,
+    0x2c3babf2,
+    0x2c3c2c0d,
+    0x2c3cac21,
+    0x2c3d2c33,
+    0x2c3dac43,
+    0x2c3e2c51,
+    0x2c3eac61,
+    0x2c3f2c71,
+    0x2c3fac8c,
+    0x2c402c9d,
+    0x2c40acb8,
+    0x2c412ccc,
+    0x2c41acdf,
+    0x2c422cfe,
+    0x2c42ad12,
+    0x2c432d25,
+    0x2c43ad34,
+    0x2c442d43,
+    0x2c44ad5a,
+    0x2c452d75,
+    0x2c45ad8d,
+    0x2c462da1,
+    0x2c46adb4,
+    0x2c472dc5,
+    0x2c47add6,
+    0x2c482de7,
+    0x2c48adf8,
+    0x2c492e07,
+    0x2c49ae14,
+    0x2c4a2e21,
+    0x2c4aae2e,
+    0x2c4b2e37,
+    0x2c4bae4b,
+    0x2c4c2e5a,
+    0x2c4cae68,
+    0x2c4d2e8a,
+    0x2c4dae9b,
+    0x2c4e2eac,
+    0x2c4eae77,
+    0x2c4f2a89,
     0x30320000,
     0x30328018,
     0x3033002c,
@@ -414,176 +414,172 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x3c521083,
     0x40321b21,
     0x40329b3b,
-    0x40331b63,
-    0x40339b7b,
-    0x40341b99,
-    0x40349be0,
-    0x40351bf7,
-    0x40359c13,
-    0x40361c2f,
-    0x40369c49,
-    0x40371c68,
-    0x40379c87,
-    0x40381c9f,
-    0x40389cbc,
-    0x40391cdf,
-    0x40399cfc,
-    0x403a1d1a,
-    0x403a9d2a,
-    0x403b1d3f,
-    0x403b9d5b,
-    0x403c1d75,
-    0x403c9d80,
-    0x403d1da3,
-    0x403d9dc7,
-    0x403e1ddd,
-    0x403e9de7,
-    0x403f1df3,
-    0x403f9e04,
-    0x40401e1c,
-    0x40409e24,
-    0x40411e2d,
-    0x40419e36,
-    0x40421e5e,
-    0x40429e72,
-    0x40431e7d,
-    0x40439e89,
-    0x40441edd,
-    0x40449ee9,
-    0x40451ef6,
-    0x40459f09,
-    0x40461f21,
-    0x40469f39,
-    0x40471f4f,
-    0x40479f6a,
-    0x40481f85,
-    0x40489f99,
-    0x40491fb2,
-    0x40499fcb,
-    0x404a1fe5,
-    0x404a9fef,
-    0x404b1fff,
-    0x404ba020,
-    0x404c203b,
-    0x404ca049,
-    0x404d2056,
-    0x404da06a,
-    0x404e2082,
-    0x404ea090,
-    0x404f20ba,
-    0x404fa0d1,
-    0x405020e3,
-    0x4050a114,
-    0x40512145,
-    0x4051a15a,
-    0x4052216b,
-    0x4052a18b,
-    0x405321a6,
-    0x4053a1b6,
-    0x4054a1c2,
-    0x405521d8,
-    0x4055a1f6,
-    0x40562203,
-    0x4056a20d,
-    0x4057221b,
-    0x4057a236,
-    0x40582251,
-    0x4058a270,
-    0x40592285,
-    0x4059a29a,
-    0x405a22b7,
-    0x405aa2cb,
-    0x405b22e7,
-    0x405ba2fd,
-    0x405c231a,
-    0x405ca32c,
-    0x405d2343,
-    0x405da354,
-    0x405e2370,
-    0x405ea384,
-    0x405f2394,
-    0x405fa3b0,
-    0x406023c5,
-    0x4060a3db,
-    0x406123f8,
-    0x4061a411,
-    0x4062243b,
-    0x4062a444,
-    0x40632454,
-    0x4063a48d,
-    0x406424a3,
-    0x4064a4c1,
-    0x406524d6,
-    0x4065a4f3,
-    0x4066250a,
-    0x4066a528,
-    0x40672545,
-    0x4067a55c,
-    0x4068257a,
-    0x4068a591,
-    0x406925a9,
-    0x4069a5ba,
-    0x406a25cd,
-    0x406aa5e0,
-    0x406b25f4,
-    0x406ba618,
-    0x406c2633,
-    0x406ca654,
-    0x406d2678,
-    0x406da693,
-    0x406e26b4,
-    0x406ea6c9,
-    0x406f26e2,
-    0x406fa6ef,
-    0x407026fd,
-    0x4070a70a,
-    0x40712727,
-    0x4071a747,
-    0x40722762,
-    0x4072a77b,
-    0x40732792,
-    0x4073a7ac,
-    0x407427d0,
-    0x4074a7e6,
-    0x407527fa,
-    0x4075a80f,
-    0x40762829,
-    0x4076a83b,
-    0x40772850,
-    0x4077a876,
-    0x40782893,
-    0x4078a8b6,
-    0x407928dc,
-    0x4079a8f9,
-    0x407a291c,
-    0x407aa938,
-    0x407b2954,
-    0x407ba966,
-    0x407c2973,
-    0x407e2980,
-    0x407ea996,
-    0x407f29ae,
-    0x407fa9c1,
-    0x408029d6,
-    0x4080a9ef,
-    0x40812a0d,
-    0x4081aa2d,
-    0x40822a36,
-    0x4082aa52,
-    0x40832a5b,
-    0x4083a09f,
-    0x4084212e,
-    0x4084a0fe,
-    0x4085247c,
-    0x4085a460,
-    0x40861bb8,
-    0x40869bcb,
-    0x40871ebd,
-    0x40879ecc,
-    0x40881b47,
-    0x40889e46,
-    0x40891ea4,
-    0x4089a424,
+    0x40331b47,
+    0x40339b5f,
+    0x40341b7d,
+    0x40349b9c,
+    0x40351bb3,
+    0x40359bcf,
+    0x40361beb,
+    0x40369c05,
+    0x40371c24,
+    0x40379c43,
+    0x40381c5b,
+    0x40389c78,
+    0x40391c9b,
+    0x40399cb8,
+    0x403a1cd6,
+    0x403a9ce6,
+    0x403b1cfb,
+    0x403b9d17,
+    0x403c1d31,
+    0x403c9d3c,
+    0x403d1d5f,
+    0x403d9d83,
+    0x403e1d99,
+    0x403e9da3,
+    0x403f1daf,
+    0x403f9dc0,
+    0x40401dd8,
+    0x40409de0,
+    0x40411de9,
+    0x40419df2,
+    0x40421e02,
+    0x40429e16,
+    0x40431e21,
+    0x40439e2d,
+    0x40441e48,
+    0x40449e54,
+    0x40451e61,
+    0x40459e74,
+    0x40461e8c,
+    0x40469ea4,
+    0x40471eba,
+    0x40479ed5,
+    0x40481ef0,
+    0x40489f04,
+    0x40491f1d,
+    0x40499f36,
+    0x404a1f50,
+    0x404a9f5a,
+    0x404b1f6a,
+    0x404b9f8b,
+    0x404c1fa6,
+    0x404c9fb4,
+    0x404d1fc1,
+    0x404d9fd5,
+    0x404e1fed,
+    0x404e9ffb,
+    0x404f2025,
+    0x404fa03c,
+    0x4050204e,
+    0x4050a07f,
+    0x405120b0,
+    0x4051a0c5,
+    0x405220d6,
+    0x4052a0f6,
+    0x40532111,
+    0x4053a121,
+    0x4054212d,
+    0x4054a140,
+    0x40552156,
+    0x4055a174,
+    0x40562181,
+    0x4056a18b,
+    0x40572199,
+    0x4057a1b4,
+    0x405821cf,
+    0x4058a1ee,
+    0x40592203,
+    0x4059a218,
+    0x405a2235,
+    0x405aa249,
+    0x405b2265,
+    0x405ba27b,
+    0x405c2298,
+    0x405ca2aa,
+    0x405d22c1,
+    0x405da2d2,
+    0x405e22ee,
+    0x405ea302,
+    0x405f2312,
+    0x405fa32e,
+    0x40602343,
+    0x4060a359,
+    0x40612376,
+    0x4061a38f,
+    0x406223a2,
+    0x4062a3ab,
+    0x406323bb,
+    0x4063a3f4,
+    0x4064240a,
+    0x4064a428,
+    0x4065243d,
+    0x4065a45a,
+    0x40662471,
+    0x4066a48f,
+    0x406724ac,
+    0x4067a4c3,
+    0x406824e1,
+    0x4068a4f8,
+    0x40692510,
+    0x4069a521,
+    0x406a2534,
+    0x406aa547,
+    0x406b255b,
+    0x406ba57f,
+    0x406c259a,
+    0x406ca5bb,
+    0x406d25df,
+    0x406da5fa,
+    0x406e261b,
+    0x406ea630,
+    0x406f2649,
+    0x406fa656,
+    0x40702664,
+    0x4070a671,
+    0x4071268e,
+    0x4071a6ae,
+    0x407226c9,
+    0x4072a6e2,
+    0x407326f9,
+    0x4073a713,
+    0x40742737,
+    0x4074a74d,
+    0x40752761,
+    0x4075a776,
+    0x40762790,
+    0x4076a7a2,
+    0x407727b7,
+    0x4077a7dd,
+    0x407827fa,
+    0x4078a81d,
+    0x40792843,
+    0x4079a860,
+    0x407a2883,
+    0x407aa89f,
+    0x407b28bb,
+    0x407ba8cd,
+    0x407c28da,
+    0x407ca8e7,
+    0x407d2904,
+    0x407da91b,
+    0x407e2937,
+    0x407ea94d,
+    0x407f2965,
+    0x407fa978,
+    0x4080298d,
+    0x4080a9a6,
+    0x408129c4,
+    0x4081a9e4,
+    0x408229ed,
+    0x4082aa09,
+    0x40832a12,
+    0x4083a00a,
+    0x40842099,
+    0x4084a069,
+    0x408523e3,
+    0x4085a3c7,
     0x4432042a,
     0x4432843c,
     0x44330445,
@@ -620,63 +616,63 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x4c3998af,
     0x4c3a18c7,
     0x4c3a98da,
-    0x50322f06,
-    0x5032af1b,
-    0x50332f2c,
-    0x5033af3f,
-    0x50342f50,
-    0x5034af63,
-    0x50352f72,
-    0x5035af87,
-    0x50362f97,
-    0x5036afa6,
-    0x50372fb7,
-    0x5037afc7,
-    0x50382fd8,
-    0x5038afeb,
-    0x50392ffd,
-    0x5039b013,
-    0x503a3025,
-    0x503ab036,
-    0x503b3047,
-    0x503bb058,
-    0x503c3063,
-    0x503cb06f,
-    0x503d307a,
-    0x503db085,
-    0x503e3092,
-    0x503eb0a7,
-    0x503f30b5,
-    0x503fb0c9,
-    0x504030dc,
-    0x5040b0ed,
-    0x50413107,
-    0x5041b116,
-    0x5042311f,
-    0x5042b12e,
-    0x50433140,
-    0x5043b14c,
-    0x50443154,
-    0x5044b167,
-    0x50453178,
-    0x5045b18e,
-    0x5046319a,
-    0x5046b1ae,
-    0x504731bc,
-    0x5047b1d0,
-    0x504831ea,
-    0x5048b1fe,
-    0x50493214,
-    0x5049b22b,
-    0x504a323d,
-    0x504ab251,
-    0x504b3266,
-    0x504bb27d,
-    0x504c3291,
-    0x504cb29a,
-    0x504d32a2,
-    0x504db2b1,
-    0x504e32c1,
+    0x50322ebd,
+    0x5032aed2,
+    0x50332ee3,
+    0x5033aef6,
+    0x50342f07,
+    0x5034af1a,
+    0x50352f29,
+    0x5035af3e,
+    0x50362f4e,
+    0x5036af5d,
+    0x50372f6e,
+    0x5037af7e,
+    0x50382f8f,
+    0x5038afa2,
+    0x50392fb4,
+    0x5039afca,
+    0x503a2fdc,
+    0x503aafed,
+    0x503b2ffe,
+    0x503bb00f,
+    0x503c301a,
+    0x503cb026,
+    0x503d3031,
+    0x503db03c,
+    0x503e3049,
+    0x503eb05e,
+    0x503f306c,
+    0x503fb080,
+    0x50403093,
+    0x5040b0a4,
+    0x504130be,
+    0x5041b0cd,
+    0x504230d6,
+    0x5042b0e5,
+    0x504330f7,
+    0x5043b103,
+    0x5044310b,
+    0x5044b11e,
+    0x5045312f,
+    0x5045b145,
+    0x50463151,
+    0x5046b165,
+    0x50473173,
+    0x5047b187,
+    0x504831a1,
+    0x5048b1b5,
+    0x504931cb,
+    0x5049b1e2,
+    0x504a31f4,
+    0x504ab208,
+    0x504b321d,
+    0x504bb234,
+    0x504c3248,
+    0x504cb251,
+    0x504d3259,
+    0x504db268,
+    0x504e3278,
     0x683210ba,
     0x683290cb,
     0x683310db,
@@ -1107,12 +1103,9 @@ const char kOpenSSLFunctionStringData[] =
     "verify_raw\0"
     "SSL_CTX_check_private_key\0"
     "SSL_CTX_new\0"
-    "SSL_CTX_set1_tls_channel_id\0"
     "SSL_CTX_set_cipher_list\0"
     "SSL_CTX_set_cipher_list_tls11\0"
     "SSL_CTX_set_session_id_context\0"
-    "SSL_CTX_set_tmp_dh\0"
-    "SSL_CTX_set_tmp_ecdh\0"
     "SSL_CTX_use_PrivateKey\0"
     "SSL_CTX_use_PrivateKey_ASN1\0"
     "SSL_CTX_use_PrivateKey_file\0"
@@ -1140,14 +1133,10 @@ const char kOpenSSLFunctionStringData[] =
     "SSL_peek\0"
     "SSL_read\0"
     "SSL_renegotiate\0"
-    "SSL_set1_tls_channel_id\0"
     "SSL_set_cipher_list\0"
     "SSL_set_fd\0"
     "SSL_set_rfd\0"
     "SSL_set_session_id_context\0"
-    "SSL_set_tlsext_host_name\0"
-    "SSL_set_tmp_dh\0"
-    "SSL_set_tmp_ecdh\0"
     "SSL_set_wfd\0"
     "SSL_shutdown\0"
     "SSL_use_PrivateKey\0"
@@ -1183,6 +1172,7 @@ const char kOpenSSLFunctionStringData[] =
     "dtls1_write_app_data_bytes\0"
     "i2d_SSL_SESSION\0"
     "ssl3_accept\0"
+    "ssl3_callback_ctrl\0"
     "ssl3_cert_verify_hash\0"
     "ssl3_check_cert_and_algorithm\0"
     "ssl3_connect\0"
@@ -1210,7 +1200,6 @@ const char kOpenSSLFunctionStringData[] =
     "ssl3_get_server_key_exchange\0"
     "ssl3_get_v2_client_hello\0"
     "ssl3_handshake_mac\0"
-    "ssl3_output_cert_chain\0"
     "ssl3_prf\0"
     "ssl3_read_bytes\0"
     "ssl3_read_n\0"
@@ -1266,6 +1255,9 @@ const char kOpenSSLFunctionStringData[] =
     "ssl_sess_cert_new\0"
     "ssl_set_cert\0"
     "ssl_set_pkey\0"
+    "ssl_undefined_const_function\0"
+    "ssl_undefined_function\0"
+    "ssl_undefined_void_function\0"
     "ssl_verify_cert_chain\0"
     "tls12_check_peer_sigalg\0"
     "tls1_aead_ctx_init\0"