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

This reverts commit f7a4166c.

Reason for revert: This change results in consistent test failures on Windows and Mac (https://crbug.com/1042657).

Original change's description:
> 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: Steven Valdez <svaldez@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#732261}

TBR=davidben@chromium.org,svaldez@chromium.org

Change-Id: I79ac0bbab74553526588bf2c8d5690f25bac723c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1042657
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003851Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732365}

DEPS

@@ -208,7 +208,7 @@ vars = {
   #
   # Note this revision should be updated with
   # third_party/boringssl/roll_boringssl.py, not roll-dep.
-  'boringssl_revision': '98b4cdba1e4ede26d845bcae8185ddb5b2feea93',
+  'boringssl_revision': 'cb3f04f584a53844546aaa32e949534c453185aa',
   # 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.

third_party/boringssl/BUILD.generated.gni

@@ -417,6 +417,7 @@ crypto_sources_ios_aarch64 = [
 
 crypto_sources_ios_arm = [
   "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/armv4-mont.S",
   "ios-arm/crypto/fipsmodule/bsaes-armv7.S",
@@ -444,6 +445,7 @@ crypto_sources_linux_aarch64 = [
 
 crypto_sources_linux_arm = [
   "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/armv4-mont.S",
   "linux-arm/crypto/fipsmodule/bsaes-armv7.S",
@@ -466,6 +468,7 @@ crypto_sources_linux_ppc64le = [
 
 crypto_sources_linux_x86 = [
   "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/bn-586.S",
   "linux-x86/crypto/fipsmodule/co-586.S",
@@ -484,6 +487,7 @@ crypto_sources_linux_x86_64 = [
   "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/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-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S",
@@ -505,6 +509,7 @@ crypto_sources_linux_x86_64 = [
 
 crypto_sources_mac_x86 = [
   "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/bn-586.S",
   "mac-x86/crypto/fipsmodule/co-586.S",
@@ -523,6 +528,7 @@ crypto_sources_mac_x86_64 = [
   "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/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-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S",
@@ -543,6 +549,7 @@ crypto_sources_mac_x86_64 = [
 
 crypto_sources_win_x86 = [
   "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/bn-586.asm",
   "win-x86/crypto/fipsmodule/co-586.asm",
@@ -561,6 +568,7 @@ crypto_sources_win_x86_64 = [
   "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/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-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm",

third_party/boringssl/BUILD.generated_tests.gni

@@ -18,7 +18,6 @@ test_support_sources = [
   "src/ssl/test/fuzzer.h",
   "src/ssl/test/fuzzer_tags.h",
   "src/ssl/test/handshake_util.h",
-  "src/ssl/test/mock_quic_transport.h",
   "src/ssl/test/packeted_bio.h",
   "src/ssl/test/settings_writer.h",
   "src/ssl/test/test_config.h",
@@ -166,39 +165,8 @@ crypto_test_data = [
   "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/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/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_sha256_mgf1_0_test.txt",
   "src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.txt",
@@ -206,19 +174,8 @@ crypto_test_data = [
   "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_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/x25519_test.txt",
-  "src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.txt",
 ]
 
 ssl_test_sources = [