Merge branch 'master' into polling-api-trace

7 years ago · 74f50aaa61
parent 132c7d1e6a d6358a5b0a
commit 74f50aaa61
42 changed files with 8927 additions and 8472 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -392,6 +392,7 @@ add_dependencies(buildtests_c connection_prefix_bad_client_test)
 add_dependencies(buildtests_c head_of_line_blocking_bad_client_test)
 add_dependencies(buildtests_c headers_bad_client_test)
 add_dependencies(buildtests_c initial_settings_frame_bad_client_test)
+add_dependencies(buildtests_c large_metadata_bad_client_test)
 add_dependencies(buildtests_c server_registered_method_bad_client_test)
 add_dependencies(buildtests_c simple_request_bad_client_test)
 add_dependencies(buildtests_c unknown_frame_bad_client_test)
@ -12455,6 +12456,35 @@ target_link_libraries(initial_settings_frame_bad_client_test
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)

+add_executable(large_metadata_bad_client_test
+  test/core/bad_client/tests/large_metadata.cc
+)
+
+
+target_include_directories(large_metadata_bad_client_test
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+  PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
+  PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR}
+  PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR}
+  PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR}
+  PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
+  PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
+)
+
+target_link_libraries(large_metadata_bad_client_test
+  ${_gRPC_SSL_LIBRARIES}
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  bad_client_test
+  grpc_test_util_unsecure
+  grpc_unsecure
+  gpr_test_util
+  gpr
+)
+
+endif (gRPC_BUILD_TESTS)
+if (gRPC_BUILD_TESTS)
+
 add_executable(server_registered_method_bad_client_test
  test/core/bad_client/tests/server_registered_method.cc
 )
--- a/8069
+++ b/8069
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@ -158,7 +158,7 @@ def grpc_sh_test(name, srcs, args = [], data = []):
    data = data)

 def grpc_sh_binary(name, srcs, data = []):
-  native.sh_test(
+  native.sh_binary(
    name = name,
    srcs = srcs,
    data = data)
--- a/build.yaml
+++ b/build.yaml
@ -5063,6 +5063,7 @@ defaults:
      $(NO_W_EXTRA_SEMI)
    CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
      -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
+    CXXFLAGS: -fno-rtti -fno-exceptions
  global:
    COREFLAGS: -fno-rtti -fno-exceptions
    CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
--- a/config.m4
+++ b/config.m4
@ -337,9 +337,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/workarounds/workaround_utils.cc \
    src/core/plugin_registry/grpc_plugin_registry.cc \
    src/boringssl/err_data.c \
-    third_party/boringssl/crypto/aes/aes.c \
-    third_party/boringssl/crypto/aes/key_wrap.c \
-    third_party/boringssl/crypto/aes/mode_wrappers.c \
    third_party/boringssl/crypto/asn1/a_bitstr.c \
    third_party/boringssl/crypto/asn1/a_bool.c \
    third_party/boringssl/crypto/asn1/a_d2i_fp.c \
@ -363,7 +360,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/asn1/f_enum.c \
    third_party/boringssl/crypto/asn1/f_int.c \
    third_party/boringssl/crypto/asn1/f_string.c \
-    third_party/boringssl/crypto/asn1/t_bitst.c \
    third_party/boringssl/crypto/asn1/tasn_dec.c \
    third_party/boringssl/crypto/asn1/tasn_enc.c \
    third_party/boringssl/crypto/asn1/tasn_fre.c \
@ -371,8 +367,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/asn1/tasn_typ.c \
    third_party/boringssl/crypto/asn1/tasn_utl.c \
    third_party/boringssl/crypto/asn1/time_support.c \
-    third_party/boringssl/crypto/asn1/x_bignum.c \
-    third_party/boringssl/crypto/asn1/x_long.c \
    third_party/boringssl/crypto/base64/base64.c \
    third_party/boringssl/crypto/bio/bio.c \
    third_party/boringssl/crypto/bio/bio_mem.c \
@ -384,44 +378,25 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/bio/printf.c \
    third_party/boringssl/crypto/bio/socket.c \
    third_party/boringssl/crypto/bio/socket_helper.c \
-    third_party/boringssl/crypto/bn/add.c \
-    third_party/boringssl/crypto/bn/asm/x86_64-gcc.c \
-    third_party/boringssl/crypto/bn/bn.c \
-    third_party/boringssl/crypto/bn/bn_asn1.c \
-    third_party/boringssl/crypto/bn/cmp.c \
-    third_party/boringssl/crypto/bn/convert.c \
-    third_party/boringssl/crypto/bn/ctx.c \
-    third_party/boringssl/crypto/bn/div.c \
-    third_party/boringssl/crypto/bn/exponentiation.c \
-    third_party/boringssl/crypto/bn/gcd.c \
-    third_party/boringssl/crypto/bn/generic.c \
-    third_party/boringssl/crypto/bn/kronecker.c \
-    third_party/boringssl/crypto/bn/montgomery.c \
-    third_party/boringssl/crypto/bn/montgomery_inv.c \
-    third_party/boringssl/crypto/bn/mul.c \
-    third_party/boringssl/crypto/bn/prime.c \
-    third_party/boringssl/crypto/bn/random.c \
-    third_party/boringssl/crypto/bn/rsaz_exp.c \
-    third_party/boringssl/crypto/bn/shift.c \
-    third_party/boringssl/crypto/bn/sqrt.c \
+    third_party/boringssl/crypto/bn_extra/bn_asn1.c \
+    third_party/boringssl/crypto/bn_extra/convert.c \
    third_party/boringssl/crypto/buf/buf.c \
    third_party/boringssl/crypto/bytestring/asn1_compat.c \
    third_party/boringssl/crypto/bytestring/ber.c \
    third_party/boringssl/crypto/bytestring/cbb.c \
    third_party/boringssl/crypto/bytestring/cbs.c \
    third_party/boringssl/crypto/chacha/chacha.c \
-    third_party/boringssl/crypto/cipher/aead.c \
-    third_party/boringssl/crypto/cipher/cipher.c \
-    third_party/boringssl/crypto/cipher/derive_key.c \
-    third_party/boringssl/crypto/cipher/e_aes.c \
-    third_party/boringssl/crypto/cipher/e_chacha20poly1305.c \
-    third_party/boringssl/crypto/cipher/e_des.c \
-    third_party/boringssl/crypto/cipher/e_null.c \
-    third_party/boringssl/crypto/cipher/e_rc2.c \
-    third_party/boringssl/crypto/cipher/e_rc4.c \
-    third_party/boringssl/crypto/cipher/e_ssl3.c \
-    third_party/boringssl/crypto/cipher/e_tls.c \
-    third_party/boringssl/crypto/cipher/tls_cbc.c \
+    third_party/boringssl/crypto/cipher_extra/cipher_extra.c \
+    third_party/boringssl/crypto/cipher_extra/derive_key.c \
+    third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c \
+    third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c \
+    third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c \
+    third_party/boringssl/crypto/cipher_extra/e_null.c \
+    third_party/boringssl/crypto/cipher_extra/e_rc2.c \
+    third_party/boringssl/crypto/cipher_extra/e_rc4.c \
+    third_party/boringssl/crypto/cipher_extra/e_ssl3.c \
+    third_party/boringssl/crypto/cipher_extra/e_tls.c \
+    third_party/boringssl/crypto/cipher_extra/tls_cbc.c \
    third_party/boringssl/crypto/cmac/cmac.c \
    third_party/boringssl/crypto/conf/conf.c \
    third_party/boringssl/crypto/cpu-aarch64-linux.c \
@ -433,29 +408,16 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/curve25519/curve25519.c \
    third_party/boringssl/crypto/curve25519/spake25519.c \
    third_party/boringssl/crypto/curve25519/x25519-x86_64.c \
-    third_party/boringssl/crypto/des/des.c \
    third_party/boringssl/crypto/dh/check.c \
    third_party/boringssl/crypto/dh/dh.c \
    third_party/boringssl/crypto/dh/dh_asn1.c \
    third_party/boringssl/crypto/dh/params.c \
-    third_party/boringssl/crypto/digest/digest.c \
-    third_party/boringssl/crypto/digest/digests.c \
+    third_party/boringssl/crypto/digest_extra/digest_extra.c \
    third_party/boringssl/crypto/dsa/dsa.c \
    third_party/boringssl/crypto/dsa/dsa_asn1.c \
-    third_party/boringssl/crypto/ec/ec.c \
-    third_party/boringssl/crypto/ec/ec_asn1.c \
-    third_party/boringssl/crypto/ec/ec_key.c \
-    third_party/boringssl/crypto/ec/ec_montgomery.c \
-    third_party/boringssl/crypto/ec/oct.c \
-    third_party/boringssl/crypto/ec/p224-64.c \
-    third_party/boringssl/crypto/ec/p256-64.c \
-    third_party/boringssl/crypto/ec/p256-x86_64.c \
-    third_party/boringssl/crypto/ec/simple.c \
-    third_party/boringssl/crypto/ec/util-64.c \
-    third_party/boringssl/crypto/ec/wnaf.c \
+    third_party/boringssl/crypto/ec_extra/ec_asn1.c \
    third_party/boringssl/crypto/ecdh/ecdh.c \
-    third_party/boringssl/crypto/ecdsa/ecdsa.c \
-    third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c \
+    third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c \
    third_party/boringssl/crypto/engine/engine.c \
    third_party/boringssl/crypto/err/err.c \
    third_party/boringssl/crypto/evp/digestsign.c \
@ -465,24 +427,20 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/evp/p_dsa_asn1.c \
    third_party/boringssl/crypto/evp/p_ec.c \
    third_party/boringssl/crypto/evp/p_ec_asn1.c \
+    third_party/boringssl/crypto/evp/p_ed25519.c \
+    third_party/boringssl/crypto/evp/p_ed25519_asn1.c \
    third_party/boringssl/crypto/evp/p_rsa.c \
    third_party/boringssl/crypto/evp/p_rsa_asn1.c \
    third_party/boringssl/crypto/evp/pbkdf.c \
    third_party/boringssl/crypto/evp/print.c \
+    third_party/boringssl/crypto/evp/scrypt.c \
    third_party/boringssl/crypto/evp/sign.c \
    third_party/boringssl/crypto/ex_data.c \
+    third_party/boringssl/crypto/fipsmodule/bcm.c \
+    third_party/boringssl/crypto/fipsmodule/is_fips.c \
    third_party/boringssl/crypto/hkdf/hkdf.c \
-    third_party/boringssl/crypto/hmac/hmac.c \
    third_party/boringssl/crypto/lhash/lhash.c \
-    third_party/boringssl/crypto/md4/md4.c \
-    third_party/boringssl/crypto/md5/md5.c \
    third_party/boringssl/crypto/mem.c \
-    third_party/boringssl/crypto/modes/cbc.c \
-    third_party/boringssl/crypto/modes/cfb.c \
-    third_party/boringssl/crypto/modes/ctr.c \
-    third_party/boringssl/crypto/modes/gcm.c \
-    third_party/boringssl/crypto/modes/ofb.c \
-    third_party/boringssl/crypto/modes/polyval.c \
    third_party/boringssl/crypto/obj/obj.c \
    third_party/boringssl/crypto/obj/obj_xref.c \
    third_party/boringssl/crypto/pem/pem_all.c \
@ -493,30 +451,24 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/pem/pem_pkey.c \
    third_party/boringssl/crypto/pem/pem_x509.c \
    third_party/boringssl/crypto/pem/pem_xaux.c \
+    third_party/boringssl/crypto/pkcs7/pkcs7.c \
+    third_party/boringssl/crypto/pkcs7/pkcs7_x509.c \
    third_party/boringssl/crypto/pkcs8/p5_pbev2.c \
-    third_party/boringssl/crypto/pkcs8/p8_pkey.c \
    third_party/boringssl/crypto/pkcs8/pkcs8.c \
+    third_party/boringssl/crypto/pkcs8/pkcs8_x509.c \
    third_party/boringssl/crypto/poly1305/poly1305.c \
    third_party/boringssl/crypto/poly1305/poly1305_arm.c \
    third_party/boringssl/crypto/poly1305/poly1305_vec.c \
    third_party/boringssl/crypto/pool/pool.c \
-    third_party/boringssl/crypto/rand/deterministic.c \
-    third_party/boringssl/crypto/rand/fuchsia.c \
-    third_party/boringssl/crypto/rand/rand.c \
-    third_party/boringssl/crypto/rand/urandom.c \
-    third_party/boringssl/crypto/rand/windows.c \
+    third_party/boringssl/crypto/rand_extra/deterministic.c \
+    third_party/boringssl/crypto/rand_extra/forkunsafe.c \
+    third_party/boringssl/crypto/rand_extra/fuchsia.c \
+    third_party/boringssl/crypto/rand_extra/rand_extra.c \
+    third_party/boringssl/crypto/rand_extra/windows.c \
    third_party/boringssl/crypto/rc4/rc4.c \
    third_party/boringssl/crypto/refcount_c11.c \
    third_party/boringssl/crypto/refcount_lock.c \
-    third_party/boringssl/crypto/rsa/blinding.c \
-    third_party/boringssl/crypto/rsa/padding.c \
-    third_party/boringssl/crypto/rsa/rsa.c \
-    third_party/boringssl/crypto/rsa/rsa_asn1.c \
-    third_party/boringssl/crypto/rsa/rsa_impl.c \
-    third_party/boringssl/crypto/sha/sha1-altivec.c \
-    third_party/boringssl/crypto/sha/sha1.c \
-    third_party/boringssl/crypto/sha/sha256.c \
-    third_party/boringssl/crypto/sha/sha512.c \
+    third_party/boringssl/crypto/rsa_extra/rsa_asn1.c \
    third_party/boringssl/crypto/stack/stack.c \
    third_party/boringssl/crypto/thread.c \
    third_party/boringssl/crypto/thread_none.c \
@ -531,7 +483,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/x509/by_dir.c \
    third_party/boringssl/crypto/x509/by_file.c \
    third_party/boringssl/crypto/x509/i2d_pr.c \
-    third_party/boringssl/crypto/x509/pkcs7.c \
    third_party/boringssl/crypto/x509/rsa_pss.c \
    third_party/boringssl/crypto/x509/t_crl.c \
    third_party/boringssl/crypto/x509/t_req.c \
@ -557,7 +508,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/x509/x509name.c \
    third_party/boringssl/crypto/x509/x509rset.c \
    third_party/boringssl/crypto/x509/x509spki.c \
-    third_party/boringssl/crypto/x509/x509type.c \
    third_party/boringssl/crypto/x509/x_algor.c \
    third_party/boringssl/crypto/x509/x_all.c \
    third_party/boringssl/crypto/x509/x_attrib.c \
@ -605,41 +555,42 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/x509v3/v3_skey.c \
    third_party/boringssl/crypto/x509v3/v3_sxnet.c \
    third_party/boringssl/crypto/x509v3/v3_utl.c \
-    third_party/boringssl/ssl/bio_ssl.c \
-    third_party/boringssl/ssl/custom_extensions.c \
-    third_party/boringssl/ssl/d1_both.c \
-    third_party/boringssl/ssl/d1_lib.c \
-    third_party/boringssl/ssl/d1_pkt.c \
-    third_party/boringssl/ssl/d1_srtp.c \
-    third_party/boringssl/ssl/dtls_method.c \
-    third_party/boringssl/ssl/dtls_record.c \
-    third_party/boringssl/ssl/handshake_client.c \
-    third_party/boringssl/ssl/handshake_server.c \
-    third_party/boringssl/ssl/s3_both.c \
-    third_party/boringssl/ssl/s3_lib.c \
-    third_party/boringssl/ssl/s3_pkt.c \
-    third_party/boringssl/ssl/ssl_aead_ctx.c \
-    third_party/boringssl/ssl/ssl_asn1.c \
-    third_party/boringssl/ssl/ssl_buffer.c \
-    third_party/boringssl/ssl/ssl_cert.c \
-    third_party/boringssl/ssl/ssl_cipher.c \
-    third_party/boringssl/ssl/ssl_ecdh.c \
-    third_party/boringssl/ssl/ssl_file.c \
-    third_party/boringssl/ssl/ssl_lib.c \
-    third_party/boringssl/ssl/ssl_privkey.c \
-    third_party/boringssl/ssl/ssl_privkey_cc.cc \
-    third_party/boringssl/ssl/ssl_session.c \
-    third_party/boringssl/ssl/ssl_stat.c \
-    third_party/boringssl/ssl/ssl_transcript.c \
-    third_party/boringssl/ssl/ssl_x509.c \
-    third_party/boringssl/ssl/t1_enc.c \
-    third_party/boringssl/ssl/t1_lib.c \
-    third_party/boringssl/ssl/tls13_both.c \
-    third_party/boringssl/ssl/tls13_client.c \
-    third_party/boringssl/ssl/tls13_enc.c \
-    third_party/boringssl/ssl/tls13_server.c \
-    third_party/boringssl/ssl/tls_method.c \
-    third_party/boringssl/ssl/tls_record.c \
+    third_party/boringssl/ssl/bio_ssl.cc \
+    third_party/boringssl/ssl/custom_extensions.cc \
+    third_party/boringssl/ssl/d1_both.cc \
+    third_party/boringssl/ssl/d1_lib.cc \
+    third_party/boringssl/ssl/d1_pkt.cc \
+    third_party/boringssl/ssl/d1_srtp.cc \
+    third_party/boringssl/ssl/dtls_method.cc \
+    third_party/boringssl/ssl/dtls_record.cc \
+    third_party/boringssl/ssl/handshake.cc \
+    third_party/boringssl/ssl/handshake_client.cc \
+    third_party/boringssl/ssl/handshake_server.cc \
+    third_party/boringssl/ssl/s3_both.cc \
+    third_party/boringssl/ssl/s3_lib.cc \
+    third_party/boringssl/ssl/s3_pkt.cc \
+    third_party/boringssl/ssl/ssl_aead_ctx.cc \
+    third_party/boringssl/ssl/ssl_asn1.cc \
+    third_party/boringssl/ssl/ssl_buffer.cc \
+    third_party/boringssl/ssl/ssl_cert.cc \
+    third_party/boringssl/ssl/ssl_cipher.cc \
+    third_party/boringssl/ssl/ssl_file.cc \
+    third_party/boringssl/ssl/ssl_key_share.cc \
+    third_party/boringssl/ssl/ssl_lib.cc \
+    third_party/boringssl/ssl/ssl_privkey.cc \
+    third_party/boringssl/ssl/ssl_session.cc \
+    third_party/boringssl/ssl/ssl_stat.cc \
+    third_party/boringssl/ssl/ssl_transcript.cc \
+    third_party/boringssl/ssl/ssl_versions.cc \
+    third_party/boringssl/ssl/ssl_x509.cc \
+    third_party/boringssl/ssl/t1_enc.cc \
+    third_party/boringssl/ssl/t1_lib.cc \
+    third_party/boringssl/ssl/tls13_both.cc \
+    third_party/boringssl/ssl/tls13_client.cc \
+    third_party/boringssl/ssl/tls13_enc.cc \
+    third_party/boringssl/ssl/tls13_server.cc \
+    third_party/boringssl/ssl/tls_method.cc \
+    third_party/boringssl/ssl/tls_record.cc \
    , $ext_shared, , -fvisibility=hidden \
    -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
    -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0)
@ -703,44 +654,38 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/aes)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/asn1)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/base64)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/bio)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/bn)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/bn/asm)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/bn_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/buf)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/bytestring)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/chacha)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/cipher)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/cipher_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/cmac)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/conf)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/curve25519)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/des)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/dh)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/digest)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/digest_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/dsa)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ec)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ec_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ecdh)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ecdsa)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ecdsa_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/engine)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/err)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/evp)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/fipsmodule)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/hkdf)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/hmac)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/lhash)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/md4)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/md5)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/modes)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/obj)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/pem)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/pkcs7)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/pkcs8)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/poly1305)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/pool)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rand)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rand_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rc4)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rsa)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/sha)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rsa_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/stack)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509v3)
--- a/config.w32
+++ b/config.w32
@ -314,9 +314,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\workarounds\\workaround_utils.cc " +
    "src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
    "src\\boringssl\\err_data.c " +
-    "third_party\\boringssl\\crypto\\aes\\aes.c " +
-    "third_party\\boringssl\\crypto\\aes\\key_wrap.c " +
-    "third_party\\boringssl\\crypto\\aes\\mode_wrappers.c " +
    "third_party\\boringssl\\crypto\\asn1\\a_bitstr.c " +
    "third_party\\boringssl\\crypto\\asn1\\a_bool.c " +
    "third_party\\boringssl\\crypto\\asn1\\a_d2i_fp.c " +
@ -340,7 +337,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\asn1\\f_enum.c " +
    "third_party\\boringssl\\crypto\\asn1\\f_int.c " +
    "third_party\\boringssl\\crypto\\asn1\\f_string.c " +
-    "third_party\\boringssl\\crypto\\asn1\\t_bitst.c " +
    "third_party\\boringssl\\crypto\\asn1\\tasn_dec.c " +
    "third_party\\boringssl\\crypto\\asn1\\tasn_enc.c " +
    "third_party\\boringssl\\crypto\\asn1\\tasn_fre.c " +
@ -348,8 +344,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\asn1\\tasn_typ.c " +
    "third_party\\boringssl\\crypto\\asn1\\tasn_utl.c " +
    "third_party\\boringssl\\crypto\\asn1\\time_support.c " +
-    "third_party\\boringssl\\crypto\\asn1\\x_bignum.c " +
-    "third_party\\boringssl\\crypto\\asn1\\x_long.c " +
    "third_party\\boringssl\\crypto\\base64\\base64.c " +
    "third_party\\boringssl\\crypto\\bio\\bio.c " +
    "third_party\\boringssl\\crypto\\bio\\bio_mem.c " +
@ -361,44 +355,25 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\bio\\printf.c " +
    "third_party\\boringssl\\crypto\\bio\\socket.c " +
    "third_party\\boringssl\\crypto\\bio\\socket_helper.c " +
-    "third_party\\boringssl\\crypto\\bn\\add.c " +
-    "third_party\\boringssl\\crypto\\bn\\asm\\x86_64-gcc.c " +
-    "third_party\\boringssl\\crypto\\bn\\bn.c " +
-    "third_party\\boringssl\\crypto\\bn\\bn_asn1.c " +
-    "third_party\\boringssl\\crypto\\bn\\cmp.c " +
-    "third_party\\boringssl\\crypto\\bn\\convert.c " +
-    "third_party\\boringssl\\crypto\\bn\\ctx.c " +
-    "third_party\\boringssl\\crypto\\bn\\div.c " +
-    "third_party\\boringssl\\crypto\\bn\\exponentiation.c " +
-    "third_party\\boringssl\\crypto\\bn\\gcd.c " +
-    "third_party\\boringssl\\crypto\\bn\\generic.c " +
-    "third_party\\boringssl\\crypto\\bn\\kronecker.c " +
-    "third_party\\boringssl\\crypto\\bn\\montgomery.c " +
-    "third_party\\boringssl\\crypto\\bn\\montgomery_inv.c " +
-    "third_party\\boringssl\\crypto\\bn\\mul.c " +
-    "third_party\\boringssl\\crypto\\bn\\prime.c " +
-    "third_party\\boringssl\\crypto\\bn\\random.c " +
-    "third_party\\boringssl\\crypto\\bn\\rsaz_exp.c " +
-    "third_party\\boringssl\\crypto\\bn\\shift.c " +
-    "third_party\\boringssl\\crypto\\bn\\sqrt.c " +
+    "third_party\\boringssl\\crypto\\bn_extra\\bn_asn1.c " +
+    "third_party\\boringssl\\crypto\\bn_extra\\convert.c " +
    "third_party\\boringssl\\crypto\\buf\\buf.c " +
    "third_party\\boringssl\\crypto\\bytestring\\asn1_compat.c " +
    "third_party\\boringssl\\crypto\\bytestring\\ber.c " +
    "third_party\\boringssl\\crypto\\bytestring\\cbb.c " +
    "third_party\\boringssl\\crypto\\bytestring\\cbs.c " +
    "third_party\\boringssl\\crypto\\chacha\\chacha.c " +
-    "third_party\\boringssl\\crypto\\cipher\\aead.c " +
-    "third_party\\boringssl\\crypto\\cipher\\cipher.c " +
-    "third_party\\boringssl\\crypto\\cipher\\derive_key.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_aes.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_chacha20poly1305.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_des.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_null.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_rc2.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_rc4.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_ssl3.c " +
-    "third_party\\boringssl\\crypto\\cipher\\e_tls.c " +
-    "third_party\\boringssl\\crypto\\cipher\\tls_cbc.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\cipher_extra.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\derive_key.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_aesctrhmac.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_aesgcmsiv.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_chacha20poly1305.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_null.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_rc2.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_rc4.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_ssl3.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\e_tls.c " +
+    "third_party\\boringssl\\crypto\\cipher_extra\\tls_cbc.c " +
    "third_party\\boringssl\\crypto\\cmac\\cmac.c " +
    "third_party\\boringssl\\crypto\\conf\\conf.c " +
    "third_party\\boringssl\\crypto\\cpu-aarch64-linux.c " +
@ -410,29 +385,16 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\curve25519\\curve25519.c " +
    "third_party\\boringssl\\crypto\\curve25519\\spake25519.c " +
    "third_party\\boringssl\\crypto\\curve25519\\x25519-x86_64.c " +
-    "third_party\\boringssl\\crypto\\des\\des.c " +
    "third_party\\boringssl\\crypto\\dh\\check.c " +
    "third_party\\boringssl\\crypto\\dh\\dh.c " +
    "third_party\\boringssl\\crypto\\dh\\dh_asn1.c " +
    "third_party\\boringssl\\crypto\\dh\\params.c " +
-    "third_party\\boringssl\\crypto\\digest\\digest.c " +
-    "third_party\\boringssl\\crypto\\digest\\digests.c " +
+    "third_party\\boringssl\\crypto\\digest_extra\\digest_extra.c " +
    "third_party\\boringssl\\crypto\\dsa\\dsa.c " +
    "third_party\\boringssl\\crypto\\dsa\\dsa_asn1.c " +
-    "third_party\\boringssl\\crypto\\ec\\ec.c " +
-    "third_party\\boringssl\\crypto\\ec\\ec_asn1.c " +
-    "third_party\\boringssl\\crypto\\ec\\ec_key.c " +
-    "third_party\\boringssl\\crypto\\ec\\ec_montgomery.c " +
-    "third_party\\boringssl\\crypto\\ec\\oct.c " +
-    "third_party\\boringssl\\crypto\\ec\\p224-64.c " +
-    "third_party\\boringssl\\crypto\\ec\\p256-64.c " +
-    "third_party\\boringssl\\crypto\\ec\\p256-x86_64.c " +
-    "third_party\\boringssl\\crypto\\ec\\simple.c " +
-    "third_party\\boringssl\\crypto\\ec\\util-64.c " +
-    "third_party\\boringssl\\crypto\\ec\\wnaf.c " +
+    "third_party\\boringssl\\crypto\\ec_extra\\ec_asn1.c " +
    "third_party\\boringssl\\crypto\\ecdh\\ecdh.c " +
-    "third_party\\boringssl\\crypto\\ecdsa\\ecdsa.c " +
-    "third_party\\boringssl\\crypto\\ecdsa\\ecdsa_asn1.c " +
+    "third_party\\boringssl\\crypto\\ecdsa_extra\\ecdsa_asn1.c " +
    "third_party\\boringssl\\crypto\\engine\\engine.c " +
    "third_party\\boringssl\\crypto\\err\\err.c " +
    "third_party\\boringssl\\crypto\\evp\\digestsign.c " +
@ -442,24 +404,20 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\evp\\p_dsa_asn1.c " +
    "third_party\\boringssl\\crypto\\evp\\p_ec.c " +
    "third_party\\boringssl\\crypto\\evp\\p_ec_asn1.c " +
+    "third_party\\boringssl\\crypto\\evp\\p_ed25519.c " +
+    "third_party\\boringssl\\crypto\\evp\\p_ed25519_asn1.c " +
    "third_party\\boringssl\\crypto\\evp\\p_rsa.c " +
    "third_party\\boringssl\\crypto\\evp\\p_rsa_asn1.c " +
    "third_party\\boringssl\\crypto\\evp\\pbkdf.c " +
    "third_party\\boringssl\\crypto\\evp\\print.c " +
+    "third_party\\boringssl\\crypto\\evp\\scrypt.c " +
    "third_party\\boringssl\\crypto\\evp\\sign.c " +
    "third_party\\boringssl\\crypto\\ex_data.c " +
+    "third_party\\boringssl\\crypto\\fipsmodule\\bcm.c " +
+    "third_party\\boringssl\\crypto\\fipsmodule\\is_fips.c " +
    "third_party\\boringssl\\crypto\\hkdf\\hkdf.c " +
-    "third_party\\boringssl\\crypto\\hmac\\hmac.c " +
    "third_party\\boringssl\\crypto\\lhash\\lhash.c " +
-    "third_party\\boringssl\\crypto\\md4\\md4.c " +
-    "third_party\\boringssl\\crypto\\md5\\md5.c " +
    "third_party\\boringssl\\crypto\\mem.c " +
-    "third_party\\boringssl\\crypto\\modes\\cbc.c " +
-    "third_party\\boringssl\\crypto\\modes\\cfb.c " +
-    "third_party\\boringssl\\crypto\\modes\\ctr.c " +
-    "third_party\\boringssl\\crypto\\modes\\gcm.c " +
-    "third_party\\boringssl\\crypto\\modes\\ofb.c " +
-    "third_party\\boringssl\\crypto\\modes\\polyval.c " +
    "third_party\\boringssl\\crypto\\obj\\obj.c " +
    "third_party\\boringssl\\crypto\\obj\\obj_xref.c " +
    "third_party\\boringssl\\crypto\\pem\\pem_all.c " +
@ -470,30 +428,24 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\pem\\pem_pkey.c " +
    "third_party\\boringssl\\crypto\\pem\\pem_x509.c " +
    "third_party\\boringssl\\crypto\\pem\\pem_xaux.c " +
+    "third_party\\boringssl\\crypto\\pkcs7\\pkcs7.c " +
+    "third_party\\boringssl\\crypto\\pkcs7\\pkcs7_x509.c " +
    "third_party\\boringssl\\crypto\\pkcs8\\p5_pbev2.c " +
-    "third_party\\boringssl\\crypto\\pkcs8\\p8_pkey.c " +
    "third_party\\boringssl\\crypto\\pkcs8\\pkcs8.c " +
+    "third_party\\boringssl\\crypto\\pkcs8\\pkcs8_x509.c " +
    "third_party\\boringssl\\crypto\\poly1305\\poly1305.c " +
    "third_party\\boringssl\\crypto\\poly1305\\poly1305_arm.c " +
    "third_party\\boringssl\\crypto\\poly1305\\poly1305_vec.c " +
    "third_party\\boringssl\\crypto\\pool\\pool.c " +
-    "third_party\\boringssl\\crypto\\rand\\deterministic.c " +
-    "third_party\\boringssl\\crypto\\rand\\fuchsia.c " +
-    "third_party\\boringssl\\crypto\\rand\\rand.c " +
-    "third_party\\boringssl\\crypto\\rand\\urandom.c " +
-    "third_party\\boringssl\\crypto\\rand\\windows.c " +
+    "third_party\\boringssl\\crypto\\rand_extra\\deterministic.c " +
+    "third_party\\boringssl\\crypto\\rand_extra\\forkunsafe.c " +
+    "third_party\\boringssl\\crypto\\rand_extra\\fuchsia.c " +
+    "third_party\\boringssl\\crypto\\rand_extra\\rand_extra.c " +
+    "third_party\\boringssl\\crypto\\rand_extra\\windows.c " +
    "third_party\\boringssl\\crypto\\rc4\\rc4.c " +
    "third_party\\boringssl\\crypto\\refcount_c11.c " +
    "third_party\\boringssl\\crypto\\refcount_lock.c " +
-    "third_party\\boringssl\\crypto\\rsa\\blinding.c " +
-    "third_party\\boringssl\\crypto\\rsa\\padding.c " +
-    "third_party\\boringssl\\crypto\\rsa\\rsa.c " +
-    "third_party\\boringssl\\crypto\\rsa\\rsa_asn1.c " +
-    "third_party\\boringssl\\crypto\\rsa\\rsa_impl.c " +
-    "third_party\\boringssl\\crypto\\sha\\sha1-altivec.c " +
-    "third_party\\boringssl\\crypto\\sha\\sha1.c " +
-    "third_party\\boringssl\\crypto\\sha\\sha256.c " +
-    "third_party\\boringssl\\crypto\\sha\\sha512.c " +
+    "third_party\\boringssl\\crypto\\rsa_extra\\rsa_asn1.c " +
    "third_party\\boringssl\\crypto\\stack\\stack.c " +
    "third_party\\boringssl\\crypto\\thread.c " +
    "third_party\\boringssl\\crypto\\thread_none.c " +
@ -508,7 +460,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\x509\\by_dir.c " +
    "third_party\\boringssl\\crypto\\x509\\by_file.c " +
    "third_party\\boringssl\\crypto\\x509\\i2d_pr.c " +
-    "third_party\\boringssl\\crypto\\x509\\pkcs7.c " +
    "third_party\\boringssl\\crypto\\x509\\rsa_pss.c " +
    "third_party\\boringssl\\crypto\\x509\\t_crl.c " +
    "third_party\\boringssl\\crypto\\x509\\t_req.c " +
@ -534,7 +485,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\x509\\x509name.c " +
    "third_party\\boringssl\\crypto\\x509\\x509rset.c " +
    "third_party\\boringssl\\crypto\\x509\\x509spki.c " +
-    "third_party\\boringssl\\crypto\\x509\\x509type.c " +
    "third_party\\boringssl\\crypto\\x509\\x_algor.c " +
    "third_party\\boringssl\\crypto\\x509\\x_all.c " +
    "third_party\\boringssl\\crypto\\x509\\x_attrib.c " +
@ -582,41 +532,42 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\x509v3\\v3_skey.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_sxnet.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_utl.c " +
-    "third_party\\boringssl\\ssl\\bio_ssl.c " +
-    "third_party\\boringssl\\ssl\\custom_extensions.c " +
-    "third_party\\boringssl\\ssl\\d1_both.c " +
-    "third_party\\boringssl\\ssl\\d1_lib.c " +
-    "third_party\\boringssl\\ssl\\d1_pkt.c " +
-    "third_party\\boringssl\\ssl\\d1_srtp.c " +
-    "third_party\\boringssl\\ssl\\dtls_method.c " +
-    "third_party\\boringssl\\ssl\\dtls_record.c " +
-    "third_party\\boringssl\\ssl\\handshake_client.c " +
-    "third_party\\boringssl\\ssl\\handshake_server.c " +
-    "third_party\\boringssl\\ssl\\s3_both.c " +
-    "third_party\\boringssl\\ssl\\s3_lib.c " +
-    "third_party\\boringssl\\ssl\\s3_pkt.c " +
-    "third_party\\boringssl\\ssl\\ssl_aead_ctx.c " +
-    "third_party\\boringssl\\ssl\\ssl_asn1.c " +
-    "third_party\\boringssl\\ssl\\ssl_buffer.c " +
-    "third_party\\boringssl\\ssl\\ssl_cert.c " +
-    "third_party\\boringssl\\ssl\\ssl_cipher.c " +
-    "third_party\\boringssl\\ssl\\ssl_ecdh.c " +
-    "third_party\\boringssl\\ssl\\ssl_file.c " +
-    "third_party\\boringssl\\ssl\\ssl_lib.c " +
-    "third_party\\boringssl\\ssl\\ssl_privkey.c " +
-    "third_party\\boringssl\\ssl\\ssl_privkey_cc.cc " +
-    "third_party\\boringssl\\ssl\\ssl_session.c " +
-    "third_party\\boringssl\\ssl\\ssl_stat.c " +
-    "third_party\\boringssl\\ssl\\ssl_transcript.c " +
-    "third_party\\boringssl\\ssl\\ssl_x509.c " +
-    "third_party\\boringssl\\ssl\\t1_enc.c " +
-    "third_party\\boringssl\\ssl\\t1_lib.c " +
-    "third_party\\boringssl\\ssl\\tls13_both.c " +
-    "third_party\\boringssl\\ssl\\tls13_client.c " +
-    "third_party\\boringssl\\ssl\\tls13_enc.c " +
-    "third_party\\boringssl\\ssl\\tls13_server.c " +
-    "third_party\\boringssl\\ssl\\tls_method.c " +
-    "third_party\\boringssl\\ssl\\tls_record.c " +
+    "third_party\\boringssl\\ssl\\bio_ssl.cc " +
+    "third_party\\boringssl\\ssl\\custom_extensions.cc " +
+    "third_party\\boringssl\\ssl\\d1_both.cc " +
+    "third_party\\boringssl\\ssl\\d1_lib.cc " +
+    "third_party\\boringssl\\ssl\\d1_pkt.cc " +
+    "third_party\\boringssl\\ssl\\d1_srtp.cc " +
+    "third_party\\boringssl\\ssl\\dtls_method.cc " +
+    "third_party\\boringssl\\ssl\\dtls_record.cc " +
+    "third_party\\boringssl\\ssl\\handshake.cc " +
+    "third_party\\boringssl\\ssl\\handshake_client.cc " +
+    "third_party\\boringssl\\ssl\\handshake_server.cc " +
+    "third_party\\boringssl\\ssl\\s3_both.cc " +
+    "third_party\\boringssl\\ssl\\s3_lib.cc " +
+    "third_party\\boringssl\\ssl\\s3_pkt.cc " +
+    "third_party\\boringssl\\ssl\\ssl_aead_ctx.cc " +
+    "third_party\\boringssl\\ssl\\ssl_asn1.cc " +
+    "third_party\\boringssl\\ssl\\ssl_buffer.cc " +
+    "third_party\\boringssl\\ssl\\ssl_cert.cc " +
+    "third_party\\boringssl\\ssl\\ssl_cipher.cc " +
+    "third_party\\boringssl\\ssl\\ssl_file.cc " +
+    "third_party\\boringssl\\ssl\\ssl_key_share.cc " +
+    "third_party\\boringssl\\ssl\\ssl_lib.cc " +
+    "third_party\\boringssl\\ssl\\ssl_privkey.cc " +
+    "third_party\\boringssl\\ssl\\ssl_session.cc " +
+    "third_party\\boringssl\\ssl\\ssl_stat.cc " +
+    "third_party\\boringssl\\ssl\\ssl_transcript.cc " +
+    "third_party\\boringssl\\ssl\\ssl_versions.cc " +
+    "third_party\\boringssl\\ssl\\ssl_x509.cc " +
+    "third_party\\boringssl\\ssl\\t1_enc.cc " +
+    "third_party\\boringssl\\ssl\\t1_lib.cc " +
+    "third_party\\boringssl\\ssl\\tls13_both.cc " +
+    "third_party\\boringssl\\ssl\\tls13_client.cc " +
+    "third_party\\boringssl\\ssl\\tls13_enc.cc " +
+    "third_party\\boringssl\\ssl\\tls13_server.cc " +
+    "third_party\\boringssl\\ssl\\tls_method.cc " +
+    "third_party\\boringssl\\ssl\\tls_record.cc " +
    "third_party\\zlib\\adler32.c " +
    "third_party\\zlib\\compress.c " +
    "third_party\\zlib\\crc32.c " +
@ -721,44 +672,38 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\aes");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\asn1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\base64");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\bio");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\bn");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\bn\\asm");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\bn_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\buf");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\bytestring");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\chacha");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\cipher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\cipher_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\cmac");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\conf");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\curve25519");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\des");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\dh");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\digest");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\digest_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\dsa");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ec");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ec_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ecdh");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ecdsa");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ecdsa_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\engine");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\err");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\evp");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\fipsmodule");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\hkdf");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\hmac");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\lhash");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\md4");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\md5");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\modes");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\obj");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\pem");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\pkcs7");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\pkcs8");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\poly1305");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\pool");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rand");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rand_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rc4");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rsa");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\sha");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rsa_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\stack");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509v3");
--- a/doc/command_line_tool.md
+++ b/doc/command_line_tool.md
@ -183,7 +183,7 @@ We can send RPCs to a server and get responses using `grpc_cli call` command.

 -   Send non-proto rpc

-    For using gRPC with protocols other than probobuf, you will need the exact
+    For using gRPC with protocols other than protobuf, you will need the exact
    method name string and a file containing the raw bytes to be sent on the
    wire.

--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -189,7 +189,7 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.libraries = 'z'
    ss.dependency "#{s.name}/Interface", version
-    ss.dependency 'BoringSSL', '~> 9.0'
+    ss.dependency 'BoringSSL', '~> 10.0'
    ss.dependency 'nanopb', '~> 0.3'

    # To save you from scrolling, this is the last part of the podspec.
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -654,31 +654,35 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc )
  s.files += %w( src/core/ext/filters/workarounds/workaround_utils.cc )
  s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
-  s.files += %w( third_party/boringssl/crypto/aes/internal.h )
  s.files += %w( third_party/boringssl/crypto/asn1/asn1_locl.h )
  s.files += %w( third_party/boringssl/crypto/bio/internal.h )
-  s.files += %w( third_party/boringssl/crypto/bn/internal.h )
-  s.files += %w( third_party/boringssl/crypto/bn/rsaz_exp.h )
  s.files += %w( third_party/boringssl/crypto/bytestring/internal.h )
-  s.files += %w( third_party/boringssl/crypto/cipher/internal.h )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/internal.h )
  s.files += %w( third_party/boringssl/crypto/conf/conf_def.h )
  s.files += %w( third_party/boringssl/crypto/conf/internal.h )
  s.files += %w( third_party/boringssl/crypto/curve25519/internal.h )
-  s.files += %w( third_party/boringssl/crypto/des/internal.h )
-  s.files += %w( third_party/boringssl/crypto/digest/internal.h )
-  s.files += %w( third_party/boringssl/crypto/digest/md32_common.h )
-  s.files += %w( third_party/boringssl/crypto/ec/internal.h )
-  s.files += %w( third_party/boringssl/crypto/ec/p256-x86_64-table.h )
-  s.files += %w( third_party/boringssl/crypto/ec/p256-x86_64.h )
+  s.files += %w( third_party/boringssl/crypto/err/internal.h )
  s.files += %w( third_party/boringssl/crypto/evp/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/delocate.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/des/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/md32_common.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/internal.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/internal.h )
  s.files += %w( third_party/boringssl/crypto/internal.h )
-  s.files += %w( third_party/boringssl/crypto/modes/internal.h )
  s.files += %w( third_party/boringssl/crypto/obj/obj_dat.h )
+  s.files += %w( third_party/boringssl/crypto/pkcs7/internal.h )
  s.files += %w( third_party/boringssl/crypto/pkcs8/internal.h )
  s.files += %w( third_party/boringssl/crypto/poly1305/internal.h )
  s.files += %w( third_party/boringssl/crypto/pool/internal.h )
-  s.files += %w( third_party/boringssl/crypto/rand/internal.h )
-  s.files += %w( third_party/boringssl/crypto/rsa/internal.h )
  s.files += %w( third_party/boringssl/crypto/x509/charmap.h )
  s.files += %w( third_party/boringssl/crypto/x509/internal.h )
  s.files += %w( third_party/boringssl/crypto/x509/vpm_int.h )
@ -721,6 +725,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/ex_data.h )
  s.files += %w( third_party/boringssl/include/openssl/hkdf.h )
  s.files += %w( third_party/boringssl/include/openssl/hmac.h )
+  s.files += %w( third_party/boringssl/include/openssl/is_boringssl.h )
  s.files += %w( third_party/boringssl/include/openssl/lhash.h )
  s.files += %w( third_party/boringssl/include/openssl/lhash_macros.h )
  s.files += %w( third_party/boringssl/include/openssl/md4.h )
@ -745,11 +750,11 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/rsa.h )
  s.files += %w( third_party/boringssl/include/openssl/safestack.h )
  s.files += %w( third_party/boringssl/include/openssl/sha.h )
+  s.files += %w( third_party/boringssl/include/openssl/span.h )
  s.files += %w( third_party/boringssl/include/openssl/srtp.h )
  s.files += %w( third_party/boringssl/include/openssl/ssl.h )
  s.files += %w( third_party/boringssl/include/openssl/ssl3.h )
  s.files += %w( third_party/boringssl/include/openssl/stack.h )
-  s.files += %w( third_party/boringssl/include/openssl/stack_macros.h )
  s.files += %w( third_party/boringssl/include/openssl/thread.h )
  s.files += %w( third_party/boringssl/include/openssl/tls1.h )
  s.files += %w( third_party/boringssl/include/openssl/type_check.h )
@ -758,9 +763,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/x509v3.h )
  s.files += %w( third_party/boringssl/ssl/internal.h )
  s.files += %w( src/boringssl/err_data.c )
-  s.files += %w( third_party/boringssl/crypto/aes/aes.c )
-  s.files += %w( third_party/boringssl/crypto/aes/key_wrap.c )
-  s.files += %w( third_party/boringssl/crypto/aes/mode_wrappers.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bitstr.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bool.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_d2i_fp.c )
@ -784,7 +786,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/asn1/f_enum.c )
  s.files += %w( third_party/boringssl/crypto/asn1/f_int.c )
  s.files += %w( third_party/boringssl/crypto/asn1/f_string.c )
-  s.files += %w( third_party/boringssl/crypto/asn1/t_bitst.c )
  s.files += %w( third_party/boringssl/crypto/asn1/tasn_dec.c )
  s.files += %w( third_party/boringssl/crypto/asn1/tasn_enc.c )
  s.files += %w( third_party/boringssl/crypto/asn1/tasn_fre.c )
@ -792,8 +793,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/asn1/tasn_typ.c )
  s.files += %w( third_party/boringssl/crypto/asn1/tasn_utl.c )
  s.files += %w( third_party/boringssl/crypto/asn1/time_support.c )
-  s.files += %w( third_party/boringssl/crypto/asn1/x_bignum.c )
-  s.files += %w( third_party/boringssl/crypto/asn1/x_long.c )
  s.files += %w( third_party/boringssl/crypto/base64/base64.c )
  s.files += %w( third_party/boringssl/crypto/bio/bio.c )
  s.files += %w( third_party/boringssl/crypto/bio/bio_mem.c )
@ -805,44 +804,25 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/bio/printf.c )
  s.files += %w( third_party/boringssl/crypto/bio/socket.c )
  s.files += %w( third_party/boringssl/crypto/bio/socket_helper.c )
-  s.files += %w( third_party/boringssl/crypto/bn/add.c )
-  s.files += %w( third_party/boringssl/crypto/bn/asm/x86_64-gcc.c )
-  s.files += %w( third_party/boringssl/crypto/bn/bn.c )
-  s.files += %w( third_party/boringssl/crypto/bn/bn_asn1.c )
-  s.files += %w( third_party/boringssl/crypto/bn/cmp.c )
-  s.files += %w( third_party/boringssl/crypto/bn/convert.c )
-  s.files += %w( third_party/boringssl/crypto/bn/ctx.c )
-  s.files += %w( third_party/boringssl/crypto/bn/div.c )
-  s.files += %w( third_party/boringssl/crypto/bn/exponentiation.c )
-  s.files += %w( third_party/boringssl/crypto/bn/gcd.c )
-  s.files += %w( third_party/boringssl/crypto/bn/generic.c )
-  s.files += %w( third_party/boringssl/crypto/bn/kronecker.c )
-  s.files += %w( third_party/boringssl/crypto/bn/montgomery.c )
-  s.files += %w( third_party/boringssl/crypto/bn/montgomery_inv.c )
-  s.files += %w( third_party/boringssl/crypto/bn/mul.c )
-  s.files += %w( third_party/boringssl/crypto/bn/prime.c )
-  s.files += %w( third_party/boringssl/crypto/bn/random.c )
-  s.files += %w( third_party/boringssl/crypto/bn/rsaz_exp.c )
-  s.files += %w( third_party/boringssl/crypto/bn/shift.c )
-  s.files += %w( third_party/boringssl/crypto/bn/sqrt.c )
+  s.files += %w( third_party/boringssl/crypto/bn_extra/bn_asn1.c )
+  s.files += %w( third_party/boringssl/crypto/bn_extra/convert.c )
  s.files += %w( third_party/boringssl/crypto/buf/buf.c )
  s.files += %w( third_party/boringssl/crypto/bytestring/asn1_compat.c )
  s.files += %w( third_party/boringssl/crypto/bytestring/ber.c )
  s.files += %w( third_party/boringssl/crypto/bytestring/cbb.c )
  s.files += %w( third_party/boringssl/crypto/bytestring/cbs.c )
  s.files += %w( third_party/boringssl/crypto/chacha/chacha.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/aead.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/cipher.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/derive_key.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_aes.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_chacha20poly1305.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_des.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_null.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_rc2.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_rc4.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_ssl3.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/e_tls.c )
-  s.files += %w( third_party/boringssl/crypto/cipher/tls_cbc.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/cipher_extra.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/derive_key.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_null.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_rc2.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_rc4.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_ssl3.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/e_tls.c )
+  s.files += %w( third_party/boringssl/crypto/cipher_extra/tls_cbc.c )
  s.files += %w( third_party/boringssl/crypto/cmac/cmac.c )
  s.files += %w( third_party/boringssl/crypto/conf/conf.c )
  s.files += %w( third_party/boringssl/crypto/cpu-aarch64-linux.c )
@ -854,29 +834,16 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/curve25519/curve25519.c )
  s.files += %w( third_party/boringssl/crypto/curve25519/spake25519.c )
  s.files += %w( third_party/boringssl/crypto/curve25519/x25519-x86_64.c )
-  s.files += %w( third_party/boringssl/crypto/des/des.c )
  s.files += %w( third_party/boringssl/crypto/dh/check.c )
  s.files += %w( third_party/boringssl/crypto/dh/dh.c )
  s.files += %w( third_party/boringssl/crypto/dh/dh_asn1.c )
  s.files += %w( third_party/boringssl/crypto/dh/params.c )
-  s.files += %w( third_party/boringssl/crypto/digest/digest.c )
-  s.files += %w( third_party/boringssl/crypto/digest/digests.c )
+  s.files += %w( third_party/boringssl/crypto/digest_extra/digest_extra.c )
  s.files += %w( third_party/boringssl/crypto/dsa/dsa.c )
  s.files += %w( third_party/boringssl/crypto/dsa/dsa_asn1.c )
-  s.files += %w( third_party/boringssl/crypto/ec/ec.c )
-  s.files += %w( third_party/boringssl/crypto/ec/ec_asn1.c )
-  s.files += %w( third_party/boringssl/crypto/ec/ec_key.c )
-  s.files += %w( third_party/boringssl/crypto/ec/ec_montgomery.c )
-  s.files += %w( third_party/boringssl/crypto/ec/oct.c )
-  s.files += %w( third_party/boringssl/crypto/ec/p224-64.c )
-  s.files += %w( third_party/boringssl/crypto/ec/p256-64.c )
-  s.files += %w( third_party/boringssl/crypto/ec/p256-x86_64.c )
-  s.files += %w( third_party/boringssl/crypto/ec/simple.c )
-  s.files += %w( third_party/boringssl/crypto/ec/util-64.c )
-  s.files += %w( third_party/boringssl/crypto/ec/wnaf.c )
+  s.files += %w( third_party/boringssl/crypto/ec_extra/ec_asn1.c )
  s.files += %w( third_party/boringssl/crypto/ecdh/ecdh.c )
-  s.files += %w( third_party/boringssl/crypto/ecdsa/ecdsa.c )
-  s.files += %w( third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c )
+  s.files += %w( third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c )
  s.files += %w( third_party/boringssl/crypto/engine/engine.c )
  s.files += %w( third_party/boringssl/crypto/err/err.c )
  s.files += %w( third_party/boringssl/crypto/evp/digestsign.c )
@ -886,24 +853,20 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/evp/p_dsa_asn1.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_ec.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_ec_asn1.c )
+  s.files += %w( third_party/boringssl/crypto/evp/p_ed25519.c )
+  s.files += %w( third_party/boringssl/crypto/evp/p_ed25519_asn1.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_rsa.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_rsa_asn1.c )
  s.files += %w( third_party/boringssl/crypto/evp/pbkdf.c )
  s.files += %w( third_party/boringssl/crypto/evp/print.c )
+  s.files += %w( third_party/boringssl/crypto/evp/scrypt.c )
  s.files += %w( third_party/boringssl/crypto/evp/sign.c )
  s.files += %w( third_party/boringssl/crypto/ex_data.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/bcm.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/is_fips.c )
  s.files += %w( third_party/boringssl/crypto/hkdf/hkdf.c )
-  s.files += %w( third_party/boringssl/crypto/hmac/hmac.c )
  s.files += %w( third_party/boringssl/crypto/lhash/lhash.c )
-  s.files += %w( third_party/boringssl/crypto/md4/md4.c )
-  s.files += %w( third_party/boringssl/crypto/md5/md5.c )
  s.files += %w( third_party/boringssl/crypto/mem.c )
-  s.files += %w( third_party/boringssl/crypto/modes/cbc.c )
-  s.files += %w( third_party/boringssl/crypto/modes/cfb.c )
-  s.files += %w( third_party/boringssl/crypto/modes/ctr.c )
-  s.files += %w( third_party/boringssl/crypto/modes/gcm.c )
-  s.files += %w( third_party/boringssl/crypto/modes/ofb.c )
-  s.files += %w( third_party/boringssl/crypto/modes/polyval.c )
  s.files += %w( third_party/boringssl/crypto/obj/obj.c )
  s.files += %w( third_party/boringssl/crypto/obj/obj_xref.c )
  s.files += %w( third_party/boringssl/crypto/pem/pem_all.c )
@ -914,30 +877,24 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/pem/pem_pkey.c )
  s.files += %w( third_party/boringssl/crypto/pem/pem_x509.c )
  s.files += %w( third_party/boringssl/crypto/pem/pem_xaux.c )
+  s.files += %w( third_party/boringssl/crypto/pkcs7/pkcs7.c )
+  s.files += %w( third_party/boringssl/crypto/pkcs7/pkcs7_x509.c )
  s.files += %w( third_party/boringssl/crypto/pkcs8/p5_pbev2.c )
-  s.files += %w( third_party/boringssl/crypto/pkcs8/p8_pkey.c )
  s.files += %w( third_party/boringssl/crypto/pkcs8/pkcs8.c )
+  s.files += %w( third_party/boringssl/crypto/pkcs8/pkcs8_x509.c )
  s.files += %w( third_party/boringssl/crypto/poly1305/poly1305.c )
  s.files += %w( third_party/boringssl/crypto/poly1305/poly1305_arm.c )
  s.files += %w( third_party/boringssl/crypto/poly1305/poly1305_vec.c )
  s.files += %w( third_party/boringssl/crypto/pool/pool.c )
-  s.files += %w( third_party/boringssl/crypto/rand/deterministic.c )
-  s.files += %w( third_party/boringssl/crypto/rand/fuchsia.c )
-  s.files += %w( third_party/boringssl/crypto/rand/rand.c )
-  s.files += %w( third_party/boringssl/crypto/rand/urandom.c )
-  s.files += %w( third_party/boringssl/crypto/rand/windows.c )
+  s.files += %w( third_party/boringssl/crypto/rand_extra/deterministic.c )
+  s.files += %w( third_party/boringssl/crypto/rand_extra/forkunsafe.c )
+  s.files += %w( third_party/boringssl/crypto/rand_extra/fuchsia.c )
+  s.files += %w( third_party/boringssl/crypto/rand_extra/rand_extra.c )
+  s.files += %w( third_party/boringssl/crypto/rand_extra/windows.c )
  s.files += %w( third_party/boringssl/crypto/rc4/rc4.c )
  s.files += %w( third_party/boringssl/crypto/refcount_c11.c )
  s.files += %w( third_party/boringssl/crypto/refcount_lock.c )
-  s.files += %w( third_party/boringssl/crypto/rsa/blinding.c )
-  s.files += %w( third_party/boringssl/crypto/rsa/padding.c )
-  s.files += %w( third_party/boringssl/crypto/rsa/rsa.c )
-  s.files += %w( third_party/boringssl/crypto/rsa/rsa_asn1.c )
-  s.files += %w( third_party/boringssl/crypto/rsa/rsa_impl.c )
-  s.files += %w( third_party/boringssl/crypto/sha/sha1-altivec.c )
-  s.files += %w( third_party/boringssl/crypto/sha/sha1.c )
-  s.files += %w( third_party/boringssl/crypto/sha/sha256.c )
-  s.files += %w( third_party/boringssl/crypto/sha/sha512.c )
+  s.files += %w( third_party/boringssl/crypto/rsa_extra/rsa_asn1.c )
  s.files += %w( third_party/boringssl/crypto/stack/stack.c )
  s.files += %w( third_party/boringssl/crypto/thread.c )
  s.files += %w( third_party/boringssl/crypto/thread_none.c )
@ -952,7 +909,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/x509/by_dir.c )
  s.files += %w( third_party/boringssl/crypto/x509/by_file.c )
  s.files += %w( third_party/boringssl/crypto/x509/i2d_pr.c )
-  s.files += %w( third_party/boringssl/crypto/x509/pkcs7.c )
  s.files += %w( third_party/boringssl/crypto/x509/rsa_pss.c )
  s.files += %w( third_party/boringssl/crypto/x509/t_crl.c )
  s.files += %w( third_party/boringssl/crypto/x509/t_req.c )
@ -978,7 +934,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/x509/x509name.c )
  s.files += %w( third_party/boringssl/crypto/x509/x509rset.c )
  s.files += %w( third_party/boringssl/crypto/x509/x509spki.c )
-  s.files += %w( third_party/boringssl/crypto/x509/x509type.c )
  s.files += %w( third_party/boringssl/crypto/x509/x_algor.c )
  s.files += %w( third_party/boringssl/crypto/x509/x_all.c )
  s.files += %w( third_party/boringssl/crypto/x509/x_attrib.c )
@ -1026,41 +981,42 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_skey.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_sxnet.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_utl.c )
-  s.files += %w( third_party/boringssl/ssl/bio_ssl.c )
-  s.files += %w( third_party/boringssl/ssl/custom_extensions.c )
-  s.files += %w( third_party/boringssl/ssl/d1_both.c )
-  s.files += %w( third_party/boringssl/ssl/d1_lib.c )
-  s.files += %w( third_party/boringssl/ssl/d1_pkt.c )
-  s.files += %w( third_party/boringssl/ssl/d1_srtp.c )
-  s.files += %w( third_party/boringssl/ssl/dtls_method.c )
-  s.files += %w( third_party/boringssl/ssl/dtls_record.c )
-  s.files += %w( third_party/boringssl/ssl/handshake_client.c )
-  s.files += %w( third_party/boringssl/ssl/handshake_server.c )
-  s.files += %w( third_party/boringssl/ssl/s3_both.c )
-  s.files += %w( third_party/boringssl/ssl/s3_lib.c )
-  s.files += %w( third_party/boringssl/ssl/s3_pkt.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_aead_ctx.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_asn1.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_buffer.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_cert.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_cipher.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_ecdh.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_file.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_lib.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_privkey.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_privkey_cc.cc )
-  s.files += %w( third_party/boringssl/ssl/ssl_session.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_stat.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_transcript.c )
-  s.files += %w( third_party/boringssl/ssl/ssl_x509.c )
-  s.files += %w( third_party/boringssl/ssl/t1_enc.c )
-  s.files += %w( third_party/boringssl/ssl/t1_lib.c )
-  s.files += %w( third_party/boringssl/ssl/tls13_both.c )
-  s.files += %w( third_party/boringssl/ssl/tls13_client.c )
-  s.files += %w( third_party/boringssl/ssl/tls13_enc.c )
-  s.files += %w( third_party/boringssl/ssl/tls13_server.c )
-  s.files += %w( third_party/boringssl/ssl/tls_method.c )
-  s.files += %w( third_party/boringssl/ssl/tls_record.c )
+  s.files += %w( third_party/boringssl/ssl/bio_ssl.cc )
+  s.files += %w( third_party/boringssl/ssl/custom_extensions.cc )
+  s.files += %w( third_party/boringssl/ssl/d1_both.cc )
+  s.files += %w( third_party/boringssl/ssl/d1_lib.cc )
+  s.files += %w( third_party/boringssl/ssl/d1_pkt.cc )
+  s.files += %w( third_party/boringssl/ssl/d1_srtp.cc )
+  s.files += %w( third_party/boringssl/ssl/dtls_method.cc )
+  s.files += %w( third_party/boringssl/ssl/dtls_record.cc )
+  s.files += %w( third_party/boringssl/ssl/handshake.cc )
+  s.files += %w( third_party/boringssl/ssl/handshake_client.cc )
+  s.files += %w( third_party/boringssl/ssl/handshake_server.cc )
+  s.files += %w( third_party/boringssl/ssl/s3_both.cc )
+  s.files += %w( third_party/boringssl/ssl/s3_lib.cc )
+  s.files += %w( third_party/boringssl/ssl/s3_pkt.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_aead_ctx.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_asn1.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_buffer.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_cert.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_cipher.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_file.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_key_share.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_lib.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_privkey.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_session.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_stat.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_transcript.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_versions.cc )
+  s.files += %w( third_party/boringssl/ssl/ssl_x509.cc )
+  s.files += %w( third_party/boringssl/ssl/t1_enc.cc )
+  s.files += %w( third_party/boringssl/ssl/t1_lib.cc )
+  s.files += %w( third_party/boringssl/ssl/tls13_both.cc )
+  s.files += %w( third_party/boringssl/ssl/tls13_client.cc )
+  s.files += %w( third_party/boringssl/ssl/tls13_enc.cc )
+  s.files += %w( third_party/boringssl/ssl/tls13_server.cc )
+  s.files += %w( third_party/boringssl/ssl/tls_method.cc )
+  s.files += %w( third_party/boringssl/ssl/tls_record.cc )
  s.files += %w( third_party/zlib/crc32.h )
  s.files += %w( third_party/zlib/deflate.h )
  s.files += %w( third_party/zlib/gzguts.h )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -1565,9 +1565,6 @@
      ],
      'sources': [
        'src/boringssl/err_data.c',
-        'third_party/boringssl/crypto/aes/aes.c',
-        'third_party/boringssl/crypto/aes/key_wrap.c',
-        'third_party/boringssl/crypto/aes/mode_wrappers.c',
        'third_party/boringssl/crypto/asn1/a_bitstr.c',
        'third_party/boringssl/crypto/asn1/a_bool.c',
        'third_party/boringssl/crypto/asn1/a_d2i_fp.c',
@ -1591,7 +1588,6 @@
        'third_party/boringssl/crypto/asn1/f_enum.c',
        'third_party/boringssl/crypto/asn1/f_int.c',
        'third_party/boringssl/crypto/asn1/f_string.c',
-        'third_party/boringssl/crypto/asn1/t_bitst.c',
        'third_party/boringssl/crypto/asn1/tasn_dec.c',
        'third_party/boringssl/crypto/asn1/tasn_enc.c',
        'third_party/boringssl/crypto/asn1/tasn_fre.c',
@ -1599,8 +1595,6 @@
        'third_party/boringssl/crypto/asn1/tasn_typ.c',
        'third_party/boringssl/crypto/asn1/tasn_utl.c',
        'third_party/boringssl/crypto/asn1/time_support.c',
-        'third_party/boringssl/crypto/asn1/x_bignum.c',
-        'third_party/boringssl/crypto/asn1/x_long.c',
        'third_party/boringssl/crypto/base64/base64.c',
        'third_party/boringssl/crypto/bio/bio.c',
        'third_party/boringssl/crypto/bio/bio_mem.c',
@ -1612,44 +1606,25 @@
        'third_party/boringssl/crypto/bio/printf.c',
        'third_party/boringssl/crypto/bio/socket.c',
        'third_party/boringssl/crypto/bio/socket_helper.c',
-        'third_party/boringssl/crypto/bn/add.c',
-        'third_party/boringssl/crypto/bn/asm/x86_64-gcc.c',
-        'third_party/boringssl/crypto/bn/bn.c',
-        'third_party/boringssl/crypto/bn/bn_asn1.c',
-        'third_party/boringssl/crypto/bn/cmp.c',
-        'third_party/boringssl/crypto/bn/convert.c',
-        'third_party/boringssl/crypto/bn/ctx.c',
-        'third_party/boringssl/crypto/bn/div.c',
-        'third_party/boringssl/crypto/bn/exponentiation.c',
-        'third_party/boringssl/crypto/bn/gcd.c',
-        'third_party/boringssl/crypto/bn/generic.c',
-        'third_party/boringssl/crypto/bn/kronecker.c',
-        'third_party/boringssl/crypto/bn/montgomery.c',
-        'third_party/boringssl/crypto/bn/montgomery_inv.c',
-        'third_party/boringssl/crypto/bn/mul.c',
-        'third_party/boringssl/crypto/bn/prime.c',
-        'third_party/boringssl/crypto/bn/random.c',
-        'third_party/boringssl/crypto/bn/rsaz_exp.c',
-        'third_party/boringssl/crypto/bn/shift.c',
-        'third_party/boringssl/crypto/bn/sqrt.c',
+        'third_party/boringssl/crypto/bn_extra/bn_asn1.c',
+        'third_party/boringssl/crypto/bn_extra/convert.c',
        'third_party/boringssl/crypto/buf/buf.c',
        'third_party/boringssl/crypto/bytestring/asn1_compat.c',
        'third_party/boringssl/crypto/bytestring/ber.c',
        'third_party/boringssl/crypto/bytestring/cbb.c',
        'third_party/boringssl/crypto/bytestring/cbs.c',
        'third_party/boringssl/crypto/chacha/chacha.c',
-        'third_party/boringssl/crypto/cipher/aead.c',
-        'third_party/boringssl/crypto/cipher/cipher.c',
-        'third_party/boringssl/crypto/cipher/derive_key.c',
-        'third_party/boringssl/crypto/cipher/e_aes.c',
-        'third_party/boringssl/crypto/cipher/e_chacha20poly1305.c',
-        'third_party/boringssl/crypto/cipher/e_des.c',
-        'third_party/boringssl/crypto/cipher/e_null.c',
-        'third_party/boringssl/crypto/cipher/e_rc2.c',
-        'third_party/boringssl/crypto/cipher/e_rc4.c',
-        'third_party/boringssl/crypto/cipher/e_ssl3.c',
-        'third_party/boringssl/crypto/cipher/e_tls.c',
-        'third_party/boringssl/crypto/cipher/tls_cbc.c',
+        'third_party/boringssl/crypto/cipher_extra/cipher_extra.c',
+        'third_party/boringssl/crypto/cipher_extra/derive_key.c',
+        'third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c',
+        'third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c',
+        'third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c',
+        'third_party/boringssl/crypto/cipher_extra/e_null.c',
+        'third_party/boringssl/crypto/cipher_extra/e_rc2.c',
+        'third_party/boringssl/crypto/cipher_extra/e_rc4.c',
+        'third_party/boringssl/crypto/cipher_extra/e_ssl3.c',
+        'third_party/boringssl/crypto/cipher_extra/e_tls.c',
+        'third_party/boringssl/crypto/cipher_extra/tls_cbc.c',
        'third_party/boringssl/crypto/cmac/cmac.c',
        'third_party/boringssl/crypto/conf/conf.c',
        'third_party/boringssl/crypto/cpu-aarch64-linux.c',
@ -1661,29 +1636,16 @@
        'third_party/boringssl/crypto/curve25519/curve25519.c',
        'third_party/boringssl/crypto/curve25519/spake25519.c',
        'third_party/boringssl/crypto/curve25519/x25519-x86_64.c',
-        'third_party/boringssl/crypto/des/des.c',
        'third_party/boringssl/crypto/dh/check.c',
        'third_party/boringssl/crypto/dh/dh.c',
        'third_party/boringssl/crypto/dh/dh_asn1.c',
        'third_party/boringssl/crypto/dh/params.c',
-        'third_party/boringssl/crypto/digest/digest.c',
-        'third_party/boringssl/crypto/digest/digests.c',
+        'third_party/boringssl/crypto/digest_extra/digest_extra.c',
        'third_party/boringssl/crypto/dsa/dsa.c',
        'third_party/boringssl/crypto/dsa/dsa_asn1.c',
-        'third_party/boringssl/crypto/ec/ec.c',
-        'third_party/boringssl/crypto/ec/ec_asn1.c',
-        'third_party/boringssl/crypto/ec/ec_key.c',
-        'third_party/boringssl/crypto/ec/ec_montgomery.c',
-        'third_party/boringssl/crypto/ec/oct.c',
-        'third_party/boringssl/crypto/ec/p224-64.c',
-        'third_party/boringssl/crypto/ec/p256-64.c',
-        'third_party/boringssl/crypto/ec/p256-x86_64.c',
-        'third_party/boringssl/crypto/ec/simple.c',
-        'third_party/boringssl/crypto/ec/util-64.c',
-        'third_party/boringssl/crypto/ec/wnaf.c',
+        'third_party/boringssl/crypto/ec_extra/ec_asn1.c',
        'third_party/boringssl/crypto/ecdh/ecdh.c',
-        'third_party/boringssl/crypto/ecdsa/ecdsa.c',
-        'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c',
+        'third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c',
        'third_party/boringssl/crypto/engine/engine.c',
        'third_party/boringssl/crypto/err/err.c',
        'third_party/boringssl/crypto/evp/digestsign.c',
@ -1693,24 +1655,20 @@
        'third_party/boringssl/crypto/evp/p_dsa_asn1.c',
        'third_party/boringssl/crypto/evp/p_ec.c',
        'third_party/boringssl/crypto/evp/p_ec_asn1.c',
+        'third_party/boringssl/crypto/evp/p_ed25519.c',
+        'third_party/boringssl/crypto/evp/p_ed25519_asn1.c',
        'third_party/boringssl/crypto/evp/p_rsa.c',
        'third_party/boringssl/crypto/evp/p_rsa_asn1.c',
        'third_party/boringssl/crypto/evp/pbkdf.c',
        'third_party/boringssl/crypto/evp/print.c',
+        'third_party/boringssl/crypto/evp/scrypt.c',
        'third_party/boringssl/crypto/evp/sign.c',
        'third_party/boringssl/crypto/ex_data.c',
+        'third_party/boringssl/crypto/fipsmodule/bcm.c',
+        'third_party/boringssl/crypto/fipsmodule/is_fips.c',
        'third_party/boringssl/crypto/hkdf/hkdf.c',
-        'third_party/boringssl/crypto/hmac/hmac.c',
        'third_party/boringssl/crypto/lhash/lhash.c',
-        'third_party/boringssl/crypto/md4/md4.c',
-        'third_party/boringssl/crypto/md5/md5.c',
        'third_party/boringssl/crypto/mem.c',
-        'third_party/boringssl/crypto/modes/cbc.c',
-        'third_party/boringssl/crypto/modes/cfb.c',
-        'third_party/boringssl/crypto/modes/ctr.c',
-        'third_party/boringssl/crypto/modes/gcm.c',
-        'third_party/boringssl/crypto/modes/ofb.c',
-        'third_party/boringssl/crypto/modes/polyval.c',
        'third_party/boringssl/crypto/obj/obj.c',
        'third_party/boringssl/crypto/obj/obj_xref.c',
        'third_party/boringssl/crypto/pem/pem_all.c',
@ -1721,30 +1679,24 @@
        'third_party/boringssl/crypto/pem/pem_pkey.c',
        'third_party/boringssl/crypto/pem/pem_x509.c',
        'third_party/boringssl/crypto/pem/pem_xaux.c',
+        'third_party/boringssl/crypto/pkcs7/pkcs7.c',
+        'third_party/boringssl/crypto/pkcs7/pkcs7_x509.c',
        'third_party/boringssl/crypto/pkcs8/p5_pbev2.c',
-        'third_party/boringssl/crypto/pkcs8/p8_pkey.c',
        'third_party/boringssl/crypto/pkcs8/pkcs8.c',
+        'third_party/boringssl/crypto/pkcs8/pkcs8_x509.c',
        'third_party/boringssl/crypto/poly1305/poly1305.c',
        'third_party/boringssl/crypto/poly1305/poly1305_arm.c',
        'third_party/boringssl/crypto/poly1305/poly1305_vec.c',
        'third_party/boringssl/crypto/pool/pool.c',
-        'third_party/boringssl/crypto/rand/deterministic.c',
-        'third_party/boringssl/crypto/rand/fuchsia.c',
-        'third_party/boringssl/crypto/rand/rand.c',
-        'third_party/boringssl/crypto/rand/urandom.c',
-        'third_party/boringssl/crypto/rand/windows.c',
+        'third_party/boringssl/crypto/rand_extra/deterministic.c',
+        'third_party/boringssl/crypto/rand_extra/forkunsafe.c',
+        'third_party/boringssl/crypto/rand_extra/fuchsia.c',
+        'third_party/boringssl/crypto/rand_extra/rand_extra.c',
+        'third_party/boringssl/crypto/rand_extra/windows.c',
        'third_party/boringssl/crypto/rc4/rc4.c',
        'third_party/boringssl/crypto/refcount_c11.c',
        'third_party/boringssl/crypto/refcount_lock.c',
-        'third_party/boringssl/crypto/rsa/blinding.c',
-        'third_party/boringssl/crypto/rsa/padding.c',
-        'third_party/boringssl/crypto/rsa/rsa.c',
-        'third_party/boringssl/crypto/rsa/rsa_asn1.c',
-        'third_party/boringssl/crypto/rsa/rsa_impl.c',
-        'third_party/boringssl/crypto/sha/sha1-altivec.c',
-        'third_party/boringssl/crypto/sha/sha1.c',
-        'third_party/boringssl/crypto/sha/sha256.c',
-        'third_party/boringssl/crypto/sha/sha512.c',
+        'third_party/boringssl/crypto/rsa_extra/rsa_asn1.c',
        'third_party/boringssl/crypto/stack/stack.c',
        'third_party/boringssl/crypto/thread.c',
        'third_party/boringssl/crypto/thread_none.c',
@ -1759,7 +1711,6 @@
        'third_party/boringssl/crypto/x509/by_dir.c',
        'third_party/boringssl/crypto/x509/by_file.c',
        'third_party/boringssl/crypto/x509/i2d_pr.c',
-        'third_party/boringssl/crypto/x509/pkcs7.c',
        'third_party/boringssl/crypto/x509/rsa_pss.c',
        'third_party/boringssl/crypto/x509/t_crl.c',
        'third_party/boringssl/crypto/x509/t_req.c',
@ -1785,7 +1736,6 @@
        'third_party/boringssl/crypto/x509/x509name.c',
        'third_party/boringssl/crypto/x509/x509rset.c',
        'third_party/boringssl/crypto/x509/x509spki.c',
-        'third_party/boringssl/crypto/x509/x509type.c',
        'third_party/boringssl/crypto/x509/x_algor.c',
        'third_party/boringssl/crypto/x509/x_all.c',
        'third_party/boringssl/crypto/x509/x_attrib.c',
@ -1833,41 +1783,42 @@
        'third_party/boringssl/crypto/x509v3/v3_skey.c',
        'third_party/boringssl/crypto/x509v3/v3_sxnet.c',
        'third_party/boringssl/crypto/x509v3/v3_utl.c',
-        'third_party/boringssl/ssl/bio_ssl.c',
-        'third_party/boringssl/ssl/custom_extensions.c',
-        'third_party/boringssl/ssl/d1_both.c',
-        'third_party/boringssl/ssl/d1_lib.c',
-        'third_party/boringssl/ssl/d1_pkt.c',
-        'third_party/boringssl/ssl/d1_srtp.c',
-        'third_party/boringssl/ssl/dtls_method.c',
-        'third_party/boringssl/ssl/dtls_record.c',
-        'third_party/boringssl/ssl/handshake_client.c',
-        'third_party/boringssl/ssl/handshake_server.c',
-        'third_party/boringssl/ssl/s3_both.c',
-        'third_party/boringssl/ssl/s3_lib.c',
-        'third_party/boringssl/ssl/s3_pkt.c',
-        'third_party/boringssl/ssl/ssl_aead_ctx.c',
-        'third_party/boringssl/ssl/ssl_asn1.c',
-        'third_party/boringssl/ssl/ssl_buffer.c',
-        'third_party/boringssl/ssl/ssl_cert.c',
-        'third_party/boringssl/ssl/ssl_cipher.c',
-        'third_party/boringssl/ssl/ssl_ecdh.c',
-        'third_party/boringssl/ssl/ssl_file.c',
-        'third_party/boringssl/ssl/ssl_lib.c',
-        'third_party/boringssl/ssl/ssl_privkey.c',
-        'third_party/boringssl/ssl/ssl_privkey_cc.cc',
-        'third_party/boringssl/ssl/ssl_session.c',
-        'third_party/boringssl/ssl/ssl_stat.c',
-        'third_party/boringssl/ssl/ssl_transcript.c',
-        'third_party/boringssl/ssl/ssl_x509.c',
-        'third_party/boringssl/ssl/t1_enc.c',
-        'third_party/boringssl/ssl/t1_lib.c',
-        'third_party/boringssl/ssl/tls13_both.c',
-        'third_party/boringssl/ssl/tls13_client.c',
-        'third_party/boringssl/ssl/tls13_enc.c',
-        'third_party/boringssl/ssl/tls13_server.c',
-        'third_party/boringssl/ssl/tls_method.c',
-        'third_party/boringssl/ssl/tls_record.c',
+        'third_party/boringssl/ssl/bio_ssl.cc',
+        'third_party/boringssl/ssl/custom_extensions.cc',
+        'third_party/boringssl/ssl/d1_both.cc',
+        'third_party/boringssl/ssl/d1_lib.cc',
+        'third_party/boringssl/ssl/d1_pkt.cc',
+        'third_party/boringssl/ssl/d1_srtp.cc',
+        'third_party/boringssl/ssl/dtls_method.cc',
+        'third_party/boringssl/ssl/dtls_record.cc',
+        'third_party/boringssl/ssl/handshake.cc',
+        'third_party/boringssl/ssl/handshake_client.cc',
+        'third_party/boringssl/ssl/handshake_server.cc',
+        'third_party/boringssl/ssl/s3_both.cc',
+        'third_party/boringssl/ssl/s3_lib.cc',
+        'third_party/boringssl/ssl/s3_pkt.cc',
+        'third_party/boringssl/ssl/ssl_aead_ctx.cc',
+        'third_party/boringssl/ssl/ssl_asn1.cc',
+        'third_party/boringssl/ssl/ssl_buffer.cc',
+        'third_party/boringssl/ssl/ssl_cert.cc',
+        'third_party/boringssl/ssl/ssl_cipher.cc',
+        'third_party/boringssl/ssl/ssl_file.cc',
+        'third_party/boringssl/ssl/ssl_key_share.cc',
+        'third_party/boringssl/ssl/ssl_lib.cc',
+        'third_party/boringssl/ssl/ssl_privkey.cc',
+        'third_party/boringssl/ssl/ssl_session.cc',
+        'third_party/boringssl/ssl/ssl_stat.cc',
+        'third_party/boringssl/ssl/ssl_transcript.cc',
+        'third_party/boringssl/ssl/ssl_versions.cc',
+        'third_party/boringssl/ssl/ssl_x509.cc',
+        'third_party/boringssl/ssl/t1_enc.cc',
+        'third_party/boringssl/ssl/t1_lib.cc',
+        'third_party/boringssl/ssl/tls13_both.cc',
+        'third_party/boringssl/ssl/tls13_client.cc',
+        'third_party/boringssl/ssl/tls13_enc.cc',
+        'third_party/boringssl/ssl/tls13_server.cc',
+        'third_party/boringssl/ssl/tls_method.cc',
+        'third_party/boringssl/ssl/tls_record.cc',
      ],
    },
    {
@ -1882,14 +1833,14 @@
      ],
    },
    {
-      'target_name': 'boringssl_aes_test_lib',
+      'target_name': 'boringssl_crypto_test_data_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/aes/aes_test.cc',
+        'src/boringssl/crypto_test_data.cc',
      ],
    },
    {
@ -1926,25 +1877,25 @@
      ],
    },
    {
-      'target_name': 'boringssl_bn_test_lib',
+      'target_name': 'boringssl_bytestring_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/bn/bn_test.cc',
+        'third_party/boringssl/crypto/bytestring/bytestring_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_bytestring_test_lib',
+      'target_name': 'boringssl_chacha_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/bytestring/bytestring_test.cc',
+        'third_party/boringssl/crypto/chacha/chacha_test.cc',
      ],
    },
    {
@ -1955,7 +1906,7 @@
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/cipher/aead_test.cc',
+        'third_party/boringssl/crypto/cipher_extra/aead_test.cc',
      ],
    },
    {
@ -1966,7 +1917,7 @@
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/cipher/cipher_test.cc',
+        'third_party/boringssl/crypto/cipher_extra/cipher_test.cc',
      ],
    },
    {
@ -1980,6 +1931,17 @@
        'third_party/boringssl/crypto/cmac/cmac_test.cc',
      ],
    },
+    {
+      'target_name': 'boringssl_compiler_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/compiler_test.cc',
+      ],
+    },
    {
      'target_name': 'boringssl_constant_time_test_lib',
      'type': 'static_library',
@ -2025,36 +1987,36 @@
      ],
    },
    {
-      'target_name': 'boringssl_digest_test_lib',
+      'target_name': 'boringssl_dh_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/digest/digest_test.cc',
+        'third_party/boringssl/crypto/dh/dh_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_example_mul_lib',
+      'target_name': 'boringssl_digest_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/ec/example_mul.c',
+        'third_party/boringssl/crypto/digest_extra/digest_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_p256-x86_64_test_lib',
+      'target_name': 'boringssl_dsa_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/ec/p256-x86_64_test.cc',
+        'third_party/boringssl/crypto/dsa/dsa_test.cc',
      ],
    },
    {
@ -2069,69 +2031,135 @@
      ],
    },
    {
-      'target_name': 'boringssl_ecdsa_sign_test_lib',
+      'target_name': 'boringssl_err_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_sign_test.cc',
+        'third_party/boringssl/crypto/err/err_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_ecdsa_test_lib',
+      'target_name': 'boringssl_evp_extra_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_test.cc',
+        'third_party/boringssl/crypto/evp/evp_extra_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_ecdsa_verify_test_lib',
+      'target_name': 'boringssl_evp_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_verify_test.cc',
+        'third_party/boringssl/crypto/evp/evp_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_evp_extra_test_lib',
+      'target_name': 'boringssl_pbkdf_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/evp/evp_extra_test.cc',
+        'third_party/boringssl/crypto/evp/pbkdf_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_evp_test_lib',
+      'target_name': 'boringssl_scrypt_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/evp/evp_test.cc',
+        'third_party/boringssl/crypto/evp/scrypt_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_pbkdf_test_lib',
+      'target_name': 'boringssl_aes_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/evp/pbkdf_test.cc',
+        'third_party/boringssl/crypto/fipsmodule/aes/aes_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_bn_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/bn/bn_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ec_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ec/ec_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_p256-x86_64_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdsa_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_gcm_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/modes/gcm_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ctrdrbg_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg_test.cc',
      ],
    },
    {
@ -2153,7 +2181,7 @@
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/hmac/hmac_test.cc',
+        'third_party/boringssl/crypto/hmac_extra/hmac_test.cc',
      ],
    },
    {
@ -2168,25 +2196,25 @@
      ],
    },
    {
-      'target_name': 'boringssl_gcm_test_lib',
+      'target_name': 'boringssl_obj_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/modes/gcm_test.cc',
+        'third_party/boringssl/crypto/obj/obj_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_obj_test_lib',
+      'target_name': 'boringssl_pkcs7_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/obj/obj_test.cc',
+        'third_party/boringssl/crypto/pkcs7/pkcs7_test.cc',
      ],
    },
    {
@ -2245,25 +2273,47 @@
      ],
    },
    {
-      'target_name': 'boringssl_thread_test_lib',
+      'target_name': 'boringssl_rsa_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/thread_test.c',
+        'third_party/boringssl/crypto/rsa_extra/rsa_test.cc',
      ],
    },
    {
-      'target_name': 'boringssl_pkcs7_test_lib',
+      'target_name': 'boringssl_file_test_gtest_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/x509/pkcs7_test.c',
+        'third_party/boringssl/crypto/test/file_test_gtest.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_gtest_main_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/test/gtest_main.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_thread_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/thread_test.cc',
      ],
    },
    {
@ -2285,7 +2335,7 @@
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/x509v3/tab_test.c',
+        'third_party/boringssl/crypto/x509v3/tab_test.cc',
      ],
    },
    {
@ -2296,7 +2346,29 @@
        'boringssl',
      ],
      'sources': [
-        'third_party/boringssl/crypto/x509v3/v3name_test.c',
+        'third_party/boringssl/crypto/x509v3/v3name_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_span_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/ssl/span_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ssl_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/ssl/ssl_test.cc',
      ],
    },
    {
--- a/package.xml
+++ b/package.xml
@ -661,31 +661,35 @@
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_utils.cc" role="src" />
    <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/aes/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/asn1_locl.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/rsaz_exp.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bytestring/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/conf/conf_def.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/conf/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/des/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/digest/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/digest/md32_common.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/p256-x86_64-table.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/p256-x86_64.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/err/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/aes/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/delocate.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/des/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/md32_common.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rand/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/obj/obj_dat.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs7/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs8/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/poly1305/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pool/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/charmap.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/vpm_int.h" role="src" />
@ -728,6 +732,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ex_data.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/hkdf.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/hmac.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/is_boringssl.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/lhash.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/lhash_macros.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/md4.h" role="src" />
@ -752,11 +757,11 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/rsa.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/safestack.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/sha.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/span.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/srtp.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ssl.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ssl3.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/stack.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/stack_macros.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/thread.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/tls1.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/type_check.h" role="src" />
@ -765,9 +770,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/x509v3.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/ssl/internal.h" role="src" />
    <file baseinstalldir="/" name="src/boringssl/err_data.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/aes/aes.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/aes/key_wrap.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/aes/mode_wrappers.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/a_bitstr.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/a_bool.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/a_d2i_fp.c" role="src" />
@ -791,7 +793,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/f_enum.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/f_int.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/f_string.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/t_bitst.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/tasn_dec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/tasn_enc.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/tasn_fre.c" role="src" />
@ -799,8 +800,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/tasn_typ.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/tasn_utl.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/time_support.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/x_bignum.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/x_long.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/base64/base64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/bio.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/bio_mem.c" role="src" />
@ -812,44 +811,25 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/printf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/socket.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bio/socket_helper.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/add.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/asm/x86_64-gcc.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/bn.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/bn_asn1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/cmp.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/convert.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/ctx.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/div.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/exponentiation.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/gcd.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/generic.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/kronecker.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/montgomery.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/montgomery_inv.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/mul.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/prime.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/random.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/rsaz_exp.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/shift.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn/sqrt.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn_extra/bn_asn1.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/bn_extra/convert.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/buf/buf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bytestring/asn1_compat.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bytestring/ber.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bytestring/cbb.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/bytestring/cbs.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/chacha/chacha.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/aead.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/cipher.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/derive_key.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_aes.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_chacha20poly1305.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_des.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_null.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_rc2.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_rc4.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_ssl3.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/e_tls.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher/tls_cbc.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/cipher_extra.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/derive_key.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_null.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_rc2.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_rc4.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_ssl3.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/e_tls.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/tls_cbc.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/cmac/cmac.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/conf/conf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/cpu-aarch64-linux.c" role="src" />
@ -861,29 +841,16 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/curve25519.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/spake25519.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/x25519-x86_64.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/des/des.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dh/check.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dh/dh.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dh/dh_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dh/params.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/digest/digest.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/digest/digests.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/digest_extra/digest_extra.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dsa/dsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dsa/dsa_asn1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/ec.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/ec_asn1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/ec_key.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/ec_montgomery.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/oct.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/p224-64.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/p256-64.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/p256-x86_64.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/simple.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/util-64.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec/wnaf.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/ec_extra/ec_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/ecdh/ecdh.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ecdsa/ecdsa.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/engine/engine.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/err/err.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/digestsign.c" role="src" />
@ -893,24 +860,20 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_dsa_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_ec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_ec_asn1.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_ed25519.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_ed25519_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_rsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_rsa_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/pbkdf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/print.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/scrypt.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/sign.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/ex_data.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bcm.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/is_fips.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/hkdf/hkdf.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/hmac/hmac.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/lhash/lhash.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/md4/md4.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/md5/md5.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/mem.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/cbc.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/cfb.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/ctr.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/gcm.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/ofb.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/modes/polyval.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/obj/obj.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/obj/obj_xref.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pem/pem_all.c" role="src" />
@ -921,30 +884,24 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pem/pem_pkey.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pem/pem_x509.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pem/pem_xaux.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs7/pkcs7.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs7/pkcs7_x509.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs8/p5_pbev2.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs8/p8_pkey.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs8/pkcs8.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs8/pkcs8_x509.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/poly1305/poly1305.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/poly1305/poly1305_arm.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/poly1305/poly1305_vec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pool/pool.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/deterministic.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/fuchsia.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/rand.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/urandom.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand/windows.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand_extra/deterministic.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand_extra/forkunsafe.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand_extra/fuchsia.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand_extra/rand_extra.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rand_extra/windows.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/rc4/rc4.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/refcount_c11.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/refcount_lock.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/blinding.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/padding.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/rsa.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/rsa_asn1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa/rsa_impl.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/sha/sha1-altivec.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/sha/sha1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/sha/sha256.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/sha/sha512.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa_extra/rsa_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/stack/stack.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/thread.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/thread_none.c" role="src" />
@ -959,7 +916,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/by_dir.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/by_file.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/i2d_pr.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/pkcs7.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/rsa_pss.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/t_crl.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/t_req.c" role="src" />
@ -985,7 +941,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x509name.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x509rset.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x509spki.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x509type.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x_algor.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x_all.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509/x_attrib.c" role="src" />
@ -1033,41 +988,42 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_skey.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_sxnet.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_utl.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/bio_ssl.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/custom_extensions.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_both.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_lib.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_pkt.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_srtp.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/dtls_method.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/dtls_record.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/handshake_client.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/handshake_server.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_both.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_lib.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_pkt.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_aead_ctx.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_asn1.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_buffer.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_cert.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_cipher.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_ecdh.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_file.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_lib.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_privkey.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_privkey_cc.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_session.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_stat.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_transcript.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_x509.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/t1_enc.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/t1_lib.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_both.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_client.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_enc.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_server.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_method.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_record.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/bio_ssl.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/custom_extensions.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_both.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_lib.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_pkt.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/d1_srtp.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/dtls_method.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/dtls_record.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/handshake.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/handshake_client.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/handshake_server.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_both.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_lib.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/s3_pkt.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_aead_ctx.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_asn1.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_buffer.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_cert.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_cipher.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_file.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_key_share.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_lib.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_privkey.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_session.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_stat.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_transcript.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_versions.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/ssl_x509.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/t1_enc.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/t1_lib.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_both.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_client.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_enc.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_server.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_method.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_record.cc" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/crc32.h" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/deflate.h" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/gzguts.h" role="src" />
--- a/setup.py
+++ b/setup.py
@ -165,7 +165,8 @@ if "win32" in sys.platform:
  # TODO(zyc): Re-enble c-ares on x64 and x86 windows after fixing the
  # ares_library_init compilation issue
  DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1), ('CARES_STATICLIB', 1),
-                    ('GRPC_ARES', 0), ('NTDDI_VERSION', 0x06000000),)
+                    ('GRPC_ARES', 0), ('NTDDI_VERSION', 0x06000000),
+                    ('NOMINMAX', 1),)
  if '64bit' in platform.architecture()[0]:
    DEFINE_MACROS += (('MS_WIN64', 1),)
  elif sys.version_info >= (3, 5):
--- a/src/boringssl/crypto_test_data.cc
+++ b/src/boringssl/crypto_test_data.cc
--- a/src/boringssl/err_data.c
+++ b/src/boringssl/err_data.c
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@ -48,6 +48,7 @@ class Grpc(object):
  yaml = None

  def WriteFiles(self, files, asm_outputs):
+
    self.yaml = {
      '#': 'generated with tools/buildgen/gen_boring_ssl_build_yaml.py',
      'raw_boringssl_build_output_for_debugging': {
@ -98,41 +99,7 @@ class Grpc(object):
                'boringssl',
            ]
          }
-          for test in sorted(files['test'])
-      ],
-      'targets': [
-          {
-            'name': 'boringssl_%s' % os.path.splitext(os.path.basename(test))[0],
-            'build': 'test',
-            'run': False,
-            'secure': 'no',
-            'language': 'c++',
-            'src': [],
-            'vs_proj_dir': 'test/boringssl',
-            'boringssl': True,
-            'defaults': 'boringssl',
-            'deps': [
-                'boringssl_%s_lib' % os.path.splitext(os.path.basename(test))[0],
-                'boringssl_test_util',
-                'boringssl',
-            ]
-          }
-          for test in sorted(files['test'])
-      ],
-      'tests': [
-          {
-            'name': 'boringssl_%s' % os.path.basename(test[0]),
-            'args': [map_testarg(arg) for arg in test[1:]],
-            'exclude_configs': ['asan', 'ubsan'],
-            'ci_platforms': ['linux', 'mac', 'posix', 'windows'],
-            'platforms': ['linux', 'mac', 'posix', 'windows'],
-            'flaky': False,
-            'language': 'c++',
-            'boringssl': True,
-            'defaults': 'boringssl',
-            'cpu_cost': 1.0
-          }
-          for test in files['tests']
+          for test in list(sorted(set(files['ssl_test'] + files['crypto_test'])))
      ]
    }

--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
@ -505,7 +505,7 @@ static void on_dns_lookup_done_cb(void* arg, grpc_error* error) {
    }
  }
  GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error));
-  grpc_lb_addresses_destroy(r->lb_addrs);
+  if (r->lb_addrs != nullptr) grpc_lb_addresses_destroy(r->lb_addrs);
  gpr_free(r);
 }

--- a/src/core/lib/iomgr/ev_epollex_linux.cc
+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
@ -561,6 +561,7 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) {
  }
  if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr &&
      pollset->containing_pollset_set_count == 0) {
+    GPR_TIMER_MARK("pollset_finish_shutdown", 0);
    GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE);
    pollset->shutdown_closure = nullptr;
    pollset->already_shutdown = true;
@ -571,6 +572,7 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) {
 * pollset->active_pollable->mu & specific_worker->pollable_obj->mu must not be
 * held */
 static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) {
+  GPR_TIMER_SCOPE("kick_one_worker", 0);
  pollable* p = specific_worker->pollable_obj;
  grpc_core::mu_guard lock(&p->mu);
  GPR_ASSERT(specific_worker != nullptr);
@ -614,6 +616,7 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) {

 static grpc_error* pollset_kick(grpc_pollset* pollset,
                                grpc_pollset_worker* specific_worker) {
+  GPR_TIMER_SCOPE("pollset_kick", 0);
  GRPC_STATS_INC_POLLSET_KICK();
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG,
@ -663,6 +666,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset,
 }

 static grpc_error* pollset_kick_all(grpc_pollset* pollset) {
+  GPR_TIMER_SCOPE("pollset_kick_all", 0);
  grpc_error* error = GRPC_ERROR_NONE;
  const char* err_desc = "pollset_kick_all";
  grpc_pollset_worker* w = pollset->root_worker;
@ -740,6 +744,7 @@ static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) {

 /* pollset->po.mu lock must be held by the caller before calling this */
 static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) {
+  GPR_TIMER_SCOPE("pollset_shutdown", 0);
  GPR_ASSERT(pollset->shutdown_closure == nullptr);
  pollset->shutdown_closure = closure;
  GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset));
@ -748,6 +753,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) {

 static grpc_error* pollable_process_events(grpc_pollset* pollset,
                                           pollable* pollable_obj, bool drain) {
+  GPR_TIMER_SCOPE("pollable_process_events", 0);
  static const char* err_desc = "pollset_process_events";
  grpc_error* error = GRPC_ERROR_NONE;
  for (int i = 0; (drain || i < MAX_EPOLL_EVENTS_HANDLED_EACH_POLL_CALL) &&
@ -794,6 +800,7 @@ static void pollset_destroy(grpc_pollset* pollset) {
 }

 static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) {
+  GPR_TIMER_SCOPE("pollable_epoll", 0);
  int timeout = poll_deadline_to_millis_timeout(deadline);

  if (grpc_polling_trace.enabled()) {
@ -869,6 +876,7 @@ static worker_remove_result worker_remove(grpc_pollset_worker** root_worker,
 static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
                         grpc_pollset_worker** worker_hdl,
                         grpc_millis deadline) {
+  GPR_TIMER_SCOPE("begin_worker", 0);
  bool do_poll =
      (pollset->shutdown_closure == nullptr && !pollset->already_shutdown);
  if (worker_hdl != nullptr) *worker_hdl = worker;
@ -921,6 +929,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,

 static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
                       grpc_pollset_worker** worker_hdl) {
+  GPR_TIMER_SCOPE("end_worker", 0);
  gpr_mu_lock(&pollset->mu);
  gpr_mu_lock(&worker->pollable_obj->mu);
  switch (worker_remove(&worker->pollable_obj->root_worker, worker,
@ -963,6 +972,7 @@ static long gettid(void) { return syscall(__NR_gettid); }
 static grpc_error* pollset_work(grpc_pollset* pollset,
                                grpc_pollset_worker** worker_hdl,
                                grpc_millis deadline) {
+  GPR_TIMER_SCOPE("pollset_work", 0);
 #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP
  grpc_pollset_worker* worker =
      (grpc_pollset_worker*)gpr_malloc(sizeof(*worker));
@ -1100,6 +1110,16 @@ static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset,
    case PO_EMPTY:
      POLLABLE_UNREF(pollset->active_pollable, "pollset");
      error = pollable_create(PO_MULTI, &pollset->active_pollable);
+      /* Any workers currently polling on this pollset must now be woked up so
+       * that they can pick up the new active_pollable */
+      if (grpc_polling_trace.enabled()) {
+        gpr_log(GPR_DEBUG,
+                "PS:%p active pollable transition from empty to multi",
+                pollset);
+      }
+      static const char* err_desc =
+          "pollset_as_multipollable_locked: empty -> multi";
+      append_error(&error, pollset_kick_all(pollset), err_desc);
      break;
    case PO_FD:
      gpr_mu_lock(&po_at_start->owner_fd->orphan_mu);
@ -1128,6 +1148,7 @@ static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset,
 }

 static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) {
+  GPR_TIMER_SCOPE("pollset_add_fd", 0);
  gpr_mu_lock(&pollset->mu);
  grpc_error* error = pollset_add_fd_locked(pollset, fd);
  gpr_mu_unlock(&pollset->mu);
@ -1176,6 +1197,7 @@ static void pollset_set_unref(grpc_pollset_set* pss) {
 }

 static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) {
+  GPR_TIMER_SCOPE("pollset_set_add_fd", 0);
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG, "PSS:%p: add fd %p (%d)", pss, fd, fd->fd);
  }
@ -1199,6 +1221,7 @@ static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) {
 }

 static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) {
+  GPR_TIMER_SCOPE("pollset_set_del_fd", 0);
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG, "PSS:%p: del fd %p", pss, fd);
  }
@ -1219,6 +1242,7 @@ static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) {
 }

 static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {
+  GPR_TIMER_SCOPE("pollset_set_del_pollset", 0);
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG, "PSS:%p: del pollset %p", pss, ps);
  }
@ -1249,6 +1273,7 @@ static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count,
                                       size_t pollset_count,
                                       const char* err_desc, grpc_fd** out_fds,
                                       size_t* out_fd_count) {
+  GPR_TIMER_SCOPE("add_fds_to_pollsets", 0);
  grpc_error* error = GRPC_ERROR_NONE;
  for (size_t i = 0; i < fd_count; i++) {
    gpr_mu_lock(&fds[i]->orphan_mu);
@ -1269,6 +1294,7 @@ static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count,
 }

 static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {
+  GPR_TIMER_SCOPE("pollset_set_add_pollset", 0);
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG, "PSS:%p: add pollset %p", pss, ps);
  }
@ -1305,6 +1331,7 @@ static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {

 static void pollset_set_add_pollset_set(grpc_pollset_set* a,
                                        grpc_pollset_set* b) {
+  GPR_TIMER_SCOPE("pollset_set_add_pollset_set", 0);
  if (grpc_polling_trace.enabled()) {
    gpr_log(GPR_DEBUG, "PSS: merge (%p, %p)", a, b);
  }
--- a/src/core/lib/iomgr/tcp_posix.cc
+++ b/src/core/lib/iomgr/tcp_posix.cc
@ -130,7 +130,7 @@ static void run_poller(void* bp, grpc_error* error_ignored) {
    gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p);
  }
  gpr_mu_lock(p->pollset_mu);
-  grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC;
+  grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC;
  GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS();
  GRPC_LOG_IF_ERROR(
      "backup_poller:pollset_work",
--- a/src/objective-c/BoringSSL.podspec
+++ b/src/objective-c/BoringSSL.podspec
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -313,9 +313,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/filters/workarounds/workaround_utils.cc',
    'src/core/plugin_registry/grpc_plugin_registry.cc',
    'src/boringssl/err_data.c',
-    'third_party/boringssl/crypto/aes/aes.c',
-    'third_party/boringssl/crypto/aes/key_wrap.c',
-    'third_party/boringssl/crypto/aes/mode_wrappers.c',
    'third_party/boringssl/crypto/asn1/a_bitstr.c',
    'third_party/boringssl/crypto/asn1/a_bool.c',
    'third_party/boringssl/crypto/asn1/a_d2i_fp.c',
@ -339,7 +336,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/asn1/f_enum.c',
    'third_party/boringssl/crypto/asn1/f_int.c',
    'third_party/boringssl/crypto/asn1/f_string.c',
-    'third_party/boringssl/crypto/asn1/t_bitst.c',
    'third_party/boringssl/crypto/asn1/tasn_dec.c',
    'third_party/boringssl/crypto/asn1/tasn_enc.c',
    'third_party/boringssl/crypto/asn1/tasn_fre.c',
@ -347,8 +343,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/asn1/tasn_typ.c',
    'third_party/boringssl/crypto/asn1/tasn_utl.c',
    'third_party/boringssl/crypto/asn1/time_support.c',
-    'third_party/boringssl/crypto/asn1/x_bignum.c',
-    'third_party/boringssl/crypto/asn1/x_long.c',
    'third_party/boringssl/crypto/base64/base64.c',
    'third_party/boringssl/crypto/bio/bio.c',
    'third_party/boringssl/crypto/bio/bio_mem.c',
@ -360,44 +354,25 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/bio/printf.c',
    'third_party/boringssl/crypto/bio/socket.c',
    'third_party/boringssl/crypto/bio/socket_helper.c',
-    'third_party/boringssl/crypto/bn/add.c',
-    'third_party/boringssl/crypto/bn/asm/x86_64-gcc.c',
-    'third_party/boringssl/crypto/bn/bn.c',
-    'third_party/boringssl/crypto/bn/bn_asn1.c',
-    'third_party/boringssl/crypto/bn/cmp.c',
-    'third_party/boringssl/crypto/bn/convert.c',
-    'third_party/boringssl/crypto/bn/ctx.c',
-    'third_party/boringssl/crypto/bn/div.c',
-    'third_party/boringssl/crypto/bn/exponentiation.c',
-    'third_party/boringssl/crypto/bn/gcd.c',
-    'third_party/boringssl/crypto/bn/generic.c',
-    'third_party/boringssl/crypto/bn/kronecker.c',
-    'third_party/boringssl/crypto/bn/montgomery.c',
-    'third_party/boringssl/crypto/bn/montgomery_inv.c',
-    'third_party/boringssl/crypto/bn/mul.c',
-    'third_party/boringssl/crypto/bn/prime.c',
-    'third_party/boringssl/crypto/bn/random.c',
-    'third_party/boringssl/crypto/bn/rsaz_exp.c',
-    'third_party/boringssl/crypto/bn/shift.c',
-    'third_party/boringssl/crypto/bn/sqrt.c',
+    'third_party/boringssl/crypto/bn_extra/bn_asn1.c',
+    'third_party/boringssl/crypto/bn_extra/convert.c',
    'third_party/boringssl/crypto/buf/buf.c',
    'third_party/boringssl/crypto/bytestring/asn1_compat.c',
    'third_party/boringssl/crypto/bytestring/ber.c',
    'third_party/boringssl/crypto/bytestring/cbb.c',
    'third_party/boringssl/crypto/bytestring/cbs.c',
    'third_party/boringssl/crypto/chacha/chacha.c',
-    'third_party/boringssl/crypto/cipher/aead.c',
-    'third_party/boringssl/crypto/cipher/cipher.c',
-    'third_party/boringssl/crypto/cipher/derive_key.c',
-    'third_party/boringssl/crypto/cipher/e_aes.c',
-    'third_party/boringssl/crypto/cipher/e_chacha20poly1305.c',
-    'third_party/boringssl/crypto/cipher/e_des.c',
-    'third_party/boringssl/crypto/cipher/e_null.c',
-    'third_party/boringssl/crypto/cipher/e_rc2.c',
-    'third_party/boringssl/crypto/cipher/e_rc4.c',
-    'third_party/boringssl/crypto/cipher/e_ssl3.c',
-    'third_party/boringssl/crypto/cipher/e_tls.c',
-    'third_party/boringssl/crypto/cipher/tls_cbc.c',
+    'third_party/boringssl/crypto/cipher_extra/cipher_extra.c',
+    'third_party/boringssl/crypto/cipher_extra/derive_key.c',
+    'third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c',
+    'third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c',
+    'third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c',
+    'third_party/boringssl/crypto/cipher_extra/e_null.c',
+    'third_party/boringssl/crypto/cipher_extra/e_rc2.c',
+    'third_party/boringssl/crypto/cipher_extra/e_rc4.c',
+    'third_party/boringssl/crypto/cipher_extra/e_ssl3.c',
+    'third_party/boringssl/crypto/cipher_extra/e_tls.c',
+    'third_party/boringssl/crypto/cipher_extra/tls_cbc.c',
    'third_party/boringssl/crypto/cmac/cmac.c',
    'third_party/boringssl/crypto/conf/conf.c',
    'third_party/boringssl/crypto/cpu-aarch64-linux.c',
@ -409,29 +384,16 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/curve25519/curve25519.c',
    'third_party/boringssl/crypto/curve25519/spake25519.c',
    'third_party/boringssl/crypto/curve25519/x25519-x86_64.c',
-    'third_party/boringssl/crypto/des/des.c',
    'third_party/boringssl/crypto/dh/check.c',
    'third_party/boringssl/crypto/dh/dh.c',
    'third_party/boringssl/crypto/dh/dh_asn1.c',
    'third_party/boringssl/crypto/dh/params.c',
-    'third_party/boringssl/crypto/digest/digest.c',
-    'third_party/boringssl/crypto/digest/digests.c',
+    'third_party/boringssl/crypto/digest_extra/digest_extra.c',
    'third_party/boringssl/crypto/dsa/dsa.c',
    'third_party/boringssl/crypto/dsa/dsa_asn1.c',
-    'third_party/boringssl/crypto/ec/ec.c',
-    'third_party/boringssl/crypto/ec/ec_asn1.c',
-    'third_party/boringssl/crypto/ec/ec_key.c',
-    'third_party/boringssl/crypto/ec/ec_montgomery.c',
-    'third_party/boringssl/crypto/ec/oct.c',
-    'third_party/boringssl/crypto/ec/p224-64.c',
-    'third_party/boringssl/crypto/ec/p256-64.c',
-    'third_party/boringssl/crypto/ec/p256-x86_64.c',
-    'third_party/boringssl/crypto/ec/simple.c',
-    'third_party/boringssl/crypto/ec/util-64.c',
-    'third_party/boringssl/crypto/ec/wnaf.c',
+    'third_party/boringssl/crypto/ec_extra/ec_asn1.c',
    'third_party/boringssl/crypto/ecdh/ecdh.c',
-    'third_party/boringssl/crypto/ecdsa/ecdsa.c',
-    'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c',
+    'third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c',
    'third_party/boringssl/crypto/engine/engine.c',
    'third_party/boringssl/crypto/err/err.c',
    'third_party/boringssl/crypto/evp/digestsign.c',
@ -441,24 +403,20 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/evp/p_dsa_asn1.c',
    'third_party/boringssl/crypto/evp/p_ec.c',
    'third_party/boringssl/crypto/evp/p_ec_asn1.c',
+    'third_party/boringssl/crypto/evp/p_ed25519.c',
+    'third_party/boringssl/crypto/evp/p_ed25519_asn1.c',
    'third_party/boringssl/crypto/evp/p_rsa.c',
    'third_party/boringssl/crypto/evp/p_rsa_asn1.c',
    'third_party/boringssl/crypto/evp/pbkdf.c',
    'third_party/boringssl/crypto/evp/print.c',
+    'third_party/boringssl/crypto/evp/scrypt.c',
    'third_party/boringssl/crypto/evp/sign.c',
    'third_party/boringssl/crypto/ex_data.c',
+    'third_party/boringssl/crypto/fipsmodule/bcm.c',
+    'third_party/boringssl/crypto/fipsmodule/is_fips.c',
    'third_party/boringssl/crypto/hkdf/hkdf.c',
-    'third_party/boringssl/crypto/hmac/hmac.c',
    'third_party/boringssl/crypto/lhash/lhash.c',
-    'third_party/boringssl/crypto/md4/md4.c',
-    'third_party/boringssl/crypto/md5/md5.c',
    'third_party/boringssl/crypto/mem.c',
-    'third_party/boringssl/crypto/modes/cbc.c',
-    'third_party/boringssl/crypto/modes/cfb.c',
-    'third_party/boringssl/crypto/modes/ctr.c',
-    'third_party/boringssl/crypto/modes/gcm.c',
-    'third_party/boringssl/crypto/modes/ofb.c',
-    'third_party/boringssl/crypto/modes/polyval.c',
    'third_party/boringssl/crypto/obj/obj.c',
    'third_party/boringssl/crypto/obj/obj_xref.c',
    'third_party/boringssl/crypto/pem/pem_all.c',
@ -469,30 +427,24 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/pem/pem_pkey.c',
    'third_party/boringssl/crypto/pem/pem_x509.c',
    'third_party/boringssl/crypto/pem/pem_xaux.c',
+    'third_party/boringssl/crypto/pkcs7/pkcs7.c',
+    'third_party/boringssl/crypto/pkcs7/pkcs7_x509.c',
    'third_party/boringssl/crypto/pkcs8/p5_pbev2.c',
-    'third_party/boringssl/crypto/pkcs8/p8_pkey.c',
    'third_party/boringssl/crypto/pkcs8/pkcs8.c',
+    'third_party/boringssl/crypto/pkcs8/pkcs8_x509.c',
    'third_party/boringssl/crypto/poly1305/poly1305.c',
    'third_party/boringssl/crypto/poly1305/poly1305_arm.c',
    'third_party/boringssl/crypto/poly1305/poly1305_vec.c',
    'third_party/boringssl/crypto/pool/pool.c',
-    'third_party/boringssl/crypto/rand/deterministic.c',
-    'third_party/boringssl/crypto/rand/fuchsia.c',
-    'third_party/boringssl/crypto/rand/rand.c',
-    'third_party/boringssl/crypto/rand/urandom.c',
-    'third_party/boringssl/crypto/rand/windows.c',
+    'third_party/boringssl/crypto/rand_extra/deterministic.c',
+    'third_party/boringssl/crypto/rand_extra/forkunsafe.c',
+    'third_party/boringssl/crypto/rand_extra/fuchsia.c',
+    'third_party/boringssl/crypto/rand_extra/rand_extra.c',
+    'third_party/boringssl/crypto/rand_extra/windows.c',
    'third_party/boringssl/crypto/rc4/rc4.c',
    'third_party/boringssl/crypto/refcount_c11.c',
    'third_party/boringssl/crypto/refcount_lock.c',
-    'third_party/boringssl/crypto/rsa/blinding.c',
-    'third_party/boringssl/crypto/rsa/padding.c',
-    'third_party/boringssl/crypto/rsa/rsa.c',
-    'third_party/boringssl/crypto/rsa/rsa_asn1.c',
-    'third_party/boringssl/crypto/rsa/rsa_impl.c',
-    'third_party/boringssl/crypto/sha/sha1-altivec.c',
-    'third_party/boringssl/crypto/sha/sha1.c',
-    'third_party/boringssl/crypto/sha/sha256.c',
-    'third_party/boringssl/crypto/sha/sha512.c',
+    'third_party/boringssl/crypto/rsa_extra/rsa_asn1.c',
    'third_party/boringssl/crypto/stack/stack.c',
    'third_party/boringssl/crypto/thread.c',
    'third_party/boringssl/crypto/thread_none.c',
@ -507,7 +459,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/x509/by_dir.c',
    'third_party/boringssl/crypto/x509/by_file.c',
    'third_party/boringssl/crypto/x509/i2d_pr.c',
-    'third_party/boringssl/crypto/x509/pkcs7.c',
    'third_party/boringssl/crypto/x509/rsa_pss.c',
    'third_party/boringssl/crypto/x509/t_crl.c',
    'third_party/boringssl/crypto/x509/t_req.c',
@ -533,7 +484,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/x509/x509name.c',
    'third_party/boringssl/crypto/x509/x509rset.c',
    'third_party/boringssl/crypto/x509/x509spki.c',
-    'third_party/boringssl/crypto/x509/x509type.c',
    'third_party/boringssl/crypto/x509/x_algor.c',
    'third_party/boringssl/crypto/x509/x_all.c',
    'third_party/boringssl/crypto/x509/x_attrib.c',
@ -581,41 +531,42 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/x509v3/v3_skey.c',
    'third_party/boringssl/crypto/x509v3/v3_sxnet.c',
    'third_party/boringssl/crypto/x509v3/v3_utl.c',
-    'third_party/boringssl/ssl/bio_ssl.c',
-    'third_party/boringssl/ssl/custom_extensions.c',
-    'third_party/boringssl/ssl/d1_both.c',
-    'third_party/boringssl/ssl/d1_lib.c',
-    'third_party/boringssl/ssl/d1_pkt.c',
-    'third_party/boringssl/ssl/d1_srtp.c',
-    'third_party/boringssl/ssl/dtls_method.c',
-    'third_party/boringssl/ssl/dtls_record.c',
-    'third_party/boringssl/ssl/handshake_client.c',
-    'third_party/boringssl/ssl/handshake_server.c',
-    'third_party/boringssl/ssl/s3_both.c',
-    'third_party/boringssl/ssl/s3_lib.c',
-    'third_party/boringssl/ssl/s3_pkt.c',
-    'third_party/boringssl/ssl/ssl_aead_ctx.c',
-    'third_party/boringssl/ssl/ssl_asn1.c',
-    'third_party/boringssl/ssl/ssl_buffer.c',
-    'third_party/boringssl/ssl/ssl_cert.c',
-    'third_party/boringssl/ssl/ssl_cipher.c',
-    'third_party/boringssl/ssl/ssl_ecdh.c',
-    'third_party/boringssl/ssl/ssl_file.c',
-    'third_party/boringssl/ssl/ssl_lib.c',
-    'third_party/boringssl/ssl/ssl_privkey.c',
-    'third_party/boringssl/ssl/ssl_privkey_cc.cc',
-    'third_party/boringssl/ssl/ssl_session.c',
-    'third_party/boringssl/ssl/ssl_stat.c',
-    'third_party/boringssl/ssl/ssl_transcript.c',
-    'third_party/boringssl/ssl/ssl_x509.c',
-    'third_party/boringssl/ssl/t1_enc.c',
-    'third_party/boringssl/ssl/t1_lib.c',
-    'third_party/boringssl/ssl/tls13_both.c',
-    'third_party/boringssl/ssl/tls13_client.c',
-    'third_party/boringssl/ssl/tls13_enc.c',
-    'third_party/boringssl/ssl/tls13_server.c',
-    'third_party/boringssl/ssl/tls_method.c',
-    'third_party/boringssl/ssl/tls_record.c',
+    'third_party/boringssl/ssl/bio_ssl.cc',
+    'third_party/boringssl/ssl/custom_extensions.cc',
+    'third_party/boringssl/ssl/d1_both.cc',
+    'third_party/boringssl/ssl/d1_lib.cc',
+    'third_party/boringssl/ssl/d1_pkt.cc',
+    'third_party/boringssl/ssl/d1_srtp.cc',
+    'third_party/boringssl/ssl/dtls_method.cc',
+    'third_party/boringssl/ssl/dtls_record.cc',
+    'third_party/boringssl/ssl/handshake.cc',
+    'third_party/boringssl/ssl/handshake_client.cc',
+    'third_party/boringssl/ssl/handshake_server.cc',
+    'third_party/boringssl/ssl/s3_both.cc',
+    'third_party/boringssl/ssl/s3_lib.cc',
+    'third_party/boringssl/ssl/s3_pkt.cc',
+    'third_party/boringssl/ssl/ssl_aead_ctx.cc',
+    'third_party/boringssl/ssl/ssl_asn1.cc',
+    'third_party/boringssl/ssl/ssl_buffer.cc',
+    'third_party/boringssl/ssl/ssl_cert.cc',
+    'third_party/boringssl/ssl/ssl_cipher.cc',
+    'third_party/boringssl/ssl/ssl_file.cc',
+    'third_party/boringssl/ssl/ssl_key_share.cc',
+    'third_party/boringssl/ssl/ssl_lib.cc',
+    'third_party/boringssl/ssl/ssl_privkey.cc',
+    'third_party/boringssl/ssl/ssl_session.cc',
+    'third_party/boringssl/ssl/ssl_stat.cc',
+    'third_party/boringssl/ssl/ssl_transcript.cc',
+    'third_party/boringssl/ssl/ssl_versions.cc',
+    'third_party/boringssl/ssl/ssl_x509.cc',
+    'third_party/boringssl/ssl/t1_enc.cc',
+    'third_party/boringssl/ssl/t1_lib.cc',
+    'third_party/boringssl/ssl/tls13_both.cc',
+    'third_party/boringssl/ssl/tls13_client.cc',
+    'third_party/boringssl/ssl/tls13_enc.cc',
+    'third_party/boringssl/ssl/tls13_server.cc',
+    'third_party/boringssl/ssl/tls_method.cc',
+    'third_party/boringssl/ssl/tls_record.cc',
    'third_party/zlib/adler32.c',
    'third_party/zlib/compress.c',
    'third_party/zlib/crc32.c',
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -166,7 +166,7 @@
      ss.header_mappings_dir = '.'
      ss.libraries = 'z'
      ss.dependency "#{s.name}/Interface", version
-      ss.dependency 'BoringSSL', '~> 9.0'
+      ss.dependency 'BoringSSL', '~> 10.0'
      ss.dependency 'nanopb', '~> 0.3'

      # To save you from scrolling, this is the last part of the podspec.
--- a/test/core/bad_client/bad_client.cc
+++ b/test/core/bad_client/bad_client.cc
@ -34,25 +34,32 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/lib/surface/server.h"
+#include "test/core/end2end/cq_verifier.h"

+#define MIN_HTTP2_FRAME_SIZE 9
+
+/* Args to provide to thread running server side validator */
 typedef struct {
  grpc_server* server;
  grpc_completion_queue* cq;
  grpc_bad_client_server_side_validator validator;
  void* registered_method;
  gpr_event done_thd;
-  gpr_event done_write;
 } thd_args;

+/* Run the server side validator and set done_thd once done */
 static void thd_func(void* arg) {
  thd_args* a = (thd_args*)arg;
-  a->validator(a->server, a->cq, a->registered_method);
+  if (a->validator != nullptr) {
+    a->validator(a->server, a->cq, a->registered_method);
+  }
  gpr_event_set(&a->done_thd, (void*)1);
 }

-static void done_write(void* arg, grpc_error* error) {
-  thd_args* a = (thd_args*)arg;
-  gpr_event_set(&a->done_write, (void*)1);
+/* Sets the done_write event */
+static void set_done_write(void* arg, grpc_error* error) {
+  gpr_event* done_write = (gpr_event*)arg;
+  gpr_event_set(done_write, (void*)1);
 }

 static void server_setup_transport(void* ts, grpc_transport* transport) {
@ -62,136 +69,172 @@ static void server_setup_transport(void* ts, grpc_transport* transport) {
                              grpc_server_get_channel_args(a->server));
 }

-static void read_done(void* arg, grpc_error* error) {
+/* Sets the read_done event */
+static void set_read_done(void* arg, grpc_error* error) {
  gpr_event* read_done = (gpr_event*)arg;
  gpr_event_set(read_done, (void*)1);
 }

-void grpc_run_bad_client_test(
-    grpc_bad_client_server_side_validator server_validator,
-    grpc_bad_client_client_stream_validator client_validator,
-    const char* client_payload, size_t client_payload_length, uint32_t flags) {
-  grpc_endpoint_pair sfd;
-  thd_args a;
-  gpr_thd_id id;
-  char* hex;
-  grpc_transport* transport;
-  grpc_slice slice =
-      grpc_slice_from_copied_buffer(client_payload, client_payload_length);
-  grpc_slice_buffer outgoing;
-  grpc_closure done_write_closure;
-  grpc_core::ExecCtx exec_ctx;
-  grpc_completion_queue* shutdown_cq;
+/* shutdown client */
+static void shutdown_client(grpc_endpoint** client_fd) {
+  if (*client_fd != nullptr) {
+    grpc_endpoint_shutdown(
+        *client_fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect"));
+    grpc_endpoint_destroy(*client_fd);
+    grpc_core::ExecCtx::Get()->Flush();
+    *client_fd = nullptr;
+  }
+}

-  if (client_payload_length < 4 * 1024) {
-    hex = gpr_dump(client_payload, client_payload_length,
+/* Runs client side validator */
+void grpc_run_client_side_validator(grpc_bad_client_arg* arg, uint32_t flags,
+                                    grpc_endpoint_pair* sfd,
+                                    grpc_completion_queue* client_cq) {
+  char* hex;
+  gpr_event done_write;
+  if (arg->client_payload_length < 4 * 1024) {
+    hex = gpr_dump(arg->client_payload, arg->client_payload_length,
                   GPR_DUMP_HEX | GPR_DUMP_ASCII);
-
    /* Add a debug log */
    gpr_log(GPR_INFO, "TEST: %s", hex);
-
    gpr_free(hex);
  } else {
    gpr_log(GPR_INFO, "TEST: (%" PRIdPTR " byte long string)",
-            client_payload_length);
+            arg->client_payload_length);
  }

-  /* Init grpc */
-  grpc_init();
-
-  /* Create endpoints */
-  sfd = grpc_iomgr_create_endpoint_pair("fixture", nullptr);
-
-  /* Create server, completion events */
-  a.server = grpc_server_create(nullptr, nullptr);
-  a.cq = grpc_completion_queue_create_for_next(nullptr);
-  gpr_event_init(&a.done_thd);
-  gpr_event_init(&a.done_write);
-  a.validator = server_validator;
-  grpc_server_register_completion_queue(a.server, a.cq, nullptr);
-  a.registered_method =
-      grpc_server_register_method(a.server, GRPC_BAD_CLIENT_REGISTERED_METHOD,
-                                  GRPC_BAD_CLIENT_REGISTERED_HOST,
-                                  GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER, 0);
-  grpc_server_start(a.server);
-  transport = grpc_create_chttp2_transport(nullptr, sfd.server, false);
-  server_setup_transport(&a, transport);
-  grpc_chttp2_transport_start_reading(transport, nullptr, nullptr);
-
-  /* Bind everything into the same pollset */
-  grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq));
-  grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq));
-
-  /* Check a ground truth */
-  GPR_ASSERT(grpc_server_has_open_connections(a.server));
-
-  /* Start validator */
-  gpr_thd_new(&id, "grpc_bad_client", thd_func, &a, nullptr);
+  grpc_slice slice = grpc_slice_from_copied_buffer(arg->client_payload,
+                                                   arg->client_payload_length);
+  grpc_slice_buffer outgoing;
+  grpc_closure done_write_closure;
+  gpr_event_init(&done_write);

  grpc_slice_buffer_init(&outgoing);
  grpc_slice_buffer_add(&outgoing, slice);
-  GRPC_CLOSURE_INIT(&done_write_closure, done_write, &a,
+  GRPC_CLOSURE_INIT(&done_write_closure, set_done_write, &done_write,
                    grpc_schedule_on_exec_ctx);

  /* Write data */
-  grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure);
+  grpc_endpoint_write(sfd->client, &outgoing, &done_write_closure);
  grpc_core::ExecCtx::Get()->Flush();

  /* Await completion, unless the request is large and write may not finish
   * before the peer shuts down. */
  if (!(flags & GRPC_BAD_CLIENT_LARGE_REQUEST)) {
    GPR_ASSERT(
-        gpr_event_wait(&a.done_write, grpc_timeout_seconds_to_deadline(5)));
+        gpr_event_wait(&done_write, grpc_timeout_seconds_to_deadline(5)));
  }

  if (flags & GRPC_BAD_CLIENT_DISCONNECT) {
-    grpc_endpoint_shutdown(
-        sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect"));
-    grpc_endpoint_destroy(sfd.client);
-    grpc_core::ExecCtx::Get()->Flush();
-    sfd.client = nullptr;
+    shutdown_client(&sfd->client);
  }

-  GPR_ASSERT(gpr_event_wait(&a.done_thd, grpc_timeout_seconds_to_deadline(5)));
-
-  if (sfd.client != nullptr) {
-    // Validate client stream, if requested.
-    if (client_validator != nullptr) {
+  if (sfd->client != nullptr) {
+    /* Validate client stream, if requested. */
+    if (arg->client_validator != nullptr) {
      gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5);
      grpc_slice_buffer incoming;
      grpc_slice_buffer_init(&incoming);
-      // We may need to do multiple reads to read the complete server response.
+      /* We may need to do multiple reads to read the complete server
+       * response. */
      while (true) {
        gpr_event read_done_event;
        gpr_event_init(&read_done_event);
        grpc_closure read_done_closure;
-        GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event,
+        GRPC_CLOSURE_INIT(&read_done_closure, set_read_done, &read_done_event,
                          grpc_schedule_on_exec_ctx);
-        grpc_endpoint_read(sfd.client, &incoming, &read_done_closure);
+        grpc_endpoint_read(sfd->client, &incoming, &read_done_closure);
        grpc_core::ExecCtx::Get()->Flush();
        do {
          GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0);
-          GPR_ASSERT(
-              grpc_completion_queue_next(
-                  a.cq, grpc_timeout_milliseconds_to_deadline(100), nullptr)
-                  .type == GRPC_QUEUE_TIMEOUT);
+          /* Perform a cq next just to provide a thread that can read incoming
+           bytes on the client fd */
+          GPR_ASSERT(grpc_completion_queue_next(
+                         client_cq, grpc_timeout_milliseconds_to_deadline(100),
+                         nullptr)
+                         .type == GRPC_QUEUE_TIMEOUT);
        } while (!gpr_event_get(&read_done_event));
-        if (client_validator(&incoming)) break;
+        if (arg->client_validator(&incoming, arg->client_validator_arg)) break;
        gpr_log(GPR_INFO,
                "client validator failed; trying additional read "
                "in case we didn't get all the data");
      }
      grpc_slice_buffer_destroy_internal(&incoming);
    }
-    // Shutdown.
-    grpc_endpoint_shutdown(
-        sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown"));
-    grpc_endpoint_destroy(sfd.client);
    grpc_core::ExecCtx::Get()->Flush();
  }

-  GPR_ASSERT(
-      gpr_event_wait(&a.done_write, grpc_timeout_seconds_to_deadline(1)));
+  /* If the request was too large, then we need to forcefully shut down the
+   * client, so that the write can be considered completed */
+  if (flags & GRPC_BAD_CLIENT_LARGE_REQUEST) {
+    shutdown_client(&sfd->client);
+  }
+
+  /* Make sure that the client is done writing */
+  while (!gpr_event_get(&done_write)) {
+    GPR_ASSERT(
+        grpc_completion_queue_next(
+            client_cq, grpc_timeout_milliseconds_to_deadline(100), nullptr)
+            .type == GRPC_QUEUE_TIMEOUT);
+  }
+
+  grpc_slice_buffer_destroy_internal(&outgoing);
+  grpc_core::ExecCtx::Get()->Flush();
+}
+
+void grpc_run_bad_client_test(
+    grpc_bad_client_server_side_validator server_validator,
+    grpc_bad_client_arg args[], int num_args, uint32_t flags) {
+  grpc_endpoint_pair sfd;
+  thd_args a;
+  grpc_transport* transport;
+  grpc_core::ExecCtx exec_ctx;
+  grpc_completion_queue* shutdown_cq;
+  grpc_completion_queue* client_cq;
+
+  /* Init grpc */
+  grpc_init();
+
+  /* Create endpoints */
+  sfd = grpc_iomgr_create_endpoint_pair("fixture", nullptr);
+
+  /* Create server, completion events */
+  a.server = grpc_server_create(nullptr, nullptr);
+  a.cq = grpc_completion_queue_create_for_next(nullptr);
+  client_cq = grpc_completion_queue_create_for_next(nullptr);
+
+  grpc_server_register_completion_queue(a.server, a.cq, nullptr);
+  a.registered_method =
+      grpc_server_register_method(a.server, GRPC_BAD_CLIENT_REGISTERED_METHOD,
+                                  GRPC_BAD_CLIENT_REGISTERED_HOST,
+                                  GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER, 0);
+  grpc_server_start(a.server);
+  transport = grpc_create_chttp2_transport(nullptr, sfd.server, false);
+  server_setup_transport(&a, transport);
+  grpc_chttp2_transport_start_reading(transport, nullptr, nullptr);
+
+  /* Bind fds to pollsets */
+  grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(client_cq));
+  grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq));
+
+  /* Check a ground truth */
+  GPR_ASSERT(grpc_server_has_open_connections(a.server));
+
+  gpr_thd_id id;
+  gpr_event_init(&a.done_thd);
+  a.validator = server_validator;
+  /* Start validator */
+  gpr_thd_new(&id, "grpc_bad_client", thd_func, &a, nullptr);
+  for (int i = 0; i < num_args; i++) {
+    grpc_run_client_side_validator(&args[i], i == (num_args - 1) ? flags : 0,
+                                   &sfd, client_cq);
+  }
+  /* Wait for server thread to finish */
+  GPR_ASSERT(gpr_event_wait(&a.done_thd, grpc_timeout_seconds_to_deadline(1)));
+
+  /* Shutdown. */
+  shutdown_client(&sfd.client);
+
  shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
  grpc_server_shutdown_and_notify(a.server, shutdown_cq, nullptr);
  GPR_ASSERT(grpc_completion_queue_pluck(shutdown_cq, nullptr,
@ -201,7 +244,91 @@ void grpc_run_bad_client_test(
  grpc_completion_queue_destroy(shutdown_cq);
  grpc_server_destroy(a.server);
  grpc_completion_queue_destroy(a.cq);
-  grpc_slice_buffer_destroy_internal(&outgoing);
-
+  grpc_completion_queue_destroy(client_cq);
  grpc_shutdown();
 }
+
+bool client_connection_preface_validator(grpc_slice_buffer* incoming,
+                                         void* arg) {
+  if (incoming->count < 1) {
+    return false;
+  }
+  grpc_slice slice = incoming->slices[0];
+  /* There should be atleast a settings frame present */
+  if (GRPC_SLICE_LENGTH(slice) < MIN_HTTP2_FRAME_SIZE) {
+    return false;
+  }
+  const uint8_t* p = GRPC_SLICE_START_PTR(slice);
+  /* Check the frame type (SETTINGS) */
+  if (*(p + 3) != 4) {
+    return false;
+  }
+  return true;
+}
+
+/* connection preface and settings frame to be sent by the client */
+#define CONNECTION_PREFACE_FROM_CLIENT \
+  "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"   \
+  "\x00\x00\x00\x04\x00\x00\x00\x00\x00"
+
+grpc_bad_client_arg connection_preface_arg = {
+    client_connection_preface_validator, nullptr,
+    CONNECTION_PREFACE_FROM_CLIENT, sizeof(CONNECTION_PREFACE_FROM_CLIENT) - 1};
+
+bool rst_stream_client_validator(grpc_slice_buffer* incoming, void* arg) {
+  // Get last frame from incoming slice buffer.
+  grpc_slice_buffer last_frame_buffer;
+  grpc_slice_buffer_init(&last_frame_buffer);
+  grpc_slice_buffer_trim_end(incoming, 13, &last_frame_buffer);
+  GPR_ASSERT(last_frame_buffer.count == 1);
+  grpc_slice last_frame = last_frame_buffer.slices[0];
+
+  const uint8_t* p = GRPC_SLICE_START_PTR(last_frame);
+  bool success =
+      // Length == 4
+      *p++ != 0 || *p++ != 0 || *p++ != 4 ||
+      // Frame type (RST_STREAM)
+      *p++ != 3 ||
+      // Flags
+      *p++ != 0 ||
+      // Stream ID.
+      *p++ != 0 || *p++ != 0 || *p++ != 0 || *p++ != 1 ||
+      // Payload (error code)
+      *p++ == 0 || *p++ == 0 || *p++ == 0 || *p == 0 || *p == 11;
+
+  if (!success) {
+    gpr_log(GPR_INFO, "client expected RST_STREAM frame, not found");
+  }
+
+  grpc_slice_buffer_destroy(&last_frame_buffer);
+  return success;
+}
+
+static void* tag(intptr_t t) { return (void*)t; }
+
+void server_verifier_request_call(grpc_server* server,
+                                  grpc_completion_queue* cq,
+                                  void* registered_method) {
+  grpc_call_error error;
+  grpc_call* s;
+  grpc_call_details call_details;
+  cq_verifier* cqv = cq_verifier_create(cq);
+  grpc_metadata_array request_metadata_recv;
+
+  grpc_call_details_init(&call_details);
+  grpc_metadata_array_init(&request_metadata_recv);
+
+  error = grpc_server_request_call(server, &s, &call_details,
+                                   &request_metadata_recv, cq, cq, tag(101));
+  GPR_ASSERT(GRPC_CALL_OK == error);
+  CQ_EXPECT_COMPLETION(cqv, tag(101), 1);
+  cq_verify(cqv);
+
+  GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.host, "localhost"));
+  GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.method, "/foo/bar"));
+
+  grpc_metadata_array_destroy(&request_metadata_recv);
+  grpc_call_details_destroy(&call_details);
+  grpc_call_unref(s);
+  cq_verifier_destroy(cqv);
+}
--- a/test/core/bad_client/bad_client.h
+++ b/test/core/bad_client/bad_client.h
@ -28,30 +28,69 @@
 #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar"
 #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost"

+/* The server side validator function to run */
 typedef void (*grpc_bad_client_server_side_validator)(grpc_server* server,
                                                      grpc_completion_queue* cq,
                                                      void* registered_method);

-// Returns false if we need to read more data.
+/* Returns false if we need to read more data. */
 typedef bool (*grpc_bad_client_client_stream_validator)(
-    grpc_slice_buffer* incoming);
+    grpc_slice_buffer* incoming, void* arg);

+struct grpc_bad_client_arg {
+  grpc_bad_client_client_stream_validator client_validator;
+  void* client_validator_arg;
+  const char* client_payload;
+  size_t client_payload_length;
+};
+
+/* Flags for grpc_run_bad_client_test */
 #define GRPC_BAD_CLIENT_DISCONNECT 1
 #define GRPC_BAD_CLIENT_LARGE_REQUEST 2

 /* Test runner.
-
-   Create a server, and send client_payload to it as bytes from a client.
-   Execute server_validator in a separate thread to assert that the bytes are
-   handled as expected. */
+ *
+ * Create a server, and for each arg in \a args send client_payload. For each
+ * payload, run client_validator to make sure that the response is as expected.
+ * Also execute \a server_validator in a separate thread to assert that the
+ * bytes are handled as expected.
+ *
+ * The flags are only applicable to the last validator in the array. (This can
+ * be changed in the future if necessary)
+ */
 void grpc_run_bad_client_test(
    grpc_bad_client_server_side_validator server_validator,
-    grpc_bad_client_client_stream_validator client_validator,
-    const char* client_payload, size_t client_payload_length, uint32_t flags);
+    grpc_bad_client_arg args[], int num_args, uint32_t flags);
+
+/* A hack to let old tests work as before. In these tests, instead of an array,
+ * the tests provide a single client_validator and payload
+ */
+#define COMBINE1(X, Y) X##Y
+#define COMBINE(X, Y) COMBINE1(X, Y)
+
+#define GRPC_RUN_BAD_CLIENT_TEST(server_validator, client_validator, payload,  \
+                                 flags)                                        \
+  grpc_bad_client_arg COMBINE(bca, __LINE__) = {client_validator, nullptr,     \
+                                                payload, sizeof(payload) - 1}; \
+  grpc_run_bad_client_test(server_validator, &COMBINE(bca, __LINE__), 1, flags)
+
+/* Helper validator functions */
+/* Client side validator for connection preface from server. \a arg is unused */
+bool client_connection_preface_validator(grpc_slice_buffer* incoming,
+                                         void* arg);
+
+/* Client side validator for checking if reset stream is present at the end
+ * of the buffer. \a arg is unused.
+ */
+bool rst_stream_client_validator(grpc_slice_buffer* incoming, void* arg);

-#define GRPC_RUN_BAD_CLIENT_TEST(server_validator, client_validator, payload, \
-                                 flags)                                       \
-  grpc_run_bad_client_test(server_validator, client_validator, payload,       \
-                           sizeof(payload) - 1, flags)
+/* Helper grpc_bad_client_arg arguments for direct use */
+/* Sends a connection preface from the client with an empty settings frame */
+extern grpc_bad_client_arg connection_preface_arg;

+/* Server side verifier function that performs a
+ *  single grpc_server_request_call */
+void server_verifier_request_call(grpc_server* server,
+                                  grpc_completion_queue* cq,
+                                  void* registered_method);
 #endif /* GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H */
--- a/test/core/bad_client/gen_build_yaml.py
+++ b/test/core/bad_client/gen_build_yaml.py
@ -30,7 +30,7 @@ BAD_CLIENT_TESTS = {
    'headers': default_test_options._replace(cpu_cost=0.2),
    'initial_settings_frame': default_test_options._replace(cpu_cost=0.2),
    'head_of_line_blocking': default_test_options,
-    # 'large_metadata': default_test_options, #disabling as per issue #11745
+    'large_metadata': default_test_options,
    'server_registered_method': default_test_options,
    'simple_request': default_test_options,
    'window_overflow': default_test_options,
--- a/test/core/bad_client/generate_tests.bzl
+++ b/test/core/bad_client/generate_tests.bzl
@ -28,7 +28,7 @@ BAD_CLIENT_TESTS = {
    'headers': test_options(),
    'initial_settings_frame': test_options(),
    'head_of_line_blocking': test_options(),
-    # 'large_metadata': test_options(), # disabling as per issue #11745
+    'large_metadata': test_options(),
    'server_registered_method': test_options(),
    'simple_request': test_options(),
    'window_overflow': test_options(),
--- a/test/core/bad_client/tests/head_of_line_blocking.cc
+++ b/test/core/bad_client/tests/head_of_line_blocking.cc
@ -131,7 +131,8 @@ int main(int argc, char** argv) {
    addbuf(hdr, sizeof(hdr));
    addbuf(msg, FRAME_SIZE);
  }
-  grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, 0);
+  grpc_bad_client_arg bca = {nullptr, nullptr, g_buffer, g_count};
+  grpc_run_bad_client_test(verifier, &bca, 1, 0);
  gpr_free(g_buffer);
  grpc_shutdown();

--- a/test/core/bad_client/tests/large_metadata.cc
+++ b/test/core/bad_client/tests/large_metadata.cc
@ -31,23 +31,20 @@
 // be longer than the C99 string literal limit.  Instead, we dynamically
 // construct it by adding the large headers one at a time.

-#define PFX_TOO_MUCH_METADATA_FROM_CLIENT_PREFIX_STR                       \
-  "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"     /* settings frame */              \
-  "\x00\x00\x00\x04\x00\x00\x00\x00\x00" /* headers: generated from        \
-                                            large_metadata.headers in this \
-                                            directory */                   \
-  "\x00\x00\x00\x04\x01\x00\x00\x00\x00"                                   \
-  "\x00"                                                                   \
-  "5{\x01\x05\x00\x00\x00\x01"                                             \
-  "\x10\x05:path\x08/foo/bar"                                              \
-  "\x10\x07:scheme\x04http"                                                \
-  "\x10\x07:method\x04POST"                                                \
-  "\x10\x0a:authority\x09localhost"                                        \
-  "\x10\x0c"                                                               \
-  "content-type\x10"                                                       \
-  "application/grpc"                                                       \
-  "\x10\x14grpc-accept-encoding\x15identity,deflate,gzip"                  \
-  "\x10\x02te\x08trailers"                                                 \
+/* headers: generated from  large_metadata.headers in this directory */
+#define PFX_TOO_MUCH_METADATA_FROM_CLIENT_REQUEST         \
+  "\x00\x00\x00\x04\x01\x00\x00\x00\x00"                  \
+  "\x00"                                                  \
+  "5{\x01\x05\x00\x00\x00\x01"                            \
+  "\x10\x05:path\x08/foo/bar"                             \
+  "\x10\x07:scheme\x04http"                               \
+  "\x10\x07:method\x04POST"                               \
+  "\x10\x0a:authority\x09localhost"                       \
+  "\x10\x0c"                                              \
+  "content-type\x10"                                      \
+  "application/grpc"                                      \
+  "\x10\x14grpc-accept-encoding\x15identity,deflate,gzip" \
+  "\x10\x02te\x08trailers"                                \
  "\x10\x0auser-agent\"bad-client grpc-c/0.12.0.0 (linux)"

 // Each large-metadata header is constructed from these start and end
@ -65,8 +62,8 @@
 // The number of headers we're adding and the total size of the client
 // payload.
 #define NUM_HEADERS 46
-#define PFX_TOO_MUCH_METADATA_FROM_CLIENT_PAYLOAD_SIZE          \
-  ((sizeof(PFX_TOO_MUCH_METADATA_FROM_CLIENT_PREFIX_STR) - 1) + \
+#define TOO_MUCH_METADATA_FROM_CLIENT_REQUEST_SIZE           \
+  ((sizeof(PFX_TOO_MUCH_METADATA_FROM_CLIENT_REQUEST) - 1) + \
   (NUM_HEADERS * PFX_TOO_MUCH_METADATA_FROM_CLIENT_HEADER_SIZE) + 1)

 #define PFX_TOO_MUCH_METADATA_FROM_SERVER_STR                                              \
@ -95,32 +92,6 @@

 static void* tag(intptr_t t) { return (void*)t; }

-static void server_verifier(grpc_server* server, grpc_completion_queue* cq,
-                            void* registered_method) {
-  grpc_call_error error;
-  grpc_call* s;
-  grpc_call_details call_details;
-  cq_verifier* cqv = cq_verifier_create(cq);
-  grpc_metadata_array request_metadata_recv;
-
-  grpc_call_details_init(&call_details);
-  grpc_metadata_array_init(&request_metadata_recv);
-
-  error = grpc_server_request_call(server, &s, &call_details,
-                                   &request_metadata_recv, cq, cq, tag(101));
-  GPR_ASSERT(GRPC_CALL_OK == error);
-  CQ_EXPECT_COMPLETION(cqv, tag(101), 1);
-  cq_verify(cqv);
-
-  GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.host, "localhost"));
-  GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.method, "/foo/bar"));
-
-  grpc_metadata_array_destroy(&request_metadata_recv);
-  grpc_call_details_destroy(&call_details);
-  grpc_call_unref(s);
-  cq_verifier_destroy(cqv);
-}
-
 static void server_verifier_sends_too_much_metadata(grpc_server* server,
                                                    grpc_completion_queue* cq,
                                                    void* registered_method) {
@ -167,43 +138,6 @@ static void server_verifier_sends_too_much_metadata(grpc_server* server,
  cq_verifier_destroy(cqv);
 }

-static bool client_validator(grpc_slice_buffer* incoming) {
-  for (size_t i = 0; i < incoming->count; ++i) {
-    const char* s = (const char*)GRPC_SLICE_START_PTR(incoming->slices[i]);
-    char* hex = gpr_dump(s, GRPC_SLICE_LENGTH(incoming->slices[i]),
-                         GPR_DUMP_HEX | GPR_DUMP_ASCII);
-    gpr_log(GPR_INFO, "RESPONSE SLICE %" PRIdPTR ": %s", i, hex);
-    gpr_free(hex);
-  }
-
-  // Get last frame from incoming slice buffer.
-  grpc_slice_buffer last_frame_buffer;
-  grpc_slice_buffer_init(&last_frame_buffer);
-  grpc_slice_buffer_trim_end(incoming, 13, &last_frame_buffer);
-  GPR_ASSERT(last_frame_buffer.count == 1);
-  grpc_slice last_frame = last_frame_buffer.slices[0];
-
-  const uint8_t* p = GRPC_SLICE_START_PTR(last_frame);
-  bool success =
-      // Length == 4
-      *p++ != 0 || *p++ != 0 || *p++ != 4 ||
-      // Frame type (RST_STREAM)
-      *p++ != 3 ||
-      // Flags
-      *p++ != 0 ||
-      // Stream ID.
-      *p++ != 0 || *p++ != 0 || *p++ != 0 || *p++ != 1 ||
-      // Payload (error code)
-      *p++ == 0 || *p++ == 0 || *p++ == 0 || *p == 0 || *p == 11;
-
-  if (!success) {
-    gpr_log(GPR_INFO, "client expected RST_STREAM frame, not found");
-  }
-
-  grpc_slice_buffer_destroy(&last_frame_buffer);
-  return success;
-}
-
 int main(int argc, char** argv) {
  int i;

@ -222,19 +156,22 @@ int main(int argc, char** argv) {
  size_t headers_len;
  const char* client_headers = gpr_strvec_flatten(&headers, &headers_len);
  gpr_strvec_destroy(&headers);
-  char client_payload[PFX_TOO_MUCH_METADATA_FROM_CLIENT_PAYLOAD_SIZE] =
-      PFX_TOO_MUCH_METADATA_FROM_CLIENT_PREFIX_STR;
-  memcpy(
-      client_payload + sizeof(PFX_TOO_MUCH_METADATA_FROM_CLIENT_PREFIX_STR) - 1,
-      client_headers, headers_len);
-  GRPC_RUN_BAD_CLIENT_TEST(server_verifier, client_validator, client_payload,
-                           0);
+  char client_payload[TOO_MUCH_METADATA_FROM_CLIENT_REQUEST_SIZE] =
+      PFX_TOO_MUCH_METADATA_FROM_CLIENT_REQUEST;
+  memcpy(client_payload + sizeof(PFX_TOO_MUCH_METADATA_FROM_CLIENT_REQUEST) - 1,
+         client_headers, headers_len);
+  grpc_bad_client_arg args[2];
+  args[0] = connection_preface_arg;
+  args[1].client_validator = rst_stream_client_validator;
+  args[1].client_payload = client_payload;
+  args[1].client_payload_length = sizeof(client_payload) - 1;
+
+  grpc_run_bad_client_test(server_verifier_request_call, args, 2, 0);
  gpr_free((void*)client_headers);

  // Test sending more metadata than the client will accept.
  GRPC_RUN_BAD_CLIENT_TEST(server_verifier_sends_too_much_metadata,
-                           client_validator,
+                           rst_stream_client_validator,
                           PFX_TOO_MUCH_METADATA_FROM_SERVER_STR, 0);
-
  return 0;
 }
--- a/test/core/bad_client/tests/window_overflow.cc
+++ b/test/core/bad_client/tests/window_overflow.cc
@ -26,8 +26,7 @@
 #include "src/core/lib/surface/server.h"

 #define PFX_STR                                                            \
-  "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"                                       \
-  "\x00\x00\x00\x04\x00\x00\x00\x00\x00" /* settings frame */              \
+  "\x00\x00\x00\x04\x01\x00\x00\x00\x00"                                   \
  "\x00\x00\xc9\x01\x04\x00\x00\x00\x01" /* headers: generated from        \
                                            simple_request.headers in this \
                                            directory */                   \
@ -70,7 +69,7 @@ int main(int argc, char** argv) {
 #define MAX_FRAME_SIZE 16384
 #define MESSAGES_PER_FRAME (MAX_FRAME_SIZE / 5)
 #define FRAME_SIZE (MESSAGES_PER_FRAME * 5)
-#define SEND_SIZE (6 * 1024 * 1024)
+#define SEND_SIZE (4 * 1024 * 1024)
 #define NUM_FRAMES (SEND_SIZE / FRAME_SIZE + 1)
  grpc_test_init(argc, argv);
  grpc_init();
@ -92,8 +91,10 @@ int main(int argc, char** argv) {
      addbuf(message, sizeof(message));
    }
  }
-  grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count,
-                           GRPC_BAD_CLIENT_LARGE_REQUEST);
+  grpc_bad_client_arg bca[2];
+  bca[0] = connection_preface_arg;
+  bca[1] = {rst_stream_client_validator, nullptr, g_buffer, g_count};
+  grpc_run_bad_client_test(verifier, bca, 2, GRPC_BAD_CLIENT_LARGE_REQUEST);
  gpr_free(g_buffer);
  grpc_shutdown();

--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@ -1333,8 +1333,11 @@ TEST_P(ProxyEnd2endTest, EchoDeadline) {
  EXPECT_TRUE(s.ok());
  gpr_timespec sent_deadline;
  Timepoint2Timespec(deadline, &sent_deadline);
-  // Allow 1 second error.
-  EXPECT_LE(response.param().request_deadline() - sent_deadline.tv_sec, 1);
+  // We want to allow some reasonable error given:
+  // - request_deadline() only has 1sec resolution so the best we can do is +-1
+  // - if sent_deadline.tv_nsec is very close to the next second's boundary we
+  // can end up being off by 2 in one direction.
+  EXPECT_LE(response.param().request_deadline() - sent_deadline.tv_sec, 2);
  EXPECT_GE(response.param().request_deadline() - sent_deadline.tv_sec, -1);
 }

--- a/third_party/boringssl
+++ b/third_party/boringssl
@ -1 +1 @@
-Subproject commit be2ee342d3781ddb954f91f8a7e660c6f59e87e5
+Subproject commit 4d7ba4e4e57195fcebdabe01489534b446ad02cb
--- a/tools/distrib/check_copyright.py
+++ b/tools/distrib/check_copyright.py
@ -152,7 +152,9 @@ for filename in filename_list:
    m = re.search(re_license, text)
    if m:
        pass
-    elif 'DO NOT EDIT' not in text and filename != 'src/boringssl/err_data.c':
+    elif 'DO NOT EDIT' not in text and filename not in [
+            'src/boringssl/err_data.c', 'src/boringssl/crypto_test_data.cc'
+    ]:
        log(1, 'copyright missing', filename)
        ok = False

--- a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile
@ -22,7 +22,7 @@ RUN yum update -y
 #############################################################
 # Update Git to allow cloning submodules with --reference arg
 RUN yum remove -y git
-RUN yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc
+RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc
 RUN cd /usr/src && \
  curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \
  tar xzf git-2.0.5.tar.gz
--- a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile
@ -22,7 +22,7 @@ RUN yum update -y
 #############################################################
 # Update Git to allow cloning submodules with --reference arg
 RUN yum remove -y git
-RUN yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc
+RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc
 RUN cd /usr/src && \
  curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \
  tar xzf git-2.0.5.tar.gz
--- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
@ -26,6 +26,7 @@ RUN apk update && apk add \
  gcc \
  git \
  libtool \
+  linux-headers \
  make \
  perl \
  strace \
--- a/tools/dockerfile/test/python_alpine_x64/Dockerfile
+++ b/tools/dockerfile/test/python_alpine_x64/Dockerfile
@ -26,6 +26,7 @@ RUN apk update && apk add \
  gcc \
  git \
  libtool \
+  linux-headers \
  make \
  perl \
  strace \
--- a/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh
+++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh
@ -34,10 +34,11 @@ cd $(dirname $0)/../../..

 source tools/internal_ci/helper_scripts/prepare_build_linux_rc

+# TODO(adelez): implement size for test targets and change test_timeout back
 "${KOKORO_GFILE_DIR}/bazel_wrapper.py" \
  --host_jvm_args=-Dbazel.DigestFunction=SHA256 \
  test --jobs="50" \
-  --test_timeout="300,450,1200,3600" \
+  --test_timeout="1200,1200,1200,3600" \
  --test_output=errors  \
  --verbose_failures=true  \
  --keep_going  \
--- a/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh
+++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh
@ -34,10 +34,11 @@ cd $(dirname $0)/../../..

 source tools/internal_ci/helper_scripts/prepare_build_linux_rc

+# TODO(adelez): implement size for test targets and change test_timeout back
 "${KOKORO_GFILE_DIR}/bazel_wrapper.py" \
  --host_jvm_args=-Dbazel.DigestFunction=SHA256 \
  test --jobs="50" \
-  --test_timeout="300,450,1200,3600" \
+  --test_timeout="1200,1200,1200,3600" \
  --test_output=errors  \
  --verbose_failures=true  \
  --keep_going  \
--- a/tools/lsan_suppressions.txt
+++ b/tools/lsan_suppressions.txt
@ -3,3 +3,4 @@ leak:CRYPTO_set_thread_local
 leak:err_get_state
 leak:ERR_add_error_dataf
 leak:err_add_error_vdata
+leak:RAND_bytes_with_additional_data
--- a/tools/profiling/latency_profile/profile_analyzer.py
+++ b/tools/profiling/latency_profile/profile_analyzer.py
@ -122,7 +122,8 @@ class CallStackBuilder(object):
                return True
            return False
        elif line_type == '.' or line_type == '!':
-            self.stk[-1].mark(line)
+            if self.stk:
+                self.stk[-1].mark(line)
            return False
        else:
            raise Exception('Unknown line type: \'%s\'' % line_type)
@ -255,6 +256,7 @@ if args.fmt == 'html':

 accounted_for = 0
 for cs in call_stacks:
+    print >> out, '\n'
    if args.fmt in BANNER:
        print >> out, BANNER[args.fmt] % {
            'count': cs.count,
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -4411,538 +4411,6 @@
    "third_party": false, 
    "type": "target"
  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_aes_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_aes_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_asn1_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_asn1_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_base64_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_base64_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_bio_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_bio_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_bn_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_bn_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_bytestring_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_bytestring_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_aead_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_aead_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_cipher_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_cipher_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_cmac_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_cmac_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_constant_time_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_constant_time_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_ed25519_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_ed25519_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_spake25519_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_spake25519_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
-      "boringssl_x25519_test_lib"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_x25519_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_digest_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_digest_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_example_mul_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_example_mul", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_p256-x86_64_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_p256-x86_64_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_ecdh_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_ecdh_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_ecdsa_sign_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_ecdsa_sign_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_ecdsa_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_ecdsa_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_ecdsa_verify_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_ecdsa_verify_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_evp_extra_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_evp_extra_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_evp_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_evp_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_pbkdf_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_pbkdf_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_hkdf_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_hkdf_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_hmac_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_hmac_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_lhash_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_lhash_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_gcm_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_gcm_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_obj_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_obj_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_pkcs12_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_pkcs12_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_pkcs8_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_pkcs8_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_poly1305_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_poly1305_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_pool_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_pool_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_refcount_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_refcount_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
-      "boringssl_thread_test_lib"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_thread_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_pkcs7_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_pkcs7_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
-      "boringssl_x509_test_lib"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_x509_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_tab_test_lib", 
-      "boringssl_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_tab_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "boringssl", 
-      "boringssl_test_util", 
-      "boringssl_v3name_test_lib"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "boringssl_v3name_test", 
-    "src": [], 
-    "third_party": true, 
-    "type": "target"
-  }, 
  {
    "deps": [
      "bad_client_test", 
@ -5033,6 +4501,24 @@
    "third_party": false, 
    "type": "target"
  }, 
+  {
+    "deps": [
+      "bad_client_test", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c", 
+    "name": "large_metadata_bad_client_test", 
+    "src": [
+      "test/core/bad_client/tests/large_metadata.cc"
+    ], 
+    "third_party": false, 
+    "type": "target"
+  }, 
  {
    "deps": [
      "bad_client_test", 
@ -6906,31 +6392,35 @@
  {
    "deps": [], 
    "headers": [
-      "third_party/boringssl/crypto/aes/internal.h", 
      "third_party/boringssl/crypto/asn1/asn1_locl.h", 
      "third_party/boringssl/crypto/bio/internal.h", 
-      "third_party/boringssl/crypto/bn/internal.h", 
-      "third_party/boringssl/crypto/bn/rsaz_exp.h", 
      "third_party/boringssl/crypto/bytestring/internal.h", 
-      "third_party/boringssl/crypto/cipher/internal.h", 
+      "third_party/boringssl/crypto/cipher_extra/internal.h", 
      "third_party/boringssl/crypto/conf/conf_def.h", 
      "third_party/boringssl/crypto/conf/internal.h", 
      "third_party/boringssl/crypto/curve25519/internal.h", 
-      "third_party/boringssl/crypto/des/internal.h", 
-      "third_party/boringssl/crypto/digest/internal.h", 
-      "third_party/boringssl/crypto/digest/md32_common.h", 
-      "third_party/boringssl/crypto/ec/internal.h", 
-      "third_party/boringssl/crypto/ec/p256-x86_64-table.h", 
-      "third_party/boringssl/crypto/ec/p256-x86_64.h", 
+      "third_party/boringssl/crypto/err/internal.h", 
      "third_party/boringssl/crypto/evp/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/aes/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/bn/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h", 
+      "third_party/boringssl/crypto/fipsmodule/cipher/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/delocate.h", 
+      "third_party/boringssl/crypto/fipsmodule/des/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/digest/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/digest/md32_common.h", 
+      "third_party/boringssl/crypto/fipsmodule/ec/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h", 
+      "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h", 
+      "third_party/boringssl/crypto/fipsmodule/modes/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/rand/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/rsa/internal.h", 
      "third_party/boringssl/crypto/internal.h", 
-      "third_party/boringssl/crypto/modes/internal.h", 
      "third_party/boringssl/crypto/obj/obj_dat.h", 
+      "third_party/boringssl/crypto/pkcs7/internal.h", 
      "third_party/boringssl/crypto/pkcs8/internal.h", 
      "third_party/boringssl/crypto/poly1305/internal.h", 
      "third_party/boringssl/crypto/pool/internal.h", 
-      "third_party/boringssl/crypto/rand/internal.h", 
-      "third_party/boringssl/crypto/rsa/internal.h", 
      "third_party/boringssl/crypto/x509/charmap.h", 
      "third_party/boringssl/crypto/x509/internal.h", 
      "third_party/boringssl/crypto/x509/vpm_int.h", 
@ -6973,6 +6463,7 @@
      "third_party/boringssl/include/openssl/ex_data.h", 
      "third_party/boringssl/include/openssl/hkdf.h", 
      "third_party/boringssl/include/openssl/hmac.h", 
+      "third_party/boringssl/include/openssl/is_boringssl.h", 
      "third_party/boringssl/include/openssl/lhash.h", 
      "third_party/boringssl/include/openssl/lhash_macros.h", 
      "third_party/boringssl/include/openssl/md4.h", 
@ -6997,11 +6488,11 @@
      "third_party/boringssl/include/openssl/rsa.h", 
      "third_party/boringssl/include/openssl/safestack.h", 
      "third_party/boringssl/include/openssl/sha.h", 
+      "third_party/boringssl/include/openssl/span.h", 
      "third_party/boringssl/include/openssl/srtp.h", 
      "third_party/boringssl/include/openssl/ssl.h", 
      "third_party/boringssl/include/openssl/ssl3.h", 
      "third_party/boringssl/include/openssl/stack.h", 
-      "third_party/boringssl/include/openssl/stack_macros.h", 
      "third_party/boringssl/include/openssl/thread.h", 
      "third_party/boringssl/include/openssl/tls1.h", 
      "third_party/boringssl/include/openssl/type_check.h", 
@ -7037,8 +6528,10 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_aes_test_lib", 
-    "src": [], 
+    "name": "boringssl_crypto_test_data_lib", 
+    "src": [
+      "src/boringssl/crypto_test_data.cc"
+    ], 
    "third_party": true, 
    "type": "lib"
  }, 
@ -7089,7 +6582,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_bn_test_lib", 
+    "name": "boringssl_bytestring_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7102,7 +6595,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_bytestring_test_lib", 
+    "name": "boringssl_chacha_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7146,6 +6639,19 @@
    "third_party": true, 
    "type": "lib"
  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_compiler_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
  {
    "deps": [
      "boringssl", 
@ -7206,7 +6712,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_digest_test_lib", 
+    "name": "boringssl_dh_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7218,8 +6724,8 @@
    ], 
    "headers": [], 
    "is_filegroup": false, 
-    "language": "c", 
-    "name": "boringssl_example_mul_lib", 
+    "language": "c++", 
+    "name": "boringssl_digest_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7232,7 +6738,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_p256-x86_64_test_lib", 
+    "name": "boringssl_dsa_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7258,7 +6764,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_ecdsa_sign_test_lib", 
+    "name": "boringssl_err_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7271,7 +6777,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_ecdsa_test_lib", 
+    "name": "boringssl_evp_extra_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7284,7 +6790,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_ecdsa_verify_test_lib", 
+    "name": "boringssl_evp_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7297,7 +6803,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_evp_extra_test_lib", 
+    "name": "boringssl_pbkdf_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7310,7 +6816,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_evp_test_lib", 
+    "name": "boringssl_scrypt_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7323,7 +6829,85 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_pbkdf_test_lib", 
+    "name": "boringssl_aes_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_bn_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_ec_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_p256-x86_64_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_ecdsa_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_gcm_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_ctrdrbg_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7375,7 +6959,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_gcm_test_lib", 
+    "name": "boringssl_obj_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7388,7 +6972,7 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "boringssl_obj_test_lib", 
+    "name": "boringssl_pkcs7_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7465,8 +7049,8 @@
    ], 
    "headers": [], 
    "is_filegroup": false, 
-    "language": "c", 
-    "name": "boringssl_thread_test_lib", 
+    "language": "c++", 
+    "name": "boringssl_rsa_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7478,8 +7062,34 @@
    ], 
    "headers": [], 
    "is_filegroup": false, 
-    "language": "c", 
-    "name": "boringssl_pkcs7_test_lib", 
+    "language": "c++", 
+    "name": "boringssl_file_test_gtest_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_gtest_main_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_thread_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
@ -7504,7 +7114,7 @@
    ], 
    "headers": [], 
    "is_filegroup": false, 
-    "language": "c", 
+    "language": "c++", 
    "name": "boringssl_tab_test_lib", 
    "src": [], 
    "third_party": true, 
@ -7517,12 +7127,38 @@
    ], 
    "headers": [], 
    "is_filegroup": false, 
-    "language": "c", 
+    "language": "c++", 
    "name": "boringssl_v3name_test_lib", 
    "src": [], 
    "third_party": true, 
    "type": "lib"
  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_span_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_ssl_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
  {
    "deps": [], 
    "headers": [
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
 git submodule | awk '{ print $1 }' | sort > "$submodules"
 cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0)
- be2ee342d3781ddb954f91f8a7e660c6f59e87e5 third_party/boringssl (heads/chromium-stable)
+ 4d7ba4e4e57195fcebdabe01489534b446ad02cb third_party/boringssl (heads/chromium-stable)
 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7)
 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
 ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)