Commit ea1675c2 authored by Steven Valdez's avatar Steven Valdez Committed by Commit Bot

Roll src/third_party/boringssl/src 6410e18e9..6b0d82229

https://boringssl.googlesource.com/boringssl/+log/6410e18e9190b6b0c71955119fbf3cae1b9eedb7..6b0d82229b2c4ce85b1c3f6d55bda661e07bead2

BUG=none

Change-Id: I00eb27e49a13bf358d7554ba92e51fe9020f9371
Reviewed-on: https://chromium-review.googlesource.com/1174937Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583013}
parent d79d92d7
...@@ -137,7 +137,7 @@ vars = { ...@@ -137,7 +137,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
'boringssl_revision': '6410e18e9190b6b0c71955119fbf3cae1b9eedb7', 'boringssl_revision': '6b0d82229b2c4ce85b1c3f6d55bda661e07bead2',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac # the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -59,6 +59,7 @@ crypto_sources = [ ...@@ -59,6 +59,7 @@ crypto_sources = [
"src/crypto/bytestring/internal.h", "src/crypto/bytestring/internal.h",
"src/crypto/bytestring/unicode.c", "src/crypto/bytestring/unicode.c",
"src/crypto/chacha/chacha.c", "src/crypto/chacha/chacha.c",
"src/crypto/chacha/internal.h",
"src/crypto/cipher_extra/cipher_extra.c", "src/crypto/cipher_extra/cipher_extra.c",
"src/crypto/cipher_extra/derive_key.c", "src/crypto/cipher_extra/derive_key.c",
"src/crypto/cipher_extra/e_aesccm.c", "src/crypto/cipher_extra/e_aesccm.c",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -187,43 +187,43 @@ const uint32_t kOpenSSLReasonValues[] = { ...@@ -187,43 +187,43 @@ const uint32_t kOpenSSLReasonValues[] = {
0x28340c60, 0x28340c60,
0x283480ac, 0x283480ac,
0x283500ea, 0x283500ea,
0x2c322e14, 0x2c322e4e,
0x2c3292bd, 0x2c3292bd,
0x2c332e22, 0x2c332e5c,
0x2c33ae34, 0x2c33ae6e,
0x2c342e48, 0x2c342e82,
0x2c34ae5a, 0x2c34ae94,
0x2c352e75, 0x2c352eaf,
0x2c35ae87, 0x2c35aec1,
0x2c362e9a, 0x2c362ed4,
0x2c36832d, 0x2c36832d,
0x2c372ea7, 0x2c372ee1,
0x2c37aeb9, 0x2c37aef3,
0x2c382ede, 0x2c382f18,
0x2c38aef5, 0x2c38af2f,
0x2c392f03, 0x2c392f3d,
0x2c39af13, 0x2c39af4d,
0x2c3a2f25, 0x2c3a2f5f,
0x2c3aaf39, 0x2c3aaf73,
0x2c3b2f4a, 0x2c3b2f84,
0x2c3baf69, 0x2c3bafa3,
0x2c3c12cf, 0x2c3c12cf,
0x2c3c92e5, 0x2c3c92e5,
0x2c3d2f7d, 0x2c3d2fb7,
0x2c3d92fe, 0x2c3d92fe,
0x2c3e2f9a, 0x2c3e2fd4,
0x2c3eafa8, 0x2c3eafe2,
0x2c3f2fc0, 0x2c3f2ffa,
0x2c3fafd8, 0x2c3fb012,
0x2c402fe5, 0x2c40301f,
0x2c4091d0, 0x2c4091d0,
0x2c412ff6, 0x2c413030,
0x2c41b009, 0x2c41b043,
0x2c421196, 0x2c421196,
0x2c42b01a, 0x2c42b054,
0x2c430722, 0x2c430722,
0x2c43af5b, 0x2c43af95,
0x2c442ecc, 0x2c442f06,
0x30320000, 0x30320000,
0x30328015, 0x30328015,
0x3033001f, 0x3033001f,
...@@ -402,189 +402,191 @@ const uint32_t kOpenSSLReasonValues[] = { ...@@ -402,189 +402,191 @@ const uint32_t kOpenSSLReasonValues[] = {
0x40469d0b, 0x40469d0b,
0x40471d19, 0x40471d19,
0x40479d40, 0x40479d40,
0x40481d93, 0x40481db1,
0x40489dc6, 0x40489de4,
0x40491ddd, 0x40491dfb,
0x40499df7, 0x40499e15,
0x404a1e0e, 0x404a1e2c,
0x404a9e2c, 0x404a9e4a,
0x404b1e44, 0x404b1e62,
0x404b9e5b, 0x404b9e79,
0x404c1e71, 0x404c1e8f,
0x404c9e83, 0x404c9ea1,
0x404d1ea4, 0x404d1ec2,
0x404d9edd, 0x404d9efb,
0x404e1ef1, 0x404e1f0f,
0x404e9efe, 0x404e9f1c,
0x404f1f2b, 0x404f1f49,
0x404f9f54, 0x404f9f72,
0x40501f8f, 0x40501fc9,
0x40509fa3, 0x40509fdd,
0x40511fbe, 0x40511ff8,
0x40521fce, 0x40522008,
0x40529ff2, 0x4052a02c,
0x4053200a, 0x40532044,
0x4053a01d, 0x4053a057,
0x40542032, 0x4054206c,
0x4054a055, 0x4054a08f,
0x40552063, 0x4055209d,
0x4055a0a0, 0x4055a0da,
0x405620ad, 0x405620e7,
0x4056a0c6, 0x4056a100,
0x405720de, 0x40572118,
0x4057a0f1, 0x4057a12b,
0x40582106, 0x40582140,
0x4058a12d, 0x4058a167,
0x4059215c, 0x40592196,
0x4059a189, 0x4059a1c3,
0x405a219d, 0x405a21d7,
0x405aa1ad, 0x405aa1e7,
0x405b21c5, 0x405b21ff,
0x405ba1d6, 0x405ba210,
0x405c21e9, 0x405c2223,
0x405ca228, 0x405ca262,
0x405d2235, 0x405d226f,
0x405da25a, 0x405da294,
0x405e2298, 0x405e22d2,
0x405e8ab3, 0x405e8ab3,
0x405f22b9, 0x405f22f3,
0x405fa2c6, 0x405fa300,
0x406022d4, 0x4060230e,
0x4060a2f6, 0x4060a330,
0x40612357, 0x40612391,
0x4061a38f, 0x4061a3c9,
0x406223a6, 0x406223e0,
0x4062a3b7, 0x4062a3f1,
0x406323c8, 0x40632402,
0x4063a3dd, 0x4063a417,
0x406423f4, 0x4064242e,
0x4064a420, 0x4064a45a,
0x4065243b, 0x40652475,
0x4065a452, 0x4065a48c,
0x4066246a, 0x406624a4,
0x4066a494, 0x4066a4ce,
0x406724bf, 0x406724f9,
0x4067a504, 0x4067a53e,
0x4068254c, 0x40682586,
0x4068a56d, 0x4068a5a7,
0x4069259f, 0x406925d9,
0x4069a5cd, 0x4069a607,
0x406a25ee, 0x406a2628,
0x406aa60e, 0x406aa648,
0x406b2796, 0x406b27d0,
0x406ba7b9, 0x406ba7f3,
0x406c27cf, 0x406c2809,
0x406caa62, 0x406caa9c,
0x406d2a91, 0x406d2acb,
0x406daab9, 0x406daaf3,
0x406e2ae7, 0x406e2b21,
0x406eab34, 0x406eab6e,
0x406f2b6f, 0x406f2ba9,
0x406faba7, 0x406fabe1,
0x40702bba, 0x40702bf4,
0x4070abd7, 0x4070ac11,
0x40710802, 0x40710802,
0x4071abe9, 0x4071ac23,
0x40722bfc, 0x40722c36,
0x4072ac32, 0x4072ac6c,
0x40732c4a, 0x40732c84,
0x407394cf, 0x407394cf,
0x40742c5e, 0x40742c98,
0x4074ac78, 0x4074acb2,
0x40752c89, 0x40752cc3,
0x4075ac9d, 0x4075acd7,
0x40762cab, 0x40762ce5,
0x40769293, 0x40769293,
0x40772cd0, 0x40772d0a,
0x4077acf2, 0x4077ad2c,
0x40782d0d, 0x40782d47,
0x4078ad46, 0x4078ad80,
0x40792d5d, 0x40792d97,
0x4079ad73, 0x4079adad,
0x407a2d7f, 0x407a2db9,
0x407aad92, 0x407aadcc,
0x407b2da7, 0x407b2de1,
0x407badb9, 0x407badf3,
0x407c2dea, 0x407c2e24,
0x407cadf3, 0x407cae2d,
0x407d2588, 0x407d25c2,
0x407d9f64, 0x407d9f82,
0x407e2d22, 0x407e2d5c,
0x407ea13d, 0x407ea177,
0x407f1d2d, 0x407f1d2d,
0x407f9ad3, 0x407f9ad3,
0x40801f3b, 0x40801f59,
0x40809d55, 0x40809d55,
0x40811fe0, 0x4081201a,
0x40819f15, 0x40819f33,
0x40822ad2, 0x40822b0c,
0x40829ab9, 0x40829ab9,
0x40832118, 0x40832152,
0x4083a405, 0x4083a43f,
0x40841d69, 0x40841d69,
0x4084a175, 0x4084a1af,
0x408521fa, 0x40852234,
0x4085a31e, 0x4085a358,
0x4086227a, 0x408622b4,
0x40869f7e, 0x40869f9c,
0x40872b18, 0x40872b52,
0x4087a36c, 0x4087a3a6,
0x40881b1a, 0x40881b1a,
0x4088a517, 0x4088a551,
0x40891b69, 0x40891b69,
0x40899af6, 0x40899af6,
0x408a2807, 0x408a2841,
0x408a98e7, 0x408a98e7,
0x408b2dce, 0x408b2e08,
0x408bab84, 0x408babbe,
0x408c220a, 0x408c2244,
0x408c9903, 0x408c9903,
0x408d1dac, 0x408d1dca,
0x408d9d7d, 0x408d9d9b,
0x408e1ec6, 0x408e1ee4,
0x408ea080, 0x408ea0ba,
0x408f252b, 0x408f2565,
0x408fa33a, 0x408fa374,
0x409024e0, 0x4090251a,
0x4090a24c, 0x4090a286,
0x409127ef, 0x40912829,
0x40919929, 0x40919929,
0x40921bb6, 0x40921bb6,
0x4092ab53, 0x4092ab8d,
0x40932c15, 0x40932c4f,
0x41f426c1, 0x40939fad,
0x41f92753, 0x40941d7d,
0x41fe2646, 0x41f426fb,
0x41fea853, 0x41f9278d,
0x41ff2944, 0x41fe2680,
0x420326da, 0x41fea88d,
0x420826fc, 0x41ff297e,
0x4208a738, 0x42032714,
0x4209262a, 0x42082736,
0x4209a772, 0x4208a772,
0x420a2681, 0x42092664,
0x420aa661, 0x4209a7ac,
0x420b26a1, 0x420a26bb,
0x420ba71a, 0x420aa69b,
0x420c2960, 0x420b26db,
0x420ca820, 0x420ba754,
0x420d283a, 0x420c299a,
0x420da871, 0x420ca85a,
0x4212288b, 0x420d2874,
0x42172927, 0x420da8ab,
0x4217a8cd, 0x421228c5,
0x421c28ef, 0x42172961,
0x421f28aa, 0x4217a907,
0x42212977, 0x421c2929,
0x4226290a, 0x421f28e4,
0x422b2a46, 0x422129b1,
0x422ba9f4, 0x42262944,
0x422c2a2e, 0x422b2a80,
0x422ca9b3, 0x422baa2e,
0x422d2992, 0x422c2a68,
0x422daa13, 0x422ca9ed,
0x422e29d9, 0x422d29cc,
0x422eaaff, 0x422daa4d,
0x422e2a13,
0x422eab39,
0x4432072d, 0x4432072d,
0x4432873c, 0x4432873c,
0x44330748, 0x44330748,
...@@ -639,69 +641,69 @@ const uint32_t kOpenSSLReasonValues[] = { ...@@ -639,69 +641,69 @@ const uint32_t kOpenSSLReasonValues[] = {
0x4c41152c, 0x4c41152c,
0x4c4193af, 0x4c4193af,
0x4c421518, 0x4c421518,
0x5032302c, 0x50323066,
0x5032b03b, 0x5032b075,
0x50333046, 0x50333080,
0x5033b056, 0x5033b090,
0x5034306f, 0x503430a9,
0x5034b089, 0x5034b0c3,
0x50353097, 0x503530d1,
0x5035b0ad, 0x5035b0e7,
0x503630bf, 0x503630f9,
0x5036b0d5, 0x5036b10f,
0x503730ee, 0x50373128,
0x5037b101, 0x5037b13b,
0x50383119, 0x50383153,
0x5038b12a, 0x5038b164,
0x5039313f, 0x50393179,
0x5039b153, 0x5039b18d,
0x503a3173, 0x503a31ad,
0x503ab189, 0x503ab1c3,
0x503b31a1, 0x503b31db,
0x503bb1b3, 0x503bb1ed,
0x503c31cf, 0x503c3209,
0x503cb1e6, 0x503cb220,
0x503d31ff, 0x503d3239,
0x503db215, 0x503db24f,
0x503e3222, 0x503e325c,
0x503eb238, 0x503eb272,
0x503f324a, 0x503f3284,
0x503f837b, 0x503f837b,
0x5040325d, 0x50403297,
0x5040b26d, 0x5040b2a7,
0x50413287, 0x504132c1,
0x5041b296, 0x5041b2d0,
0x504232b0, 0x504232ea,
0x5042b2cd, 0x5042b307,
0x504332dd, 0x50433317,
0x5043b2ed, 0x5043b327,
0x504432fc, 0x50443336,
0x50448431, 0x50448431,
0x50453310, 0x5045334a,
0x5045b32e, 0x5045b368,
0x50463341, 0x5046337b,
0x5046b357, 0x5046b391,
0x50473369, 0x504733a3,
0x5047b37e, 0x5047b3b8,
0x504833a4, 0x504833de,
0x5048b3b2, 0x5048b3ec,
0x504933c5, 0x504933ff,
0x5049b3da, 0x5049b414,
0x504a33f0, 0x504a342a,
0x504ab400, 0x504ab43a,
0x504b3420, 0x504b345a,
0x504bb433, 0x504bb46d,
0x504c3456, 0x504c3490,
0x504cb484, 0x504cb4be,
0x504d3496, 0x504d34d0,
0x504db4b3, 0x504db4ed,
0x504e34ce, 0x504e3508,
0x504eb4ea, 0x504eb524,
0x504f34fc, 0x504f3536,
0x504fb513, 0x504fb54d,
0x50503522, 0x5050355c,
0x505086f1, 0x505086f1,
0x50513535, 0x5051356f,
0x58320f52, 0x58320f52,
0x68320f14, 0x68320f14,
0x68328c6c, 0x68328c6c,
...@@ -1124,6 +1126,7 @@ const char kOpenSSLReasonStringData[] = ...@@ -1124,6 +1126,7 @@ const char kOpenSSLReasonStringData[] =
"DTLS_MESSAGE_TOO_BIG\0" "DTLS_MESSAGE_TOO_BIG\0"
"DUPLICATE_EXTENSION\0" "DUPLICATE_EXTENSION\0"
"DUPLICATE_KEY_SHARE\0" "DUPLICATE_KEY_SHARE\0"
"DUPLICATE_SIGNATURE_ALGORITHM\0"
"EARLY_DATA_NOT_IN_USE\0" "EARLY_DATA_NOT_IN_USE\0"
"ECC_CERT_NOT_FOR_SIGNING\0" "ECC_CERT_NOT_FOR_SIGNING\0"
"EMPTY_HELLO_RETRY_REQUEST\0" "EMPTY_HELLO_RETRY_REQUEST\0"
...@@ -1147,6 +1150,7 @@ const char kOpenSSLReasonStringData[] = ...@@ -1147,6 +1150,7 @@ const char kOpenSSLReasonStringData[] =
"INVALID_MESSAGE\0" "INVALID_MESSAGE\0"
"INVALID_OUTER_RECORD_TYPE\0" "INVALID_OUTER_RECORD_TYPE\0"
"INVALID_SCT_LIST\0" "INVALID_SCT_LIST\0"
"INVALID_SIGNATURE_ALGORITHM\0"
"INVALID_SSL_SESSION\0" "INVALID_SSL_SESSION\0"
"INVALID_TICKET_KEYS_LENGTH\0" "INVALID_TICKET_KEYS_LENGTH\0"
"LENGTH_MISMATCH\0" "LENGTH_MISMATCH\0"
......
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