Roll src/third_party/boringssl/src d6c22ee93..d04ca9535

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 79e875342b2c1b7c6bb14d5e6b9ce72d7d472ab0..08dd8117117da6a83af45fe41e676fb444b6a7cb 100644
--- a/third_party/boringssl/err_data.c
+++ b/third_party/boringssl/err_data.c
@@ -178,42 +178,42 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x28340c19,
     0x283480ac,
     0x283500ea,
-    0x2c3229c5,
-    0x2c32a9d3,
-    0x2c3329e5,
-    0x2c33a9f7,
-    0x2c342a0b,
-    0x2c34aa1d,
-    0x2c352a38,
-    0x2c35aa4a,
-    0x2c362a5d,
+    0x2c322a0e,
+    0x2c32aa1c,
+    0x2c332a2e,
+    0x2c33aa40,
+    0x2c342a54,
+    0x2c34aa66,
+    0x2c352a81,
+    0x2c35aa93,
+    0x2c362aa6,
     0x2c36832d,
-    0x2c372a6a,
-    0x2c37aa7c,
-    0x2c382a8f,
-    0x2c38aaa6,
-    0x2c392ab4,
-    0x2c39aac4,
-    0x2c3a2ad6,
-    0x2c3aaaea,
-    0x2c3b2afb,
-    0x2c3bab1a,
-    0x2c3c2b2e,
-    0x2c3cab44,
-    0x2c3d2b5d,
-    0x2c3dab7a,
-    0x2c3e2b8b,
-    0x2c3eab99,
-    0x2c3f2bb1,
-    0x2c3fabc9,
-    0x2c402bd6,
+    0x2c372ab3,
+    0x2c37aac5,
+    0x2c382ad8,
+    0x2c38aaef,
+    0x2c392afd,
+    0x2c39ab0d,
+    0x2c3a2b1f,
+    0x2c3aab33,
+    0x2c3b2b44,
+    0x2c3bab63,
+    0x2c3c2b77,
+    0x2c3cab8d,
+    0x2c3d2ba6,
+    0x2c3dabc3,
+    0x2c3e2bd4,
+    0x2c3eabe2,
+    0x2c3f2bfa,
+    0x2c3fac12,
+    0x2c402c1f,
     0x2c4090e7,
-    0x2c412be7,
-    0x2c41abfa,
+    0x2c412c30,
+    0x2c41ac43,
     0x2c4210c0,
-    0x2c42ac0b,
+    0x2c42ac54,
     0x2c430720,
-    0x2c43ab0c,
+    0x2c43ab55,
     0x30320000,
     0x30328015,
     0x3033001f,
@@ -366,190 +366,192 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x403b9861,
     0x403c0064,
     0x403c8083,
-    0x403d18c1,
-    0x403d98d7,
-    0x403e18e6,
-    0x403e98f9,
-    0x403f1913,
-    0x403f9921,
-    0x40401936,
-    0x4040994a,
-    0x40411967,
-    0x40419982,
-    0x4042199b,
-    0x404299ae,
-    0x404319c2,
-    0x404399da,
-    0x404419f1,
+    0x403d18e5,
+    0x403d98fb,
+    0x403e190a,
+    0x403e9942,
+    0x403f195c,
+    0x403f996a,
+    0x4040197f,
+    0x40409993,
+    0x404119b0,
+    0x404199cb,
+    0x404219e4,
+    0x404299f7,
+    0x40431a0b,
+    0x40439a23,
+    0x40441a3a,
     0x404480ac,
-    0x40451a06,
-    0x40459a18,
-    0x40461a3c,
-    0x40469a5c,
-    0x40471a6a,
-    0x40479a91,
-    0x40481ace,
-    0x40489ae7,
-    0x40491afe,
-    0x40499b18,
-    0x404a1b2f,
-    0x404a9b4d,
-    0x404b1b65,
-    0x404b9b7c,
-    0x404c1b92,
-    0x404c9ba4,
-    0x404d1bc5,
-    0x404d9be7,
-    0x404e1bfb,
-    0x404e9c08,
-    0x404f1c35,
-    0x404f9c5e,
-    0x40501c99,
-    0x40509cad,
-    0x40511cc8,
-    0x40519cd8,
-    0x40521cef,
-    0x40529d13,
-    0x40531d2b,
-    0x40539d3e,
-    0x40541d53,
-    0x40549d76,
-    0x40551d84,
-    0x40559da1,
-    0x40561dae,
-    0x40569dc7,
-    0x40571ddf,
-    0x40579df2,
-    0x40581e07,
-    0x40589e2e,
-    0x40591e5d,
-    0x40599e8a,
-    0x405a1e9e,
-    0x405a9eae,
-    0x405b1ec6,
-    0x405b9ed7,
-    0x405c1eea,
-    0x405c9f0b,
-    0x405d1f18,
-    0x405d9f2f,
-    0x405e1f6d,
+    0x40451a4f,
+    0x40459a61,
+    0x40461a85,
+    0x40469aa5,
+    0x40471ab3,
+    0x40479ada,
+    0x40481b17,
+    0x40489b30,
+    0x40491b47,
+    0x40499b61,
+    0x404a1b78,
+    0x404a9b96,
+    0x404b1bae,
+    0x404b9bc5,
+    0x404c1bdb,
+    0x404c9bed,
+    0x404d1c0e,
+    0x404d9c30,
+    0x404e1c44,
+    0x404e9c51,
+    0x404f1c7e,
+    0x404f9ca7,
+    0x40501ce2,
+    0x40509cf6,
+    0x40511d11,
+    0x40519d21,
+    0x40521d38,
+    0x40529d5c,
+    0x40531d74,
+    0x40539d87,
+    0x40541d9c,
+    0x40549dbf,
+    0x40551dcd,
+    0x40559dea,
+    0x40561df7,
+    0x40569e10,
+    0x40571e28,
+    0x40579e3b,
+    0x40581e50,
+    0x40589e77,
+    0x40591ea6,
+    0x40599ed3,
+    0x405a1ee7,
+    0x405a9ef7,
+    0x405b1f0f,
+    0x405b9f20,
+    0x405c1f33,
+    0x405c9f54,
+    0x405d1f61,
+    0x405d9f78,
+    0x405e1fb6,
     0x405e8a95,
-    0x405f1f8e,
-    0x405f9f9b,
-    0x40601fa9,
-    0x40609fcb,
-    0x4061200f,
-    0x4061a047,
-    0x4062205e,
-    0x4062a06f,
-    0x40632080,
-    0x4063a095,
-    0x406420ac,
-    0x4064a0d8,
-    0x406520f3,
-    0x4065a10a,
-    0x40662122,
-    0x4066a14c,
-    0x40672177,
-    0x4067a198,
-    0x406821bf,
-    0x4068a1e0,
-    0x40692212,
-    0x4069a240,
-    0x406a2261,
-    0x406aa281,
-    0x406b2409,
-    0x406ba42c,
-    0x406c2442,
-    0x406ca6a4,
-    0x406d26d3,
-    0x406da6fb,
-    0x406e2729,
-    0x406ea75d,
-    0x406f277c,
-    0x406fa791,
-    0x407027a4,
-    0x4070a7c1,
+    0x405f1fd7,
+    0x405f9fe4,
+    0x40601ff2,
+    0x4060a014,
+    0x40612058,
+    0x4061a090,
+    0x406220a7,
+    0x4062a0b8,
+    0x406320c9,
+    0x4063a0de,
+    0x406420f5,
+    0x4064a121,
+    0x4065213c,
+    0x4065a153,
+    0x4066216b,
+    0x4066a195,
+    0x406721c0,
+    0x4067a1e1,
+    0x40682208,
+    0x4068a229,
+    0x4069225b,
+    0x4069a289,
+    0x406a22aa,
+    0x406aa2ca,
+    0x406b2452,
+    0x406ba475,
+    0x406c248b,
+    0x406ca6ed,
+    0x406d271c,
+    0x406da744,
+    0x406e2772,
+    0x406ea7a6,
+    0x406f27c5,
+    0x406fa7da,
+    0x407027ed,
+    0x4070a80a,
     0x40710800,
-    0x4071a7d3,
-    0x407227e6,
-    0x4072a7ff,
-    0x40732817,
+    0x4071a81c,
+    0x4072282f,
+    0x4072a848,
+    0x40732860,
     0x4073936d,
-    0x4074282b,
-    0x4074a845,
-    0x40752856,
-    0x4075a86a,
-    0x40762878,
+    0x40742874,
+    0x4074a88e,
+    0x4075289f,
+    0x4075a8b3,
+    0x407628c1,
     0x407691aa,
-    0x4077289d,
-    0x4077a8bf,
-    0x407828da,
-    0x4078a913,
-    0x4079292a,
-    0x4079a940,
-    0x407a294c,
-    0x407aa95f,
-    0x407b2974,
-    0x407ba986,
-    0x407c299b,
-    0x407ca9a4,
-    0x407d21fb,
-    0x407d9c6e,
-    0x407e28ef,
-    0x407e9e3e,
-    0x407f1a7e,
+    0x407728e6,
+    0x4077a908,
+    0x40782923,
+    0x4078a95c,
+    0x40792973,
+    0x4079a989,
+    0x407a2995,
+    0x407aa9a8,
+    0x407b29bd,
+    0x407ba9cf,
+    0x407c29e4,
+    0x407ca9ed,
+    0x407d2244,
+    0x407d9cb7,
+    0x407e2938,
+    0x407e9e87,
+    0x407f1ac7,
     0x407f9887,
-    0x40801c45,
-    0x40809aa6,
-    0x40811d01,
-    0x40819c1f,
-    0x40822714,
+    0x40801c8e,
+    0x40809aef,
+    0x40811d4a,
+    0x40819c68,
+    0x4082275d,
     0x4082986d,
-    0x40831e19,
-    0x4083a0bd,
-    0x40841aba,
-    0x40849e76,
-    0x40851efb,
-    0x40859ff3,
-    0x40861f4f,
-    0x40869c88,
-    0x40872741,
-    0x4087a024,
-    0x408818aa,
-    0x4088a1ab,
-    0x41f42334,
-    0x41f923c6,
-    0x41fe22b9,
-    0x41fea495,
-    0x41ff2586,
-    0x4203234d,
-    0x4208236f,
-    0x4208a3ab,
-    0x4209229d,
-    0x4209a3e5,
-    0x420a22f4,
-    0x420aa2d4,
-    0x420b2314,
-    0x420ba38d,
-    0x420c25a2,
-    0x420ca462,
-    0x420d247c,
-    0x420da4b3,
-    0x421224cd,
-    0x42172569,
-    0x4217a50f,
-    0x421c2531,
-    0x421f24ec,
-    0x422125b9,
-    0x4226254c,
-    0x422b2688,
-    0x422ba636,
-    0x422c2670,
-    0x422ca5f5,
-    0x422d25d4,
-    0x422da655,
-    0x422e261b,
+    0x40831e62,
+    0x4083a106,
+    0x40841b03,
+    0x40849ebf,
+    0x40851f44,
+    0x4085a03c,
+    0x40861f98,
+    0x40869cd1,
+    0x4087278a,
+    0x4087a06d,
+    0x408818ce,
+    0x4088a1f4,
+    0x4089191d,
+    0x408998aa,
+    0x41f4237d,
+    0x41f9240f,
+    0x41fe2302,
+    0x41fea4de,
+    0x41ff25cf,
+    0x42032396,
+    0x420823b8,
+    0x4208a3f4,
+    0x420922e6,
+    0x4209a42e,
+    0x420a233d,
+    0x420aa31d,
+    0x420b235d,
+    0x420ba3d6,
+    0x420c25eb,
+    0x420ca4ab,
+    0x420d24c5,
+    0x420da4fc,
+    0x42122516,
+    0x421725b2,
+    0x4217a558,
+    0x421c257a,
+    0x421f2535,
+    0x42212602,
+    0x42262595,
+    0x422b26d1,
+    0x422ba67f,
+    0x422c26b9,
+    0x422ca63e,
+    0x422d261d,
+    0x422da69e,
+    0x422e2664,
     0x4432072b,
     0x4432873a,
     0x44330746,
@@ -592,69 +594,69 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x4c3d136d,
     0x4c3d937c,
     0x4c3e1389,
-    0x50322c1d,
-    0x5032ac2c,
-    0x50332c37,
-    0x5033ac47,
-    0x50342c60,
-    0x5034ac7a,
-    0x50352c88,
-    0x5035ac9e,
-    0x50362cb0,
-    0x5036acc6,
-    0x50372cdf,
-    0x5037acf2,
-    0x50382d0a,
-    0x5038ad1b,
-    0x50392d30,
-    0x5039ad44,
-    0x503a2d64,
-    0x503aad7a,
-    0x503b2d92,
-    0x503bada4,
-    0x503c2dc0,
-    0x503cadd7,
-    0x503d2df0,
-    0x503dae06,
-    0x503e2e13,
-    0x503eae29,
-    0x503f2e3b,
+    0x50322c66,
+    0x5032ac75,
+    0x50332c80,
+    0x5033ac90,
+    0x50342ca9,
+    0x5034acc3,
+    0x50352cd1,
+    0x5035ace7,
+    0x50362cf9,
+    0x5036ad0f,
+    0x50372d28,
+    0x5037ad3b,
+    0x50382d53,
+    0x5038ad64,
+    0x50392d79,
+    0x5039ad8d,
+    0x503a2dad,
+    0x503aadc3,
+    0x503b2ddb,
+    0x503baded,
+    0x503c2e09,
+    0x503cae20,
+    0x503d2e39,
+    0x503dae4f,
+    0x503e2e5c,
+    0x503eae72,
+    0x503f2e84,
     0x503f8382,
-    0x50402e4e,
-    0x5040ae5e,
-    0x50412e78,
-    0x5041ae87,
-    0x50422ea1,
-    0x5042aebe,
-    0x50432ece,
-    0x5043aede,
-    0x50442eed,
+    0x50402e97,
+    0x5040aea7,
+    0x50412ec1,
+    0x5041aed0,
+    0x50422eea,
+    0x5042af07,
+    0x50432f17,
+    0x5043af27,
+    0x50442f36,
     0x5044843f,
-    0x50452f01,
-    0x5045af1f,
-    0x50462f32,
-    0x5046af48,
-    0x50472f5a,
-    0x5047af6f,
-    0x50482f95,
-    0x5048afa3,
-    0x50492fb6,
-    0x5049afcb,
-    0x504a2fe1,
-    0x504aaff1,
-    0x504b3011,
-    0x504bb024,
-    0x504c3047,
-    0x504cb075,
-    0x504d3087,
-    0x504db0a4,
-    0x504e30bf,
-    0x504eb0db,
-    0x504f30ed,
-    0x504fb104,
-    0x50503113,
+    0x50452f4a,
+    0x5045af68,
+    0x50462f7b,
+    0x5046af91,
+    0x50472fa3,
+    0x5047afb8,
+    0x50482fde,
+    0x5048afec,
+    0x50492fff,
+    0x5049b014,
+    0x504a302a,
+    0x504ab03a,
+    0x504b305a,
+    0x504bb06d,
+    0x504c3090,
+    0x504cb0be,
+    0x504d30d0,
+    0x504db0ed,
+    0x504e3108,
+    0x504eb124,
+    0x504f3136,
+    0x504fb14d,
+    0x5050315c,
     0x505086ef,
-    0x50513126,
+    0x5051316f,
     0x58320ec9,
     0x68320e8b,
     0x68328c25,
@@ -1017,10 +1019,12 @@ const char kOpenSSLReasonStringData[] =
     "BIO_NOT_SET\0"
     "BLOCK_CIPHER_PAD_IS_WRONG\0"
     "BUFFERED_MESSAGES_ON_CIPHER_CHANGE\0"
+    "CANNOT_HAVE_BOTH_PRIVKEY_AND_METHOD\0"
     "CANNOT_PARSE_LEAF_CERT\0"
     "CA_DN_LENGTH_MISMATCH\0"
     "CA_DN_TOO_LONG\0"
     "CCS_RECEIVED_EARLY\0"
+    "CERTIFICATE_AND_PRIVATE_KEY_MISMATCH\0"
     "CERTIFICATE_VERIFY_FAILED\0"
     "CERT_CB_ERROR\0"
     "CERT_LENGTH_MISMATCH\0"