From d189bd54c19e72c8520a1981d9a2a010d2efb117 Mon Sep 17 00:00:00 2001
From: Paulo Castello da Costa <pcastello@google.com>
Date: Wed, 22 May 2024 15:13:55 -0700
Subject: [PATCH 1/2] [benchmark] Disable benchmarks for dotnet in CI.

Build is failing, so temporarily removing dotnet from benchmarks CI.
---
 third_party/boringssl-with-bazel                            | 2 +-
 third_party/protobuf                                        | 2 +-
 tools/internal_ci/linux/grpc_e2e_performance_gke.sh         | 6 +++---
 .../linux/grpc_e2e_performance_gke_experiment.sh            | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/third_party/boringssl-with-bazel b/third_party/boringssl-with-bazel
index 5a2bca2124800..ae72a4514c7af 160000
--- a/third_party/boringssl-with-bazel
+++ b/third_party/boringssl-with-bazel
@@ -1 +1 @@
-Subproject commit 5a2bca2124800f2861263959b72bc35cdf18949b
+Subproject commit ae72a4514c7afd150596b0a80947f3ca9b8363b5
diff --git a/third_party/protobuf b/third_party/protobuf
index 2434ef2adf0c7..7f94235e55259 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit 2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5
+Subproject commit 7f94235e552599141950d7a4a3eaf93bc87d1b22
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
index 15951cccc756e..a8da8a9fae6a0 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
@@ -131,9 +131,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )
 
 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
 
 # # go
 configLangArgs8core+=( -l go )
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
index f62d9920b72a4..c3b99af80ebb6 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
@@ -125,9 +125,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )
 
 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
 
 # # go
 configLangArgs8core+=( -l go )

From 4238fab4ac6c0b31b9509a344f79e3a697960fdf Mon Sep 17 00:00:00 2001
From: paulosjca <6579971+paulosjca@users.noreply.github.com>
Date: Wed, 22 May 2024 22:28:44 +0000
Subject: [PATCH 2/2] Automated change: Fix sanity tests

---
 BoringSSL-Package.swift                       |   5 +-
 Makefile                                      |   5 +-
 config.m4                                     |   7 +-
 config.w32                                    |   7 +-
 grpc.gemspec                                  |   9 +-
 package.xml                                   |   9 +-
 src/objective-c/BoringSSL-GRPC.podspec        |   2 +-
 src/python/grpcio/grpc_core_dependencies.py   | 309 +++++++++---------
 .../python/grpcio_tools/protoc_lib_deps.py    |   2 +-
 9 files changed, 166 insertions(+), 189 deletions(-)

diff --git a/BoringSSL-Package.swift b/BoringSSL-Package.swift
index 8a4f6a6d639a9..363c62433efb7 100644
--- a/BoringSSL-Package.swift
+++ b/BoringSSL-Package.swift
@@ -26,6 +26,7 @@ let package = Package(
       ],
     
       sources: [
+        "err_data.c",
         "src/crypto/asn1/a_bitstr.c",
         "src/crypto/asn1/a_bool.c",
         "src/crypto/asn1/a_d2i_fp.c",
@@ -116,8 +117,6 @@ let package = Package(
         "src/crypto/evp/evp.c",
         "src/crypto/evp/evp_asn1.c",
         "src/crypto/evp/evp_ctx.c",
-        "src/crypto/evp/p_dh.c",
-        "src/crypto/evp/p_dh_asn1.c",
         "src/crypto/evp/p_dsa_asn1.c",
         "src/crypto/evp/p_ec.c",
         "src/crypto/evp/p_ec_asn1.c",
@@ -259,7 +258,6 @@ let package = Package(
         "src/crypto/x509/x_val.c",
         "src/crypto/x509/x_x509.c",
         "src/crypto/x509/x_x509a.c",
-        "src/gen/crypto/err_data.c",
         "src/ssl/bio_ssl.cc",
         "src/ssl/d1_both.cc",
         "src/ssl/d1_lib.cc",
@@ -281,7 +279,6 @@ let package = Package(
         "src/ssl/ssl_buffer.cc",
         "src/ssl/ssl_cert.cc",
         "src/ssl/ssl_cipher.cc",
-        "src/ssl/ssl_credential.cc",
         "src/ssl/ssl_file.cc",
         "src/ssl/ssl_key_share.cc",
         "src/ssl/ssl_lib.cc",
diff --git a/Makefile b/Makefile
index 5e22b66b5ee38..34ded313f6ecf 100644
--- a/Makefile
+++ b/Makefile
@@ -1857,6 +1857,7 @@ endif
 # deps: []
 # transitive_deps: []
 LIBBORINGSSL_SRC = \
+    third_party/boringssl-with-bazel/err_data.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c \
@@ -1947,8 +1948,6 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/evp/evp.c \
     third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c \
-    third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c \
-    third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c \
@@ -2090,7 +2089,6 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \
-    third_party/boringssl-with-bazel/src/gen/crypto/err_data.c \
     third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \
@@ -2112,7 +2110,6 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc \
-    third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_file.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc \
diff --git a/config.m4 b/config.m4
index 672e7101589a9..ef7992b933fb8 100644
--- a/config.m4
+++ b/config.m4
@@ -1034,6 +1034,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/address_sorting/address_sorting.c \
     third_party/address_sorting/address_sorting_posix.c \
     third_party/address_sorting/address_sorting_windows.c \
+    third_party/boringssl-with-bazel/err_data.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c \
     third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c \
@@ -1124,8 +1125,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/evp/evp.c \
     third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c \
-    third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c \
-    third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c \
     third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c \
@@ -1267,7 +1266,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \
-    third_party/boringssl-with-bazel/src/gen/crypto/err_data.c \
     third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \
@@ -1289,7 +1287,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc \
-    third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_file.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc \
     third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc \
@@ -1636,6 +1633,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/time/internal/cctz/src)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/types)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/address_sorting)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/asn1)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/base64)
@@ -1678,7 +1676,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/stack)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/trust_token)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/x509)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/gen/crypto)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/ssl)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util)
diff --git a/config.w32 b/config.w32
index c430f747c0a9a..a53546177d5fe 100644
--- a/config.w32
+++ b/config.w32
@@ -999,6 +999,7 @@ if (PHP_GRPC != "no") {
     "third_party\\address_sorting\\address_sorting.c " +
     "third_party\\address_sorting\\address_sorting_posix.c " +
     "third_party\\address_sorting\\address_sorting_windows.c " +
+    "third_party\\boringssl-with-bazel\\err_data.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bitstr.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bool.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_d2i_fp.c " +
@@ -1089,8 +1090,6 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_asn1.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_ctx.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh_asn1.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dsa_asn1.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec_asn1.c " +
@@ -1232,7 +1231,6 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_val.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509a.c " +
-    "third_party\\boringssl-with-bazel\\src\\gen\\crypto\\err_data.c " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\bio_ssl.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\d1_both.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\d1_lib.cc " +
@@ -1254,7 +1252,6 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_buffer.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cert.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cipher.cc " +
-    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_credential.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_file.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_key_share.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_lib.cc " +
@@ -1831,8 +1828,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\stack");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\trust_token");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\x509");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen\\crypto");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\ssl");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2\\re2");
diff --git a/grpc.gemspec b/grpc.gemspec
index 7104853d64fcd..7f25ada0e7c61 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -2451,6 +2451,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/address_sorting/address_sorting_posix.c )
   s.files += %w( third_party/address_sorting/address_sorting_windows.c )
   s.files += %w( third_party/address_sorting/include/address_sorting/address_sorting.h )
+  s.files += %w( third_party/boringssl-with-bazel/err_data.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c )
@@ -2556,8 +2557,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/internal.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c )
@@ -2728,6 +2727,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/address.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/internal.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/params.h )
@@ -2819,7 +2819,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_val.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/gen/crypto/err_data.c )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aead.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aes.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h )
@@ -2860,14 +2859,13 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp_errors.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/ex_data.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/experimental/kyber.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/experimental/spx.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hkdf.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hmac.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hpke.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hrss.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/is_boringssl.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/kdf.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/kyber.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/lhash.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/md4.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/md5.h )
@@ -2931,7 +2929,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc )
-  s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_file.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc )
diff --git a/package.xml b/package.xml
index 3cd01a878052d..9bcd9cdf1280b 100644
--- a/package.xml
+++ b/package.xml
@@ -2455,6 +2455,7 @@
     <file baseinstalldir="/" name="third_party/address_sorting/address_sorting_posix.c" role="src" />
     <file baseinstalldir="/" name="third_party/address_sorting/address_sorting_windows.c" role="src" />
     <file baseinstalldir="/" name="third_party/address_sorting/include/address_sorting/address_sorting.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/err_data.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c" role="src" />
@@ -2560,8 +2561,6 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c" role="src" />
@@ -2732,6 +2731,7 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/address.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/fors.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/fors.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/merkle.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/merkle.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/params.h" role="src" />
@@ -2823,7 +2823,6 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_val.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/gen/crypto/err_data.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/aead.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/aes.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h" role="src" />
@@ -2864,14 +2863,13 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/evp.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/evp_errors.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/ex_data.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/experimental/kyber.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/experimental/spx.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/hkdf.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/hmac.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/hpke.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/hrss.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/is_boringssl.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/kdf.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/kyber.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/lhash.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/md4.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/md5.h" role="src" />
@@ -2935,7 +2933,6 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_file.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc" role="src" />
diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec
index 34bb565a76ff6..1ac42a722fa78 100644
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
@@ -76,7 +76,7 @@ Pod::Spec.new do |s|
 
   s.source = {
     :git => 'https://github.com/google/boringssl.git',
-    :commit => "5a2bca2124800f2861263959b72bc35cdf18949b",
+    :commit => "ae72a4514c7afd150596b0a80947f3ca9b8363b5",
   }
 
   s.ios.deployment_target = '10.0'
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index a6e9be13ead37..98c364ed34a48 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -998,6 +998,7 @@
     'third_party/address_sorting/address_sorting.c',
     'third_party/address_sorting/address_sorting_posix.c',
     'third_party/address_sorting/address_sorting_windows.c',
+    'third_party/boringssl-with-bazel/err_data.c',
     'third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c',
     'third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c',
     'third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c',
@@ -1088,8 +1089,6 @@
     'third_party/boringssl-with-bazel/src/crypto/evp/evp.c',
     'third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c',
     'third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c',
-    'third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c',
-    'third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c',
     'third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c',
     'third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c',
     'third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c',
@@ -1231,7 +1230,6 @@
     'third_party/boringssl-with-bazel/src/crypto/x509/x_val.c',
     'third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c',
     'third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c',
-    'third_party/boringssl-with-bazel/src/gen/crypto/err_data.c',
     'third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc',
     'third_party/boringssl-with-bazel/src/ssl/d1_both.cc',
     'third_party/boringssl-with-bazel/src/ssl/d1_lib.cc',
@@ -1253,7 +1251,6 @@
     'third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc',
     'third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc',
     'third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc',
-    'third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc',
     'third_party/boringssl-with-bazel/src/ssl/ssl_file.cc',
     'third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc',
     'third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc',
@@ -1418,166 +1415,166 @@
 
 ASM_SOURCE_FILES = {
     'crypto_asm': [
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/chacha/chacha-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/aesv8-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/armv8-mont-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/bn-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/ghash-neon-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/ghashv8-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/p256-armv8-asm-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha256-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha512-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/vpaes-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-aarch64/crypto/test/trampoline-armv8-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/chacha/chacha-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/aesni-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/bn-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/co-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/ghash-ssse3-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/ghash-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/md5-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha1-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha256-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha512-586-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/vpaes-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/x86-mont-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86/crypto/test/trampoline-x86-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/chacha/chacha-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/aesni-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/ghash-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/md5-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/p256-x86_64-asm-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/rdrand-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/rsaz-avx2-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha1-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha256-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha512-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/vpaes-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/x86_64-mont-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/x86_64-mont5-apple.S',
+        'third_party/boringssl-with-bazel/apple-x86_64/crypto/test/trampoline-x86_64-apple.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/chacha/chacha-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/armv8-mont-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/bn-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghashv8-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/p256-armv8-asm-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha1-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha256-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha512-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/vpaes-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-aarch64/crypto/test/trampoline-armv8-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/chacha/chacha-armv4-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/aesv8-armv7-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/armv4-mont-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/bsaes-armv7-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghash-armv4-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghashv8-armv7-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha1-armv4-large-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha256-armv4-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha512-armv4-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/vpaes-armv7-linux.S',
+        'third_party/boringssl-with-bazel/linux-arm/crypto/test/trampoline-armv4-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/chacha/chacha-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/aesni-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/bn-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/co-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/ghash-ssse3-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/ghash-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/md5-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha1-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha256-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha512-586-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/vpaes-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/x86-mont-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86/crypto/test/trampoline-x86-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/chacha/chacha-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/ghash-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/md5-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/rdrand-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/rsaz-avx2-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha1-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha256-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha512-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/vpaes-x86_64-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont5-linux.S',
+        'third_party/boringssl-with-bazel/linux-x86_64/crypto/test/trampoline-x86_64-linux.S',
         'third_party/boringssl-with-bazel/src/crypto/curve25519/asm/x25519-asm-arm.S',
         'third_party/boringssl-with-bazel/src/crypto/hrss/asm/poly_rq_mul.S',
         'third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm_asm.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv7-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/armv4-mont-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bsaes-armv7-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/co-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/co-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-armv4-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv7-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv4-large-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv4-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv4-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv7-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv4-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv4-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-win.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-linux.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-apple.S',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-linux.S',
         'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_curve25519_adx_mul.S',
         'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_curve25519_adx_square.S',
         'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_p256_adx_mul.S',
         'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_p256_adx_sqr.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/chacha/chacha-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/aesv8-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/armv8-mont-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/bn-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/ghash-neon-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/ghashv8-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/p256-armv8-asm-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha1-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha256-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/vpaes-armv8-win.S',
+        'third_party/boringssl-with-bazel/win-aarch64/crypto/test/trampoline-armv8-win.S',
     ],
     'crypto_nasm': [
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/co-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-win.asm',
-        'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/chacha/chacha-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/aesni-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/bn-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/co-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-ssse3-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/md5-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha1-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha256-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha512-586-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/vpaes-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/x86-mont-win.asm',
+        'third_party/boringssl-with-bazel/win-x86/crypto/test/trampoline-x86-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/chacha/chacha-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/ghash-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/md5-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/p256-x86_64-asm-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/rdrand-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/rsaz-avx2-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha1-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha256-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha512-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/vpaes-x86_64-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont5-win.asm',
+        'third_party/boringssl-with-bazel/win-x86_64/crypto/test/trampoline-x86_64-win.asm',
     ],
 }
diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index 4577c6ddf4962..b6885b9790cec 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -333,4 +333,4 @@
 ]
 PROTO_INCLUDE='third_party/protobuf/src'
 
-PROTOBUF_SUBMODULE_VERSION="2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5"
+PROTOBUF_SUBMODULE_VERSION="7f94235e552599141950d7a4a3eaf93bc87d1b22"