[Deps] Update boringssl 202308211007 (#34115)

Part of gRPC release
1 year ago · 650c2ea492
parent 8725f4c100
commit 650c2ea492
15 changed files with 544 additions and 738 deletions
--- a/5
+++ b/5
@ -2791,6 +2791,7 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl-with-bazel/src/crypto/bio/bio.c \
    third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c \
    third_party/boringssl-with-bazel/src/crypto/bio/connect.c \
+    third_party/boringssl-with-bazel/src/crypto/bio/errno.c \
    third_party/boringssl-with-bazel/src/crypto/bio/fd.c \
    third_party/boringssl-with-bazel/src/crypto/bio/file.c \
    third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c \
@ -2821,15 +2822,13 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.c \
    third_party/boringssl-with-bazel/src/crypto/conf/conf.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c \
+    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_arm.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_intel.c \
    third_party/boringssl-with-bazel/src/crypto/crypto.c \
    third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c \
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -220,11 +220,11 @@ def grpc_deps():
            name = "boringssl",
            # Use github mirror instead of https://boringssl.googlesource.com/boringssl
            # to obtain a boringssl archive with consistent sha256
-            sha256 = "0675a4f86ce5e959703425d6f9063eaadf6b61b7f3399e77a154c0e85bad46b1",
-            strip_prefix = "boringssl-342e805bc1f5dfdd650e3f031686d6c939b095d9",
+            sha256 = "b21994a857a7aa6d5256ffe355c735ad4c286de44c6c81dfc04edc41a8feaeef",
+            strip_prefix = "boringssl-2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz",
-                "https://github.com/google/boringssl/archive/342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b.tar.gz",
+                "https://github.com/google/boringssl/archive/2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b.tar.gz",
            ],
        )

--- a/config.m4
+++ b/config.m4
@ -1030,6 +1030,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/crypto/bio/bio.c \
    third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c \
    third_party/boringssl-with-bazel/src/crypto/bio/connect.c \
+    third_party/boringssl-with-bazel/src/crypto/bio/errno.c \
    third_party/boringssl-with-bazel/src/crypto/bio/fd.c \
    third_party/boringssl-with-bazel/src/crypto/bio/file.c \
    third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c \
@ -1060,15 +1061,13 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.c \
    third_party/boringssl-with-bazel/src/crypto/conf/conf.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c \
+    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_arm.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c \
-    third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c \
    third_party/boringssl-with-bazel/src/crypto/cpu_intel.c \
    third_party/boringssl-with-bazel/src/crypto/crypto.c \
    third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c \
--- a/config.w32
+++ b/config.w32
@ -995,6 +995,7 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\bio.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\bio_mem.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\connect.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\errno.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\fd.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\file.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\bio\\hexdump.c " +
@ -1025,15 +1026,13 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\crypto\\cipher_extra\\tls_cbc.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\conf\\conf.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_apple.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_freebsd.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_fuchsia.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_linux.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_openbsd.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_sysreg.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_aarch64_win.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_arm.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_arm_freebsd.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_arm_linux.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_arm_openbsd.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\cpu_intel.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\crypto.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\curve25519\\curve25519.c " +
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -183,7 +183,7 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.libraries = 'z'
    ss.dependency "#{s.name}/Interface", version
-    ss.dependency 'BoringSSL-GRPC', '0.0.30'
+    ss.dependency 'BoringSSL-GRPC', '0.0.31'
    ss.dependency 'abseil/algorithm/container', abseil_version
    ss.dependency 'abseil/base/base', abseil_version
    ss.dependency 'abseil/base/core_headers', abseil_version
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -2206,6 +2206,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/bio.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/connect.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/errno.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/fd.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/file.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c )
@ -2242,16 +2243,14 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/conf/conf_def.h )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/conf/internal.h )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_arm.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/cpu_intel.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/crypto.c )
  s.files += %w( third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -2278,6 +2278,7 @@
        'third_party/boringssl-with-bazel/src/crypto/bio/bio.c',
        'third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c',
        'third_party/boringssl-with-bazel/src/crypto/bio/connect.c',
+        'third_party/boringssl-with-bazel/src/crypto/bio/errno.c',
        'third_party/boringssl-with-bazel/src/crypto/bio/fd.c',
        'third_party/boringssl-with-bazel/src/crypto/bio/file.c',
        'third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c',
@ -2308,15 +2309,13 @@
        'third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.c',
        'third_party/boringssl-with-bazel/src/crypto/conf/conf.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c',
-        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c',
+        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c',
-        'third_party/boringssl-with-bazel/src/crypto/cpu_arm.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c',
-        'third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c',
        'third_party/boringssl-with-bazel/src/crypto/cpu_intel.c',
        'third_party/boringssl-with-bazel/src/crypto/crypto.c',
        'third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c',
--- a/package.xml
+++ b/package.xml
@ -2210,6 +2210,7 @@
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/bio.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/connect.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/errno.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/fd.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/file.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c" role="src" />
@ -2246,16 +2247,14 @@
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/conf/conf_def.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/conf/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_arm.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/cpu_intel.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/crypto.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c" role="src" />
--- a/src/boringssl/boringssl_prefix_symbols.h
+++ b/src/boringssl/boringssl_prefix_symbols.h
@ -1,4 +1,4 @@
-// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 342e805bc1f5dfdd650e3f031686d6c939b095d9
+// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b

 // Copyright (c) 2018, Google Inc.
 //
@ -1632,6 +1632,7 @@
 #define EVP_HPKE_KEY_generate BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_generate)
 #define EVP_HPKE_KEY_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_init)
 #define EVP_HPKE_KEY_kem BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_kem)
+#define EVP_HPKE_KEY_move BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_move)
 #define EVP_HPKE_KEY_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_new)
 #define EVP_HPKE_KEY_private_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_private_key)
 #define EVP_HPKE_KEY_public_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_KEY_public_key)
@ -2940,10 +2941,11 @@
 #define asn1_utctime_to_tm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_utctime_to_tm)
 #define beeu_mod_inverse_vartime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, beeu_mod_inverse_vartime)
 #define bio_clear_socket_error BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_clear_socket_error)
-#define bio_fd_should_retry BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_fd_should_retry)
+#define bio_errno_should_retry BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_errno_should_retry)
 #define bio_ip_and_port_to_socket_and_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_ip_and_port_to_socket_and_addr)
 #define bio_sock_error BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_sock_error)
 #define bio_socket_nbio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_socket_nbio)
+#define bio_socket_should_retry BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_socket_should_retry)
 #define bn_abs_sub_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_abs_sub_consttime)
 #define bn_add_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_add_words)
 #define bn_assert_fits_in_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_assert_fits_in_bytes)
@ -3153,6 +3155,7 @@
 #define d2i_X509_VAL BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_VAL)
 #define d2i_X509_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_bio)
 #define d2i_X509_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_fp)
+#define dh_check_params_fast BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, dh_check_params_fast)
 #define dh_compute_key_padded_no_self_test BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, dh_compute_key_padded_no_self_test)
 #define dsa_asn1_meth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, dsa_asn1_meth)
 #define dsa_check_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, dsa_check_key)
@ -3484,6 +3487,7 @@
 #define sk_num BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_num)
 #define sk_pop BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop)
 #define sk_pop_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop_free)
+#define sk_pop_free_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop_free_ex)
 #define sk_push BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_push)
 #define sk_value BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_value)
 #define v2i_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAME)
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -994,6 +994,7 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl-with-bazel/src/crypto/bio/bio.c',
    'third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c',
    'third_party/boringssl-with-bazel/src/crypto/bio/connect.c',
+    'third_party/boringssl-with-bazel/src/crypto/bio/errno.c',
    'third_party/boringssl-with-bazel/src/crypto/bio/fd.c',
    'third_party/boringssl-with-bazel/src/crypto/bio/file.c',
    'third_party/boringssl-with-bazel/src/crypto/bio/hexdump.c',
@ -1024,15 +1025,13 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.c',
    'third_party/boringssl-with-bazel/src/crypto/conf/conf.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c',
-    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.c',
+    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.c',
-    'third_party/boringssl-with-bazel/src/crypto/cpu_arm.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.c',
-    'third_party/boringssl-with-bazel/src/crypto/cpu_arm_openbsd.c',
    'third_party/boringssl-with-bazel/src/crypto/cpu_intel.c',
    'third_party/boringssl-with-bazel/src/crypto/crypto.c',
    'third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c',
@ -1367,74 +1366,6 @@ CORE_SOURCE_FILES = [
 ]

 ASM_SOURCE_FILES = {
-    'crypto_apple_aarch64': [
-        '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',
-    ],
-    'crypto_apple_arm': [
-        'third_party/boringssl-with-bazel/apple-arm/crypto/chacha/chacha-armv4-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/aesv8-armv7-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/armv4-mont-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/bsaes-armv7-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/ghash-armv4-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/ghashv8-armv7-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/sha1-armv4-large-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/sha256-armv4-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/sha512-armv4-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/fipsmodule/vpaes-armv7-apple.S',
-        'third_party/boringssl-with-bazel/apple-arm/crypto/test/trampoline-armv4-apple.S',
-    ],
-    'crypto_apple_x86': [
-        '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',
-    ],
-    'crypto_apple_x86_64': [
-        '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/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',
-    ],
    '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',
@ -1573,77 +1504,6 @@ ASM_SOURCE_FILES = {
        '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_linux_aarch64': [
-        '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',
-    ],
-    'crypto_linux_arm': [
-        '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/src/crypto/curve25519/asm/x25519-asm-arm.S',
-        'third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm_asm.S',
-    ],
-    'crypto_linux_x86': [
-        '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',
-    ],
-    'crypto_linux_x86_64': [
-        '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/hrss/asm/poly_rq_mul.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',
-    ],
    'crypto_nasm': [
        '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',
@ -1678,57 +1538,4 @@ ASM_SOURCE_FILES = {
        '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',
    ],
-    'crypto_win_aarch64': [
-        '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_win_x86': [
-        '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',
-    ],
-    'crypto_win_x86_64': [
-        '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',
-    ],
 }
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -189,7 +189,7 @@
      ss.header_mappings_dir = '.'
      ss.libraries = 'z'
      ss.dependency "#{s.name}/Interface", version
-      ss.dependency 'BoringSSL-GRPC', '0.0.30'
+      ss.dependency 'BoringSSL-GRPC', '0.0.31'
      % for abseil_spec in grpc_abseil_specs:
      ss.dependency '${abseil_spec}', abseil_version
      % endfor
--- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template
+++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
@ -69,7 +69,7 @@

  Pod::Spec.new do |s|
    s.name     = 'BoringSSL-GRPC'
-    version = '0.0.30'
+    version = '0.0.31'
    s.version  = version
    s.summary  = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
    # Adapted from the homepage:
--- a/third_party/boringssl-with-bazel
+++ b/third_party/boringssl-with-bazel
@ -1 +1 @@
-Subproject commit 342e805bc1f5dfdd650e3f031686d6c939b095d9
+Subproject commit 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -28,7 +28,7 @@ cat <<EOF | sort >"$want_submodules"
 third_party/abseil-cpp 29bf8085f3bf17b84d30e34b3d7ff8248fda404e
 third_party/benchmark 015d1a091af6937488242b70121858bce8fd40e9
 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
-third_party/boringssl-with-bazel 342e805bc1f5dfdd650e3f031686d6c939b095d9
+third_party/boringssl-with-bazel 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b
 third_party/cares/cares 6360e96b5cf8e5980c887ce58ef727e53d77243a
 third_party/envoy-api e53e7bbd012f81965f2e79848ad9a58ceb67201f
 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92