Commit b2b10b8d authored by David Benjamin's avatar David Benjamin Committed by Commit Bot

Roll src/third_party/boringssl/src c17985424..430a74230

https://boringssl.googlesource.com/boringssl/+log/c17985424391fcbaaa57f733b7197c5dd3e510aa..430a7423039682e4bbc7b522e3b57b2c8dca5e3b

The following commits have update notes:
  33f8d33af Convert X.509 accessor macros to proper functions.
  d206a11d4 Remove X509_CINF_get_issuer and X509_CINF_get_extensions.
  beaf594f8 Remove X509_get_signature_type.
  dd86e75b2 Check the X.509 version when parsing.
  fd86eaa86 Fix x509v3_cache_extensions error-handling.

Bug: none
Change-Id: Ic03b5430a3651594df2f8504abb6b154b0e38d3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264495
Commit-Queue: David Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: default avatarSteven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782043}
parent df542ef4
...@@ -209,7 +209,7 @@ vars = { ...@@ -209,7 +209,7 @@ vars = {
# #
# Note this revision should be updated with # Note this revision should be updated with
# third_party/boringssl/roll_boringssl.py, not roll-dep. # third_party/boringssl/roll_boringssl.py, not roll-dep.
'boringssl_revision': 'c17985424391fcbaaa57f733b7197c5dd3e510aa', 'boringssl_revision': '430a7423039682e4bbc7b522e3b57b2c8dca5e3b',
# 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.
......
...@@ -142,13 +142,37 @@ crypto_test_data = [ ...@@ -142,13 +142,37 @@ crypto_test_data = [
"src/crypto/hmac_extra/hmac_tests.txt", "src/crypto/hmac_extra/hmac_tests.txt",
"src/crypto/poly1305/poly1305_tests.txt", "src/crypto/poly1305/poly1305_tests.txt",
"src/crypto/siphash/siphash_tests.txt", "src/crypto/siphash/siphash_tests.txt",
"src/crypto/x509/many_constraints.pem", "src/crypto/x509/test/invalid_extension_intermediate.pem",
"src/crypto/x509/many_names1.pem", "src/crypto/x509/test/invalid_extension_intermediate_authority_key_identifier.pem",
"src/crypto/x509/many_names2.pem", "src/crypto/x509/test/invalid_extension_intermediate_basic_constraints.pem",
"src/crypto/x509/many_names3.pem", "src/crypto/x509/test/invalid_extension_intermediate_ext_key_usage.pem",
"src/crypto/x509/some_names1.pem", "src/crypto/x509/test/invalid_extension_intermediate_key_usage.pem",
"src/crypto/x509/some_names2.pem", "src/crypto/x509/test/invalid_extension_intermediate_name_constraints.pem",
"src/crypto/x509/some_names3.pem", "src/crypto/x509/test/invalid_extension_intermediate_subject_alt_name.pem",
"src/crypto/x509/test/invalid_extension_intermediate_subject_key_identifier.pem",
"src/crypto/x509/test/invalid_extension_leaf.pem",
"src/crypto/x509/test/invalid_extension_leaf_authority_key_identifier.pem",
"src/crypto/x509/test/invalid_extension_leaf_basic_constraints.pem",
"src/crypto/x509/test/invalid_extension_leaf_ext_key_usage.pem",
"src/crypto/x509/test/invalid_extension_leaf_key_usage.pem",
"src/crypto/x509/test/invalid_extension_leaf_name_constraints.pem",
"src/crypto/x509/test/invalid_extension_leaf_subject_alt_name.pem",
"src/crypto/x509/test/invalid_extension_leaf_subject_key_identifier.pem",
"src/crypto/x509/test/invalid_extension_root.pem",
"src/crypto/x509/test/invalid_extension_root_authority_key_identifier.pem",
"src/crypto/x509/test/invalid_extension_root_basic_constraints.pem",
"src/crypto/x509/test/invalid_extension_root_ext_key_usage.pem",
"src/crypto/x509/test/invalid_extension_root_key_usage.pem",
"src/crypto/x509/test/invalid_extension_root_name_constraints.pem",
"src/crypto/x509/test/invalid_extension_root_subject_alt_name.pem",
"src/crypto/x509/test/invalid_extension_root_subject_key_identifier.pem",
"src/crypto/x509/test/many_constraints.pem",
"src/crypto/x509/test/many_names1.pem",
"src/crypto/x509/test/many_names2.pem",
"src/crypto/x509/test/many_names3.pem",
"src/crypto/x509/test/some_names1.pem",
"src/crypto/x509/test/some_names2.pem",
"src/crypto/x509/test/some_names3.pem",
"src/third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.txt", "src/third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.txt",
"src/third_party/wycheproof_testvectors/aes_cmac_test.txt", "src/third_party/wycheproof_testvectors/aes_cmac_test.txt",
"src/third_party/wycheproof_testvectors/aes_gcm_siv_test.txt", "src/third_party/wycheproof_testvectors/aes_gcm_siv_test.txt",
......
...@@ -199,36 +199,39 @@ const uint32_t kOpenSSLReasonValues[] = { ...@@ -199,36 +199,39 @@ const uint32_t kOpenSSLReasonValues[] = {
0x2c34b058, 0x2c34b058,
0x2c353073, 0x2c353073,
0x2c35b085, 0x2c35b085,
0x2c363098, 0x2c3630b5,
0x2c36832d, 0x2c36832d,
0x2c3730a5, 0x2c3730c2,
0x2c37b0b7, 0x2c37b0ee,
0x2c3830dc, 0x2c383113,
0x2c38b0f3, 0x2c38b12a,
0x2c393101, 0x2c393148,
0x2c39b111, 0x2c39b158,
0x2c3a3123, 0x2c3a316a,
0x2c3ab137, 0x2c3ab17e,
0x2c3b3148, 0x2c3b318f,
0x2c3bb167, 0x2c3bb1ae,
0x2c3c12fa, 0x2c3c12fa,
0x2c3c9310, 0x2c3c9310,
0x2c3d317b, 0x2c3d31c2,
0x2c3d9329, 0x2c3d9329,
0x2c3e3198, 0x2c3e31df,
0x2c3eb1a6, 0x2c3eb1ed,
0x2c3f31be, 0x2c3f3205,
0x2c3fb1d6, 0x2c3fb21d,
0x2c403200, 0x2c403247,
0x2c4091fb, 0x2c4091fb,
0x2c413211, 0x2c413258,
0x2c41b224, 0x2c41b26b,
0x2c4211c1, 0x2c4211c1,
0x2c42b235, 0x2c42b27c,
0x2c430722, 0x2c430722,
0x2c43b159, 0x2c43b1a0,
0x2c4430ca, 0x2c443101,
0x2c44b1e3, 0x2c44b22a,
0x2c453098,
0x2c45b0d4,
0x2c463138,
0x30320000, 0x30320000,
0x30328015, 0x30328015,
0x3033001f, 0x3033001f,
...@@ -654,69 +657,69 @@ const uint32_t kOpenSSLReasonValues[] = { ...@@ -654,69 +657,69 @@ const uint32_t kOpenSSLReasonValues[] = {
0x4c411557, 0x4c411557,
0x4c4193da, 0x4c4193da,
0x4c421543, 0x4c421543,
0x50323247, 0x5032328e,
0x5032b256, 0x5032b29d,
0x50333261, 0x503332a8,
0x5033b271, 0x5033b2b8,
0x5034328a, 0x503432d1,
0x5034b2a4, 0x5034b2eb,
0x503532b2, 0x503532f9,
0x5035b2c8, 0x5035b30f,
0x503632da, 0x50363321,
0x5036b2f0, 0x5036b337,
0x50373309, 0x50373350,
0x5037b31c, 0x5037b363,
0x50383334, 0x5038337b,
0x5038b345, 0x5038b38c,
0x5039335a, 0x503933a1,
0x5039b36e, 0x5039b3b5,
0x503a338e, 0x503a33d5,
0x503ab3a4, 0x503ab3eb,
0x503b33bc, 0x503b3403,
0x503bb3ce, 0x503bb415,
0x503c33ea, 0x503c3431,
0x503cb401, 0x503cb448,
0x503d341a, 0x503d3461,
0x503db430, 0x503db477,
0x503e343d, 0x503e3484,
0x503eb453, 0x503eb49a,
0x503f3465, 0x503f34ac,
0x503f837b, 0x503f837b,
0x50403478, 0x504034bf,
0x5040b488, 0x5040b4cf,
0x504134a2, 0x504134e9,
0x5041b4b1, 0x5041b4f8,
0x504234cb, 0x50423512,
0x5042b4e8, 0x5042b52f,
0x504334f8, 0x5043353f,
0x5043b508, 0x5043b54f,
0x50443517, 0x5044355e,
0x50448431, 0x50448431,
0x5045352b, 0x50453572,
0x5045b549, 0x5045b590,
0x5046355c, 0x504635a3,
0x5046b572, 0x5046b5b9,
0x50473584, 0x504735cb,
0x5047b599, 0x5047b5e0,
0x504835bf, 0x50483606,
0x5048b5cd, 0x5048b614,
0x504935e0, 0x50493627,
0x5049b5f5, 0x5049b63c,
0x504a360b, 0x504a3652,
0x504ab61b, 0x504ab662,
0x504b363b, 0x504b3682,
0x504bb64e, 0x504bb695,
0x504c3671, 0x504c36b8,
0x504cb69f, 0x504cb6e6,
0x504d36b1, 0x504d36f8,
0x504db6ce, 0x504db715,
0x504e36e9, 0x504e3730,
0x504eb705, 0x504eb74c,
0x504f3717, 0x504f375e,
0x504fb72e, 0x504fb775,
0x5050373d, 0x50503784,
0x505086f1, 0x505086f1,
0x50513750, 0x50513797,
0x58320f65, 0x58320f65,
0x68320f27, 0x68320f27,
0x68328c7f, 0x68328c7f,
...@@ -1352,12 +1355,15 @@ const char kOpenSSLReasonStringData[] = ...@@ -1352,12 +1355,15 @@ const char kOpenSSLReasonStringData[] =
"CERT_ALREADY_IN_HASH_TABLE\0" "CERT_ALREADY_IN_HASH_TABLE\0"
"CRL_ALREADY_DELTA\0" "CRL_ALREADY_DELTA\0"
"CRL_VERIFY_FAILURE\0" "CRL_VERIFY_FAILURE\0"
"DELTA_CRL_WITHOUT_CRL_NUMBER\0"
"IDP_MISMATCH\0" "IDP_MISMATCH\0"
"INVALID_DIRECTORY\0" "INVALID_DIRECTORY\0"
"INVALID_FIELD_FOR_VERSION\0"
"INVALID_FIELD_NAME\0" "INVALID_FIELD_NAME\0"
"INVALID_PARAMETER\0" "INVALID_PARAMETER\0"
"INVALID_PSS_PARAMETERS\0" "INVALID_PSS_PARAMETERS\0"
"INVALID_TRUST\0" "INVALID_TRUST\0"
"INVALID_VERSION\0"
"ISSUER_MISMATCH\0" "ISSUER_MISMATCH\0"
"KEY_TYPE_MISMATCH\0" "KEY_TYPE_MISMATCH\0"
"KEY_VALUES_MISMATCH\0" "KEY_VALUES_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