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

Roll src/third_party/boringssl/src cb3f04f58..98b4cdba1

https://boringssl.googlesource.com/boringssl/+log/cb3f04f584a53844546aaa32e949534c453185aa..98b4cdba1e4ede26d845bcae8185ddb5b2feea93

The following commits have update notes:
  0df6edff4 Split BN_prime_checks into two constants for generation and validation.

Bug: none
Change-Id: Ia16ddb85756277144fc0ea410fb2b31840bf9332
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998162
Commit-Queue: David Benjamin <davidben@chromium.org>
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: default avatarSteven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732261}
parent ea8536ef
...@@ -208,7 +208,7 @@ vars = { ...@@ -208,7 +208,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': 'cb3f04f584a53844546aaa32e949534c453185aa', 'boringssl_revision': '98b4cdba1e4ede26d845bcae8185ddb5b2feea93',
# 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.
......
...@@ -417,7 +417,6 @@ crypto_sources_ios_aarch64 = [ ...@@ -417,7 +417,6 @@ crypto_sources_ios_aarch64 = [
crypto_sources_ios_arm = [ crypto_sources_ios_arm = [
"ios-arm/crypto/chacha/chacha-armv4.S", "ios-arm/crypto/chacha/chacha-armv4.S",
"ios-arm/crypto/fipsmodule/aes-armv4.S",
"ios-arm/crypto/fipsmodule/aesv8-armx32.S", "ios-arm/crypto/fipsmodule/aesv8-armx32.S",
"ios-arm/crypto/fipsmodule/armv4-mont.S", "ios-arm/crypto/fipsmodule/armv4-mont.S",
"ios-arm/crypto/fipsmodule/bsaes-armv7.S", "ios-arm/crypto/fipsmodule/bsaes-armv7.S",
...@@ -445,7 +444,6 @@ crypto_sources_linux_aarch64 = [ ...@@ -445,7 +444,6 @@ crypto_sources_linux_aarch64 = [
crypto_sources_linux_arm = [ crypto_sources_linux_arm = [
"linux-arm/crypto/chacha/chacha-armv4.S", "linux-arm/crypto/chacha/chacha-armv4.S",
"linux-arm/crypto/fipsmodule/aes-armv4.S",
"linux-arm/crypto/fipsmodule/aesv8-armx32.S", "linux-arm/crypto/fipsmodule/aesv8-armx32.S",
"linux-arm/crypto/fipsmodule/armv4-mont.S", "linux-arm/crypto/fipsmodule/armv4-mont.S",
"linux-arm/crypto/fipsmodule/bsaes-armv7.S", "linux-arm/crypto/fipsmodule/bsaes-armv7.S",
...@@ -468,7 +466,6 @@ crypto_sources_linux_ppc64le = [ ...@@ -468,7 +466,6 @@ crypto_sources_linux_ppc64le = [
crypto_sources_linux_x86 = [ crypto_sources_linux_x86 = [
"linux-x86/crypto/chacha/chacha-x86.S", "linux-x86/crypto/chacha/chacha-x86.S",
"linux-x86/crypto/fipsmodule/aes-586.S",
"linux-x86/crypto/fipsmodule/aesni-x86.S", "linux-x86/crypto/fipsmodule/aesni-x86.S",
"linux-x86/crypto/fipsmodule/bn-586.S", "linux-x86/crypto/fipsmodule/bn-586.S",
"linux-x86/crypto/fipsmodule/co-586.S", "linux-x86/crypto/fipsmodule/co-586.S",
...@@ -487,7 +484,6 @@ crypto_sources_linux_x86_64 = [ ...@@ -487,7 +484,6 @@ crypto_sources_linux_x86_64 = [
"linux-x86_64/crypto/chacha/chacha-x86_64.S", "linux-x86_64/crypto/chacha/chacha-x86_64.S",
"linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S", "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",
"linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S", "linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S",
"linux-x86_64/crypto/fipsmodule/aes-x86_64.S",
"linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S", "linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S",
"linux-x86_64/crypto/fipsmodule/aesni-x86_64.S", "linux-x86_64/crypto/fipsmodule/aesni-x86_64.S",
"linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S", "linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S",
...@@ -509,7 +505,6 @@ crypto_sources_linux_x86_64 = [ ...@@ -509,7 +505,6 @@ crypto_sources_linux_x86_64 = [
crypto_sources_mac_x86 = [ crypto_sources_mac_x86 = [
"mac-x86/crypto/chacha/chacha-x86.S", "mac-x86/crypto/chacha/chacha-x86.S",
"mac-x86/crypto/fipsmodule/aes-586.S",
"mac-x86/crypto/fipsmodule/aesni-x86.S", "mac-x86/crypto/fipsmodule/aesni-x86.S",
"mac-x86/crypto/fipsmodule/bn-586.S", "mac-x86/crypto/fipsmodule/bn-586.S",
"mac-x86/crypto/fipsmodule/co-586.S", "mac-x86/crypto/fipsmodule/co-586.S",
...@@ -528,7 +523,6 @@ crypto_sources_mac_x86_64 = [ ...@@ -528,7 +523,6 @@ crypto_sources_mac_x86_64 = [
"mac-x86_64/crypto/chacha/chacha-x86_64.S", "mac-x86_64/crypto/chacha/chacha-x86_64.S",
"mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S", "mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",
"mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S", "mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S",
"mac-x86_64/crypto/fipsmodule/aes-x86_64.S",
"mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S", "mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S",
"mac-x86_64/crypto/fipsmodule/aesni-x86_64.S", "mac-x86_64/crypto/fipsmodule/aesni-x86_64.S",
"mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S", "mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S",
...@@ -549,7 +543,6 @@ crypto_sources_mac_x86_64 = [ ...@@ -549,7 +543,6 @@ crypto_sources_mac_x86_64 = [
crypto_sources_win_x86 = [ crypto_sources_win_x86 = [
"win-x86/crypto/chacha/chacha-x86.asm", "win-x86/crypto/chacha/chacha-x86.asm",
"win-x86/crypto/fipsmodule/aes-586.asm",
"win-x86/crypto/fipsmodule/aesni-x86.asm", "win-x86/crypto/fipsmodule/aesni-x86.asm",
"win-x86/crypto/fipsmodule/bn-586.asm", "win-x86/crypto/fipsmodule/bn-586.asm",
"win-x86/crypto/fipsmodule/co-586.asm", "win-x86/crypto/fipsmodule/co-586.asm",
...@@ -568,7 +561,6 @@ crypto_sources_win_x86_64 = [ ...@@ -568,7 +561,6 @@ crypto_sources_win_x86_64 = [
"win-x86_64/crypto/chacha/chacha-x86_64.asm", "win-x86_64/crypto/chacha/chacha-x86_64.asm",
"win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm", "win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm",
"win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm", "win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm",
"win-x86_64/crypto/fipsmodule/aes-x86_64.asm",
"win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm", "win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm",
"win-x86_64/crypto/fipsmodule/aesni-x86_64.asm", "win-x86_64/crypto/fipsmodule/aesni-x86_64.asm",
"win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm", "win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm",
......
...@@ -18,6 +18,7 @@ test_support_sources = [ ...@@ -18,6 +18,7 @@ test_support_sources = [
"src/ssl/test/fuzzer.h", "src/ssl/test/fuzzer.h",
"src/ssl/test/fuzzer_tags.h", "src/ssl/test/fuzzer_tags.h",
"src/ssl/test/handshake_util.h", "src/ssl/test/handshake_util.h",
"src/ssl/test/mock_quic_transport.h",
"src/ssl/test/packeted_bio.h", "src/ssl/test/packeted_bio.h",
"src/ssl/test/settings_writer.h", "src/ssl/test/settings_writer.h",
"src/ssl/test/test_config.h", "src/ssl/test/test_config.h",
...@@ -165,8 +166,39 @@ crypto_test_data = [ ...@@ -165,8 +166,39 @@ crypto_test_data = [
"src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_test.txt", "src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_test.txt",
"src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_test.txt", "src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_test.txt",
"src/third_party/wycheproof_testvectors/eddsa_test.txt", "src/third_party/wycheproof_testvectors/eddsa_test.txt",
"src/third_party/wycheproof_testvectors/hkdf_sha1_test.txt",
"src/third_party/wycheproof_testvectors/hkdf_sha256_test.txt",
"src/third_party/wycheproof_testvectors/hkdf_sha384_test.txt",
"src/third_party/wycheproof_testvectors/hkdf_sha512_test.txt",
"src/third_party/wycheproof_testvectors/hmac_sha1_test.txt",
"src/third_party/wycheproof_testvectors/hmac_sha224_test.txt",
"src/third_party/wycheproof_testvectors/hmac_sha256_test.txt",
"src/third_party/wycheproof_testvectors/hmac_sha384_test.txt",
"src/third_party/wycheproof_testvectors/hmac_sha512_test.txt",
"src/third_party/wycheproof_testvectors/kw_test.txt", "src/third_party/wycheproof_testvectors/kw_test.txt",
"src/third_party/wycheproof_testvectors/kwp_test.txt", "src/third_party/wycheproof_testvectors/kwp_test.txt",
"src/third_party/wycheproof_testvectors/primality_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha1_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha224_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha256_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha384_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha256_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha256_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha1_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_oaep_misc_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pkcs1_2048_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pkcs1_3072_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pkcs1_4096_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pss_2048_sha1_mgf1_20_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_2048_sha1_mgf1_20_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_0_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_0_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.txt",
...@@ -174,8 +206,19 @@ crypto_test_data = [ ...@@ -174,8 +206,19 @@ crypto_test_data = [
"src/third_party/wycheproof_testvectors/rsa_pss_4096_sha256_mgf1_32_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_4096_sha256_mgf1_32_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pss_4096_sha512_mgf1_32_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_4096_sha512_mgf1_32_test.txt",
"src/third_party/wycheproof_testvectors/rsa_pss_misc_test.txt", "src/third_party/wycheproof_testvectors/rsa_pss_misc_test.txt",
"src/third_party/wycheproof_testvectors/rsa_sig_gen_misc_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_2048_sha224_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_2048_sha256_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_2048_sha384_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_3072_sha256_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_3072_sha384_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_4096_sha384_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_test.txt",
"src/third_party/wycheproof_testvectors/rsa_signature_test.txt", "src/third_party/wycheproof_testvectors/rsa_signature_test.txt",
"src/third_party/wycheproof_testvectors/x25519_test.txt", "src/third_party/wycheproof_testvectors/x25519_test.txt",
"src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.txt",
] ]
ssl_test_sources = [ ssl_test_sources = [
......
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