Update BoringSSL from Chromium 96.0.4664.219

third_party/boringssl/BUILD.generated.gni

@@ -18,18 +18,20 @@ crypto_sources = [
   "src/crypto/asn1/a_object.c",
   "src/crypto/asn1/a_octet.c",
   "src/crypto/asn1/a_print.c",
+  "src/crypto/asn1/a_strex.c",
   "src/crypto/asn1/a_strnid.c",
   "src/crypto/asn1/a_time.c",
   "src/crypto/asn1/a_type.c",
   "src/crypto/asn1/a_utctm.c",
   "src/crypto/asn1/a_utf8.c",
   "src/crypto/asn1/asn1_lib.c",
-  "src/crypto/asn1/asn1_locl.h",
   "src/crypto/asn1/asn1_par.c",
   "src/crypto/asn1/asn_pack.c",
+  "src/crypto/asn1/charmap.h",
   "src/crypto/asn1/f_enum.c",
   "src/crypto/asn1/f_int.c",
   "src/crypto/asn1/f_string.c",
+  "src/crypto/asn1/internal.h",
   "src/crypto/asn1/tasn_dec.c",
   "src/crypto/asn1/tasn_enc.c",
   "src/crypto/asn1/tasn_fre.c",
@@ -49,6 +51,7 @@ crypto_sources = [
   "src/crypto/bio/printf.c",
   "src/crypto/bio/socket.c",
   "src/crypto/bio/socket_helper.c",
+  "src/crypto/blake2/blake2.c",
   "src/crypto/bn_extra/bn_asn1.c",
   "src/crypto/bn_extra/convert.c",
   "src/crypto/buf/buf.c",
@@ -78,6 +81,7 @@ crypto_sources = [
   "src/crypto/conf/internal.h",
   "src/crypto/cpu-aarch64-fuchsia.c",
   "src/crypto/cpu-aarch64-linux.c",
+  "src/crypto/cpu-aarch64-win.c",
   "src/crypto/cpu-arm-linux.c",
   "src/crypto/cpu-arm-linux.h",
   "src/crypto/cpu-arm.c",
@@ -88,10 +92,8 @@ crypto_sources = [
   "src/crypto/curve25519/curve25519_tables.h",
   "src/crypto/curve25519/internal.h",
   "src/crypto/curve25519/spake25519.c",
-  "src/crypto/dh/check.c",
-  "src/crypto/dh/dh.c",
-  "src/crypto/dh/dh_asn1.c",
-  "src/crypto/dh/params.c",
+  "src/crypto/dh_extra/dh_asn1.c",
+  "src/crypto/dh_extra/params.c",
   "src/crypto/digest_extra/digest_extra.c",
   "src/crypto/dsa/dsa.c",
   "src/crypto/dsa/dsa_asn1.c",
@@ -137,8 +139,8 @@ crypto_sources = [
   "src/crypto/fipsmodule/ec/p256-x86_64-table.h",
   "src/crypto/fipsmodule/ec/p256-x86_64.h",
   "src/crypto/fipsmodule/ec/p256_table.h",
+  "src/crypto/fipsmodule/ecdsa/internal.h",
   "src/crypto/fipsmodule/fips_shared_support.c",
-  "src/crypto/fipsmodule/is_fips.c",
   "src/crypto/fipsmodule/md5/internal.h",
   "src/crypto/fipsmodule/modes/internal.h",
   "src/crypto/fipsmodule/rand/fork_detect.h",
@@ -149,10 +151,10 @@ crypto_sources = [
   "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",
+  "src/crypto/lhash/internal.h",
   "src/crypto/lhash/lhash.c",
   "src/crypto/mem.c",
   "src/crypto/obj/obj.c",
@@ -182,6 +184,7 @@ crypto_sources = [
   "src/crypto/rand_extra/deterministic.c",
   "src/crypto/rand_extra/forkunsafe.c",
   "src/crypto/rand_extra/fuchsia.c",
+  "src/crypto/rand_extra/passive.c",
   "src/crypto/rand_extra/rand_extra.c",
   "src/crypto/rand_extra/windows.c",
   "src/crypto/rc4/rc4.c",
@@ -198,23 +201,22 @@ crypto_sources = [
   "src/crypto/trust_token/internal.h",
   "src/crypto/trust_token/pmbtoken.c",
   "src/crypto/trust_token/trust_token.c",
+  "src/crypto/trust_token/voprf.c",
   "src/crypto/x509/a_digest.c",
   "src/crypto/x509/a_sign.c",
-  "src/crypto/x509/a_strex.c",
   "src/crypto/x509/a_verify.c",
   "src/crypto/x509/algorithm.c",
   "src/crypto/x509/asn1_gen.c",
   "src/crypto/x509/by_dir.c",
   "src/crypto/x509/by_file.c",
-  "src/crypto/x509/charmap.h",
   "src/crypto/x509/i2d_pr.c",
   "src/crypto/x509/internal.h",
+  "src/crypto/x509/name_print.c",
   "src/crypto/x509/rsa_pss.c",
   "src/crypto/x509/t_crl.c",
   "src/crypto/x509/t_req.c",
   "src/crypto/x509/t_x509.c",
   "src/crypto/x509/t_x509a.c",
-  "src/crypto/x509/vpm_int.h",
   "src/crypto/x509/x509.c",
   "src/crypto/x509/x509_att.c",
   "src/crypto/x509/x509_cmp.c",
@@ -223,7 +225,6 @@ crypto_sources = [
   "src/crypto/x509/x509_ext.c",
   "src/crypto/x509/x509_lu.c",
   "src/crypto/x509/x509_obj.c",
-  "src/crypto/x509/x509_r2x.c",
   "src/crypto/x509/x509_req.c",
   "src/crypto/x509/x509_set.c",
   "src/crypto/x509/x509_trs.c",
@@ -300,6 +301,7 @@ crypto_headers = [
   "src/include/openssl/base.h",
   "src/include/openssl/base64.h",
   "src/include/openssl/bio.h",
+  "src/include/openssl/blake2.h",
   "src/include/openssl/blowfish.h",
   "src/include/openssl/bn.h",
   "src/include/openssl/buf.h",
@@ -325,9 +327,11 @@ crypto_headers = [
   "src/include/openssl/engine.h",
   "src/include/openssl/err.h",
   "src/include/openssl/evp.h",
+  "src/include/openssl/evp_errors.h",
   "src/include/openssl/ex_data.h",
   "src/include/openssl/hkdf.h",
   "src/include/openssl/hmac.h",
+  "src/include/openssl/hpke.h",
   "src/include/openssl/hrss.h",
   "src/include/openssl/is_boringssl.h",
   "src/include/openssl/lhash.h",
@@ -372,6 +376,8 @@ ssl_sources = [
   "src/ssl/d1_srtp.cc",
   "src/ssl/dtls_method.cc",
   "src/ssl/dtls_record.cc",
+  "src/ssl/encrypted_client_hello.cc",
+  "src/ssl/extensions.cc",
   "src/ssl/handoff.cc",
   "src/ssl/handshake.cc",
   "src/ssl/handshake_client.cc",
@@ -395,7 +401,6 @@ ssl_sources = [
   "src/ssl/ssl_versions.cc",
   "src/ssl/ssl_x509.cc",
   "src/ssl/t1_enc.cc",
-  "src/ssl/t1_lib.cc",
   "src/ssl/tls13_both.cc",
   "src/ssl/tls13_client.cc",
   "src/ssl/tls13_enc.cc",
@@ -412,6 +417,28 @@ ssl_headers = [
   "src/include/openssl/tls1.h",
 ]
 
+tool_sources = [
+  "src/tool/args.cc",
+  "src/tool/ciphers.cc",
+  "src/tool/client.cc",
+  "src/tool/const.cc",
+  "src/tool/digest.cc",
+  "src/tool/fd.cc",
+  "src/tool/file.cc",
+  "src/tool/generate_ech.cc",
+  "src/tool/generate_ed25519.cc",
+  "src/tool/genrsa.cc",
+  "src/tool/internal.h",
+  "src/tool/pkcs12.cc",
+  "src/tool/rand.cc",
+  "src/tool/server.cc",
+  "src/tool/sign.cc",
+  "src/tool/speed.cc",
+  "src/tool/tool.cc",
+  "src/tool/transport_common.cc",
+  "src/tool/transport_common.h",
+]
+
 crypto_sources_ios_aarch64 = [
   "ios-aarch64/crypto/chacha/chacha-armv8.S",
   "ios-aarch64/crypto/fipsmodule/aesv8-armx64.S",
@@ -551,6 +578,19 @@ crypto_sources_mac_x86_64 = [
   "mac-x86_64/crypto/test/trampoline-x86_64.S",
 ]
 
+crypto_sources_win_aarch64 = [
+  "win-aarch64/crypto/chacha/chacha-armv8.S",
+  "win-aarch64/crypto/fipsmodule/aesv8-armx64.S",
+  "win-aarch64/crypto/fipsmodule/armv8-mont.S",
+  "win-aarch64/crypto/fipsmodule/ghash-neon-armv8.S",
+  "win-aarch64/crypto/fipsmodule/ghashv8-armx64.S",
+  "win-aarch64/crypto/fipsmodule/sha1-armv8.S",
+  "win-aarch64/crypto/fipsmodule/sha256-armv8.S",
+  "win-aarch64/crypto/fipsmodule/sha512-armv8.S",
+  "win-aarch64/crypto/fipsmodule/vpaes-armv8.S",
+  "win-aarch64/crypto/test/trampoline-armv8.S",
+]
+
 crypto_sources_win_x86 = [
   "win-x86/crypto/chacha/chacha-x86.asm",
   "win-x86/crypto/fipsmodule/aesni-x86.asm",
@@ -595,6 +635,7 @@ fuzzers = [
   "bn_mod_exp",
   "cert",
   "client",
+  "decode_client_hello_inner",
   "dtls_client",
   "dtls_server",
   "pkcs12",

third_party/boringssl/BUILD.generated_tests.gni

@@ -30,20 +30,22 @@ crypto_test_sources = [
   "src/crypto/asn1/asn1_test.cc",
   "src/crypto/base64/base64_test.cc",
   "src/crypto/bio/bio_test.cc",
+  "src/crypto/blake2/blake2_test.cc",
   "src/crypto/buf/buf_test.cc",
   "src/crypto/bytestring/bytestring_test.cc",
   "src/crypto/chacha/chacha_test.cc",
   "src/crypto/cipher_extra/aead_test.cc",
   "src/crypto/cipher_extra/cipher_test.cc",
   "src/crypto/cmac/cmac_test.cc",
   "src/crypto/compiler_test.cc",
+  "src/crypto/conf/conf_test.cc",
   "src/crypto/constant_time_test.cc",
   "src/crypto/cpu-arm-linux_test.cc",
   "src/crypto/crypto_test.cc",
   "src/crypto/curve25519/ed25519_test.cc",
   "src/crypto/curve25519/spake25519_test.cc",
   "src/crypto/curve25519/x25519_test.cc",
-  "src/crypto/dh/dh_test.cc",
+  "src/crypto/dh_extra/dh_test.cc",
   "src/crypto/digest_extra/digest_test.cc",
   "src/crypto/dsa/dsa_test.cc",
   "src/crypto/ecdh_extra/ecdh_test.cc",
@@ -93,20 +95,20 @@ crypto_test_sources = [
 ]
 
 crypto_test_data = [
+  "src/crypto/blake2/blake2b256_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_cbc_sha1_tls_implicit_iv_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_cbc_sha1_tls_tests.txt",
-  "src/crypto/cipher_extra/test/aes_128_cbc_sha256_tls_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_ccm_bluetooth_8_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_ccm_bluetooth_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt",
+  "src/crypto/cipher_extra/test/aes_128_gcm_randnonce_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt",
   "src/crypto/cipher_extra/test/aes_128_gcm_tests.txt",
   "src/crypto/cipher_extra/test/aes_192_gcm_tests.txt",
   "src/crypto/cipher_extra/test/aes_256_cbc_sha1_tls_implicit_iv_tests.txt",
   "src/crypto/cipher_extra/test/aes_256_cbc_sha1_tls_tests.txt",
-  "src/crypto/cipher_extra/test/aes_256_cbc_sha256_tls_tests.txt",
-  "src/crypto/cipher_extra/test/aes_256_cbc_sha384_tls_tests.txt",
   "src/crypto/cipher_extra/test/aes_256_ctr_hmac_sha256.txt",
+  "src/crypto/cipher_extra/test/aes_256_gcm_randnonce_tests.txt",
   "src/crypto/cipher_extra/test/aes_256_gcm_siv_tests.txt",
   "src/crypto/cipher_extra/test/aes_256_gcm_tests.txt",
   "src/crypto/cipher_extra/test/chacha20_poly1305_tests.txt",
@@ -143,6 +145,15 @@ crypto_test_data = [
   "src/crypto/fipsmodule/rand/ctrdrbg_vectors.txt",
   "src/crypto/hmac_extra/hmac_tests.txt",
   "src/crypto/hpke/hpke_test_vectors.txt",
+  "src/crypto/pkcs8/test/empty_password.p12",
+  "src/crypto/pkcs8/test/no_encryption.p12",
+  "src/crypto/pkcs8/test/nss.p12",
+  "src/crypto/pkcs8/test/null_password.p12",
+  "src/crypto/pkcs8/test/openssl.p12",
+  "src/crypto/pkcs8/test/pbes2_sha1.p12",
+  "src/crypto/pkcs8/test/pbes2_sha256.p12",
+  "src/crypto/pkcs8/test/unicode_password.p12",
+  "src/crypto/pkcs8/test/windows.p12",
   "src/crypto/poly1305/poly1305_tests.txt",
   "src/crypto/siphash/siphash_tests.txt",
   "src/crypto/x509/test/basic_constraints_ca.pem",

third_party/boringssl/BUILD.gn

@@ -35,13 +35,7 @@ config("internal_config") {
     "BORINGSSL_NO_STATIC_INITIALIZER",
     "OPENSSL_SMALL",
   ]
-  configs = [
-    # TODO(davidben): Fix size_t truncations in BoringSSL.
-    # https://crbug.com/boringssl/22
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
   if (is_posix || is_fuchsia) {
-    cflags_c = [ "-std=c99" ]
     defines += [ "_XOPEN_SOURCE=700" ]
   }
   if (is_starboard) {
@@ -131,8 +125,12 @@ if (is_win && !is_msan && current_cpu != "arm64") {
     } else if (current_cpu == "arm64") {
       if (is_linux || is_chromeos || is_android) {
         sources += crypto_sources_linux_aarch64
-      } else if (is_ios) {
+      } else if (is_apple) {
+        # TODO(davidben): Rename all the file lists, etc., upstream from mac
+        # and ios to apple.
         sources += crypto_sources_ios_aarch64
+      } else if (is_win) {
+        sources += crypto_sources_win_aarch64
       } else {
         public_configs = [ ":no_asm_config" ]
       }
@@ -305,6 +303,11 @@ if (build_with_chromium) {
       "test_data_chromium.cc",
     ]
     deps += [ "//base/test:test_support" ]
+
+    if (is_fuchsia) {
+      additional_manifest_fragments =
+          [ "//build/config/fuchsia/test/network_capabilities.test-cmx" ]
+    }
   }
 
   test("boringssl_ssl_tests") {

third_party/boringssl/DIR_METADATA

@@ -0,0 +1,4 @@
+monorail {
+  component: "Internals>Network>SSL"
+}
+team_email: "[email protected]"

third_party/boringssl/METADATA

@@ -3,5 +3,5 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src"
   }
-  version: "87.0.4280.142"
+  version: "96.0.4664.219"
 }

third_party/boringssl/OWNERS

@@ -2,6 +2,3 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-
-# COMPONENT: Internals>Network>SSL
-# TEAM: [email protected]

third_party/boringssl/README.chromium

@@ -13,7 +13,7 @@ https://www.imperialviolet.org/2014/06/20/boringssl.html
 Note: when rolling DEPS forward, remember to run
 
   cd third_party/boringssl
-  python src/util/generate_build_files.py --embed_test_data=false gn
+  python3 src/util/generate_build_files.py --embed_test_data=false gn
 
 from a system with both Perl and Go installed. Alternatively, use the
 roll_boringssl.py script.