Skip to content

Commit

Permalink
Roll src/third_party/boringssl/src eda849d2e..70fee1720
Browse files Browse the repository at this point in the history
https://boringssl.googlesource.com/boringssl/+log/eda849d2e6e6a15a5a4dc728568ec12f21ebfb6d..70fee172042c9727f98ea2e6659eb77336e0dc7f

The following commits have update notes:
  70fee1720 Use golang.org/x/crypto in runner.

Bug: none
Change-Id: Iea91bf32735ba528fde507a5c16f505463f2e825
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327512
Commit-Queue: David Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792927}
  • Loading branch information
davidben authored and Commit Bot committed Jul 29, 2020
1 parent 2b80b53 commit 6458a26
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 136 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ vars = {
#
# Note this revision should be updated with
# third_party/boringssl/roll_boringssl.py, not roll-dep.
'boringssl_revision': 'eda849d2e6e6a15a5a4dc728568ec12f21ebfb6d',
'boringssl_revision': '70fee172042c9727f98ea2e6659eb77336e0dc7f',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
Expand Down
2 changes: 2 additions & 0 deletions third_party/boringssl/BUILD.generated.gni
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ crypto_sources = [
"src/crypto/fipsmodule/sha/internal.h",
"src/crypto/fipsmodule/tls/internal.h",
"src/crypto/hkdf/hkdf.c",
"src/crypto/hpke/hpke.c",
"src/crypto/hpke/internal.h",
"src/crypto/hrss/hrss.c",
"src/crypto/hrss/internal.h",
"src/crypto/internal.h",
Expand Down
2 changes: 2 additions & 0 deletions third_party/boringssl/BUILD.generated_tests.gni
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ crypto_test_sources = [
"src/crypto/fipsmodule/sha/sha_test.cc",
"src/crypto/hkdf/hkdf_test.cc",
"src/crypto/hmac_extra/hmac_test.cc",
"src/crypto/hpke/hpke_test.cc",
"src/crypto/hrss/hrss_test.cc",
"src/crypto/impl_dispatch_test.cc",
"src/crypto/lhash/lhash_test.cc",
Expand Down Expand Up @@ -140,6 +141,7 @@ crypto_test_data = [
"src/crypto/fipsmodule/modes/gcm_tests.txt",
"src/crypto/fipsmodule/rand/ctrdrbg_vectors.txt",
"src/crypto/hmac_extra/hmac_tests.txt",
"src/crypto/hpke/hpke_test_vectors.txt",
"src/crypto/poly1305/poly1305_tests.txt",
"src/crypto/siphash/siphash_tests.txt",
"src/crypto/x509/test/invalid_extension_intermediate.pem",
Expand Down
272 changes: 137 additions & 135 deletions third_party/boringssl/err_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,47 +191,47 @@ const uint32_t kOpenSSLReasonValues[] = {
0x283480ac,
0x283500ea,
0x28358c6c,
0x2c323012,
0x2c323030,
0x2c3292e8,
0x2c333020,
0x2c33b032,
0x2c343046,
0x2c34b058,
0x2c353073,
0x2c35b085,
0x2c3630b5,
0x2c33303e,
0x2c33b050,
0x2c343064,
0x2c34b076,
0x2c353091,
0x2c35b0a3,
0x2c3630d3,
0x2c36832d,
0x2c3730c2,
0x2c37b0ee,
0x2c383113,
0x2c38b12a,
0x2c393148,
0x2c39b158,
0x2c3a316a,
0x2c3ab17e,
0x2c3b318f,
0x2c3bb1ae,
0x2c3730e0,
0x2c37b10c,
0x2c383131,
0x2c38b148,
0x2c393166,
0x2c39b176,
0x2c3a3188,
0x2c3ab19c,
0x2c3b31ad,
0x2c3bb1cc,
0x2c3c12fa,
0x2c3c9310,
0x2c3d31c2,
0x2c3d31e0,
0x2c3d9329,
0x2c3e31df,
0x2c3eb1ed,
0x2c3f3205,
0x2c3fb21d,
0x2c403247,
0x2c3e31fd,
0x2c3eb20b,
0x2c3f3223,
0x2c3fb23b,
0x2c403265,
0x2c4091fb,
0x2c413258,
0x2c41b26b,
0x2c413276,
0x2c41b289,
0x2c4211c1,
0x2c42b27c,
0x2c42b29a,
0x2c430722,
0x2c43b1a0,
0x2c443101,
0x2c44b22a,
0x2c453098,
0x2c45b0d4,
0x2c463138,
0x2c43b1be,
0x2c44311f,
0x2c44b248,
0x2c4530b6,
0x2c45b0f2,
0x2c463156,
0x30320000,
0x30328015,
0x3033001f,
Expand Down Expand Up @@ -487,37 +487,37 @@ const uint32_t kOpenSSLReasonValues[] = {
0x406dabca,
0x406e2bf8,
0x406eac45,
0x406f2c80,
0x406facb8,
0x40702ccb,
0x4070ace8,
0x406f2c9e,
0x406facd6,
0x40702ce9,
0x4070ad06,
0x40710802,
0x4071acfa,
0x40722d0d,
0x4072ad43,
0x40732d5b,
0x4071ad18,
0x40722d2b,
0x4072ad61,
0x40732d79,
0x407394fa,
0x40742d6f,
0x4074ad89,
0x40752d9a,
0x4075adae,
0x40762dbc,
0x40742d8d,
0x4074ada7,
0x40752db8,
0x4075adcc,
0x40762dda,
0x407692be,
0x40772de1,
0x4077ae03,
0x40782e1e,
0x4078ae57,
0x40792e6e,
0x4079ae84,
0x407a2eb0,
0x407aaec3,
0x407b2ed8,
0x407baeea,
0x407c2f1b,
0x407caf24,
0x40772dff,
0x4077ae21,
0x40782e3c,
0x4078ae75,
0x40792e8c,
0x4079aea2,
0x407a2ece,
0x407aaee1,
0x407b2ef6,
0x407baf08,
0x407c2f39,
0x407caf42,
0x407d2689,
0x407d9ff5,
0x407e2e33,
0x407e2e51,
0x407ea202,
0x407f1d53,
0x407f9e9f,
Expand All @@ -543,8 +543,8 @@ const uint32_t kOpenSSLReasonValues[] = {
0x40899afe,
0x408a2908,
0x408a9912,
0x408b2eff,
0x408bac95,
0x408b2f1d,
0x408bacb3,
0x408c22cf,
0x408c992e,
0x408d1df0,
Expand All @@ -559,18 +559,19 @@ const uint32_t kOpenSSLReasonValues[] = {
0x40919954,
0x40921bbe,
0x4092ac64,
0x40932d26,
0x40932d44,
0x4093a020,
0x40941da3,
0x4094a921,
0x4095248d,
0x4095ae90,
0x4095aeae,
0x40962c10,
0x40969fc8,
0x4097206b,
0x40979f6f,
0x40981c1e,
0x4098a4a1,
0x40992c80,
0x41f427c2,
0x41f92854,
0x41fe2747,
Expand Down Expand Up @@ -657,69 +658,69 @@ const uint32_t kOpenSSLReasonValues[] = {
0x4c411557,
0x4c4193da,
0x4c421543,
0x5032328e,
0x5032b29d,
0x503332a8,
0x5033b2b8,
0x503432d1,
0x5034b2eb,
0x503532f9,
0x5035b30f,
0x50363321,
0x5036b337,
0x50373350,
0x5037b363,
0x5038337b,
0x5038b38c,
0x503933a1,
0x5039b3b5,
0x503a33d5,
0x503ab3eb,
0x503b3403,
0x503bb415,
0x503c3431,
0x503cb448,
0x503d3461,
0x503db477,
0x503e3484,
0x503eb49a,
0x503f34ac,
0x503232ac,
0x5032b2bb,
0x503332c6,
0x5033b2d6,
0x503432ef,
0x5034b309,
0x50353317,
0x5035b32d,
0x5036333f,
0x5036b355,
0x5037336e,
0x5037b381,
0x50383399,
0x5038b3aa,
0x503933bf,
0x5039b3d3,
0x503a33f3,
0x503ab409,
0x503b3421,
0x503bb433,
0x503c344f,
0x503cb466,
0x503d347f,
0x503db495,
0x503e34a2,
0x503eb4b8,
0x503f34ca,
0x503f837b,
0x504034bf,
0x5040b4cf,
0x504134e9,
0x5041b4f8,
0x50423512,
0x5042b52f,
0x5043353f,
0x5043b54f,
0x5044355e,
0x504034dd,
0x5040b4ed,
0x50413507,
0x5041b516,
0x50423530,
0x5042b54d,
0x5043355d,
0x5043b56d,
0x5044357c,
0x50448431,
0x50453572,
0x5045b590,
0x504635a3,
0x5046b5b9,
0x504735cb,
0x5047b5e0,
0x50483606,
0x5048b614,
0x50493627,
0x5049b63c,
0x504a3652,
0x504ab662,
0x504b3682,
0x504bb695,
0x504c36b8,
0x504cb6e6,
0x504d36f8,
0x504db715,
0x504e3730,
0x504eb74c,
0x504f375e,
0x504fb775,
0x50503784,
0x50453590,
0x5045b5ae,
0x504635c1,
0x5046b5d7,
0x504735e9,
0x5047b5fe,
0x50483624,
0x5048b632,
0x50493645,
0x5049b65a,
0x504a3670,
0x504ab680,
0x504b36a0,
0x504bb6b3,
0x504c36d6,
0x504cb704,
0x504d3716,
0x504db733,
0x504e374e,
0x504eb76a,
0x504f377c,
0x504fb793,
0x505037a2,
0x505086f1,
0x50513797,
0x505137b5,
0x58320f65,
0x68320f27,
0x68328c7f,
Expand Down Expand Up @@ -763,19 +764,19 @@ const uint32_t kOpenSSLReasonValues[] = {
0x7c3211d7,
0x803213ed,
0x80328083,
0x80332fe1,
0x80332fff,
0x803380ac,
0x80342ff0,
0x8034af58,
0x80352f76,
0x8035b004,
0x80362fb8,
0x8036af67,
0x80372faa,
0x8037af45,
0x80382fcb,
0x8038af87,
0x80392f9c,
0x8034300e,
0x8034af76,
0x80352f94,
0x8035b022,
0x80362fd6,
0x8036af85,
0x80372fc8,
0x8037af63,
0x80382fe9,
0x8038afa5,
0x80392fba,
};

const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
Expand Down Expand Up @@ -1306,6 +1307,7 @@ const char kOpenSSLReasonStringData[] =
"TOO_MUCH_SKIPPED_EARLY_DATA\0"
"UNABLE_TO_FIND_ECDH_PARAMETERS\0"
"UNCOMPRESSED_CERT_TOO_LARGE\0"
"UNEXPECTED_COMPATIBILITY_MODE\0"
"UNEXPECTED_EXTENSION\0"
"UNEXPECTED_EXTENSION_ON_EARLY_DATA\0"
"UNEXPECTED_MESSAGE\0"
Expand Down

0 comments on commit 6458a26

Please sign in to comment.