regenerate

5 years ago · 4a539ffb7c
parent df12f443f4
commit 4a539ffb7c
13 changed files with 6680 additions and 4867 deletions
--- a/57
+++ b/57
@ -7759,6 +7759,7 @@ LIBBORINGSSL_SRC = \
    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/bytestring/unicode.c \
    third_party/boringssl/crypto/chacha/chacha.c \
    third_party/boringssl/crypto/cipher_extra/cipher_extra.c \
    third_party/boringssl/crypto/cipher_extra/derive_key.c \
@ -7769,7 +7770,6 @@ LIBBORINGSSL_SRC = \
    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 \
@ -7790,7 +7790,7 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/crypto/dsa/dsa.c \
    third_party/boringssl/crypto/dsa/dsa_asn1.c \
    third_party/boringssl/crypto/ec_extra/ec_asn1.c \
-    third_party/boringssl/crypto/ecdh/ecdh.c \
+    third_party/boringssl/crypto/ecdh_extra/ecdh_extra.c \
    third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c \
    third_party/boringssl/crypto/engine/engine.c \
    third_party/boringssl/crypto/err/err.c \
@ -7813,6 +7813,7 @@ LIBBORINGSSL_SRC = \
    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/hrss/hrss.c \
    third_party/boringssl/crypto/lhash/lhash.c \
    third_party/boringssl/crypto/mem.c \
    third_party/boringssl/crypto/obj/obj.c \
@ -7843,6 +7844,7 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/crypto/refcount_c11.c \
    third_party/boringssl/crypto/refcount_lock.c \
    third_party/boringssl/crypto/rsa_extra/rsa_asn1.c \
+    third_party/boringssl/crypto/rsa_extra/rsa_print.c \
    third_party/boringssl/crypto/stack/stack.c \
    third_party/boringssl/crypto/thread.c \
    third_party/boringssl/crypto/thread_none.c \
@ -7919,6 +7921,7 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/crypto/x509v3/v3_int.c \
    third_party/boringssl/crypto/x509v3/v3_lib.c \
    third_party/boringssl/crypto/x509v3/v3_ncons.c \
+    third_party/boringssl/crypto/x509v3/v3_ocsp.c \
    third_party/boringssl/crypto/x509v3/v3_pci.c \
    third_party/boringssl/crypto/x509v3/v3_pcia.c \
    third_party/boringssl/crypto/x509v3/v3_pcons.c \
@ -7930,7 +7933,6 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/crypto/x509v3/v3_sxnet.c \
    third_party/boringssl/crypto/x509v3/v3_utl.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 \
@ -7967,6 +7969,11 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/ssl/tls_method.cc \
    third_party/boringssl/ssl/tls_record.cc \
    third_party/boringssl/third_party/fiat/curve25519.c \
+    third_party/boringssl/third_party/sike/P503.c \
+    third_party/boringssl/third_party/sike/asm/fp_generic.c \
+    third_party/boringssl/third_party/sike/fpx.c \
+    third_party/boringssl/third_party/sike/isogeny.c \
+    third_party/boringssl/third_party/sike/sike.c \

 PUBLIC_HEADERS_C += \

@ -7997,6 +8004,7 @@ LIBBORINGSSL_TEST_UTIL_SRC = \
    third_party/boringssl/crypto/test/file_test.cc \
    third_party/boringssl/crypto/test/malloc.cc \
    third_party/boringssl/crypto/test/test_util.cc \
+    third_party/boringssl/crypto/test/wycheproof_util.cc \

 PUBLIC_HEADERS_CXX += \

@ -20168,8 +20176,10 @@ endif


 BORINGSSL_SSL_TEST_SRC = \
+    third_party/boringssl/crypto/test/abi_test.cc \
    third_party/boringssl/crypto/test/gtest_main.cc \
    third_party/boringssl/ssl/span_test.cc \
+    third_party/boringssl/ssl/ssl_c_test.c \
    third_party/boringssl/ssl/ssl_test.cc \

 BORINGSSL_SSL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BORINGSSL_SSL_TEST_SRC))))
@ -20200,10 +20210,14 @@ endif
 $(BORINGSSL_SSL_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
 $(BORINGSSL_SSL_TEST_OBJS): CXXFLAGS += -fno-rtti -fno-exceptions
 $(BORINGSSL_SSL_TEST_OBJS): CFLAGS += -g
+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/test/abi_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/test/gtest_main.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/ssl/span_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/ssl/ssl_c_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/ssl/ssl_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 deps_boringssl_ssl_test: $(BORINGSSL_SSL_TEST_OBJS:.o=.dep)
@ -20215,6 +20229,7 @@ endif

 BORINGSSL_CRYPTO_TEST_SRC = \
    src/boringssl/crypto_test_data.cc \
+    third_party/boringssl/crypto/abi_self_test.cc \
    third_party/boringssl/crypto/asn1/asn1_test.cc \
    third_party/boringssl/crypto/base64/base64_test.cc \
    third_party/boringssl/crypto/bio/bio_test.cc \
@ -20226,13 +20241,14 @@ BORINGSSL_CRYPTO_TEST_SRC = \
    third_party/boringssl/crypto/cmac/cmac_test.cc \
    third_party/boringssl/crypto/compiler_test.cc \
    third_party/boringssl/crypto/constant_time_test.cc \
+    third_party/boringssl/crypto/cpu-arm-linux_test.cc \
    third_party/boringssl/crypto/curve25519/ed25519_test.cc \
    third_party/boringssl/crypto/curve25519/spake25519_test.cc \
    third_party/boringssl/crypto/curve25519/x25519_test.cc \
    third_party/boringssl/crypto/dh/dh_test.cc \
    third_party/boringssl/crypto/digest_extra/digest_test.cc \
    third_party/boringssl/crypto/dsa/dsa_test.cc \
-    third_party/boringssl/crypto/ecdh/ecdh_test.cc \
+    third_party/boringssl/crypto/ecdh_extra/ecdh_test.cc \
    third_party/boringssl/crypto/err/err_test.cc \
    third_party/boringssl/crypto/evp/evp_extra_test.cc \
    third_party/boringssl/crypto/evp/evp_test.cc \
@ -20243,24 +20259,33 @@ BORINGSSL_CRYPTO_TEST_SRC = \
    third_party/boringssl/crypto/fipsmodule/ec/ec_test.cc \
    third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64_test.cc \
    third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa_test.cc \
+    third_party/boringssl/crypto/fipsmodule/md5/md5_test.cc \
    third_party/boringssl/crypto/fipsmodule/modes/gcm_test.cc \
    third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg_test.cc \
+    third_party/boringssl/crypto/fipsmodule/sha/sha_test.cc \
    third_party/boringssl/crypto/hkdf/hkdf_test.cc \
    third_party/boringssl/crypto/hmac_extra/hmac_test.cc \
+    third_party/boringssl/crypto/hrss/hrss_test.cc \
+    third_party/boringssl/crypto/impl_dispatch_test.cc \
    third_party/boringssl/crypto/lhash/lhash_test.cc \
    third_party/boringssl/crypto/obj/obj_test.cc \
+    third_party/boringssl/crypto/pem/pem_test.cc \
    third_party/boringssl/crypto/pkcs7/pkcs7_test.cc \
    third_party/boringssl/crypto/pkcs8/pkcs12_test.cc \
    third_party/boringssl/crypto/pkcs8/pkcs8_test.cc \
    third_party/boringssl/crypto/poly1305/poly1305_test.cc \
    third_party/boringssl/crypto/pool/pool_test.cc \
+    third_party/boringssl/crypto/rand_extra/rand_test.cc \
    third_party/boringssl/crypto/refcount_test.cc \
    third_party/boringssl/crypto/rsa_extra/rsa_test.cc \
    third_party/boringssl/crypto/self_test.cc \
+    third_party/boringssl/crypto/stack/stack_test.cc \
+    third_party/boringssl/crypto/test/abi_test.cc \
    third_party/boringssl/crypto/test/file_test_gtest.cc \
    third_party/boringssl/crypto/test/gtest_main.cc \
    third_party/boringssl/crypto/thread_test.cc \
    third_party/boringssl/crypto/x509/x509_test.cc \
+    third_party/boringssl/crypto/x509/x509_time_test.cc \
    third_party/boringssl/crypto/x509v3/tab_test.cc \
    third_party/boringssl/crypto/x509v3/v3name_test.cc \

@ -20294,6 +20319,8 @@ $(BORINGSSL_CRYPTO_TEST_OBJS): CXXFLAGS += -fno-rtti -fno-exceptions
 $(BORINGSSL_CRYPTO_TEST_OBJS): CFLAGS += -g
 $(OBJDIR)/$(CONFIG)/src/boringssl/crypto_test_data.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/abi_self_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/asn1/asn1_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/base64/base64_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
@ -20316,6 +20343,8 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/compiler_test.o:  $(LIBDIR)/$(C

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/constant_time_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/cpu-arm-linux_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/curve25519/ed25519_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/curve25519/spake25519_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
@ -20328,7 +20357,7 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/digest_extra/digest_test.o:  $(

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/dsa/dsa_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

-$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/ecdh/ecdh_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/ecdh_extra/ecdh_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/err/err_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

@ -20350,18 +20379,28 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64_test.

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/md5/md5_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/modes/gcm_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/fipsmodule/sha/sha_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/hkdf/hkdf_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/hmac_extra/hmac_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/hrss/hrss_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/impl_dispatch_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/lhash/lhash_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/obj/obj_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/pem/pem_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/pkcs7/pkcs7_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/pkcs8/pkcs12_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
@ -20372,12 +20411,18 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/poly1305/poly1305_test.o:  $(LI

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/pool/pool_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/rand_extra/rand_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/refcount_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/rsa_extra/rsa_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/self_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/stack/stack_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/test/abi_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/test/file_test_gtest.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/test/gtest_main.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
@ -20386,6 +20431,8 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/thread_test.o:  $(LIBDIR)/$(CON

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/x509/x509_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

+$(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/x509/x509_time_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
+
 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/x509v3/tab_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a

 $(OBJDIR)/$(CONFIG)/third_party/boringssl/crypto/x509v3/v3name_test.o:  $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -104,7 +104,7 @@ def grpc_deps():
            # on the chromium-stable-with-bazel branch
            # NOTE: This URL generates a tarball containing dynamic date
            # information, so the sha256 is not consistent.
-            url = "https://boringssl.googlesource.com/boringssl/+archive/afc30d43eef92979b05776ec0963c9cede5fb80f.tar.gz",
+            url = "https://boringssl.googlesource.com/boringssl/+archive/a21f78d24bf645ccd6774b2c7e52e3c0514f7f29.tar.gz",
        )

    if "zlib" not in native.existing_rules():
--- a/config.m4
+++ b/config.m4
@ -513,6 +513,7 @@ if test "$PHP_GRPC" != "no"; then
    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/bytestring/unicode.c \
    third_party/boringssl/crypto/chacha/chacha.c \
    third_party/boringssl/crypto/cipher_extra/cipher_extra.c \
    third_party/boringssl/crypto/cipher_extra/derive_key.c \
@ -523,7 +524,6 @@ if test "$PHP_GRPC" != "no"; then
    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 \
@ -544,7 +544,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/dsa/dsa.c \
    third_party/boringssl/crypto/dsa/dsa_asn1.c \
    third_party/boringssl/crypto/ec_extra/ec_asn1.c \
-    third_party/boringssl/crypto/ecdh/ecdh.c \
+    third_party/boringssl/crypto/ecdh_extra/ecdh_extra.c \
    third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c \
    third_party/boringssl/crypto/engine/engine.c \
    third_party/boringssl/crypto/err/err.c \
@ -567,6 +567,7 @@ if test "$PHP_GRPC" != "no"; then
    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/hrss/hrss.c \
    third_party/boringssl/crypto/lhash/lhash.c \
    third_party/boringssl/crypto/mem.c \
    third_party/boringssl/crypto/obj/obj.c \
@ -597,6 +598,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/refcount_c11.c \
    third_party/boringssl/crypto/refcount_lock.c \
    third_party/boringssl/crypto/rsa_extra/rsa_asn1.c \
+    third_party/boringssl/crypto/rsa_extra/rsa_print.c \
    third_party/boringssl/crypto/stack/stack.c \
    third_party/boringssl/crypto/thread.c \
    third_party/boringssl/crypto/thread_none.c \
@ -673,6 +675,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/x509v3/v3_int.c \
    third_party/boringssl/crypto/x509v3/v3_lib.c \
    third_party/boringssl/crypto/x509v3/v3_ncons.c \
+    third_party/boringssl/crypto/x509v3/v3_ocsp.c \
    third_party/boringssl/crypto/x509v3/v3_pci.c \
    third_party/boringssl/crypto/x509v3/v3_pcia.c \
    third_party/boringssl/crypto/x509v3/v3_pcons.c \
@ -684,7 +687,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/x509v3/v3_sxnet.c \
    third_party/boringssl/crypto/x509v3/v3_utl.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 \
@ -721,6 +723,11 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/ssl/tls_method.cc \
    third_party/boringssl/ssl/tls_record.cc \
    third_party/boringssl/third_party/fiat/curve25519.c \
+    third_party/boringssl/third_party/sike/P503.c \
+    third_party/boringssl/third_party/sike/asm/fp_generic.c \
+    third_party/boringssl/third_party/sike/fpx.c \
+    third_party/boringssl/third_party/sike/isogeny.c \
+    third_party/boringssl/third_party/sike/sike.c \
    , $ext_shared, , -fvisibility=hidden \
    -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
    -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
@ -838,13 +845,14 @@ if test "$PHP_GRPC" != "no"; then
  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_extra)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ecdh)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/ecdh_extra)
  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/hrss)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/lhash)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/obj)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/pem)
@ -860,5 +868,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509v3)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/ssl)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/third_party/fiat)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/third_party/sike)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/third_party/sike/asm)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb)
 fi
--- a/config.w32
+++ b/config.w32
@ -483,6 +483,7 @@ if (PHP_GRPC != "no") {
    "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\\bytestring\\unicode.c " +
    "third_party\\boringssl\\crypto\\chacha\\chacha.c " +
    "third_party\\boringssl\\crypto\\cipher_extra\\cipher_extra.c " +
    "third_party\\boringssl\\crypto\\cipher_extra\\derive_key.c " +
@ -493,7 +494,6 @@ if (PHP_GRPC != "no") {
    "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 " +
@ -514,7 +514,7 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\dsa\\dsa.c " +
    "third_party\\boringssl\\crypto\\dsa\\dsa_asn1.c " +
    "third_party\\boringssl\\crypto\\ec_extra\\ec_asn1.c " +
-    "third_party\\boringssl\\crypto\\ecdh\\ecdh.c " +
+    "third_party\\boringssl\\crypto\\ecdh_extra\\ecdh_extra.c " +
    "third_party\\boringssl\\crypto\\ecdsa_extra\\ecdsa_asn1.c " +
    "third_party\\boringssl\\crypto\\engine\\engine.c " +
    "third_party\\boringssl\\crypto\\err\\err.c " +
@ -537,6 +537,7 @@ if (PHP_GRPC != "no") {
    "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\\hrss\\hrss.c " +
    "third_party\\boringssl\\crypto\\lhash\\lhash.c " +
    "third_party\\boringssl\\crypto\\mem.c " +
    "third_party\\boringssl\\crypto\\obj\\obj.c " +
@ -567,6 +568,7 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\refcount_c11.c " +
    "third_party\\boringssl\\crypto\\refcount_lock.c " +
    "third_party\\boringssl\\crypto\\rsa_extra\\rsa_asn1.c " +
+    "third_party\\boringssl\\crypto\\rsa_extra\\rsa_print.c " +
    "third_party\\boringssl\\crypto\\stack\\stack.c " +
    "third_party\\boringssl\\crypto\\thread.c " +
    "third_party\\boringssl\\crypto\\thread_none.c " +
@ -643,6 +645,7 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\x509v3\\v3_int.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_lib.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_ncons.c " +
+    "third_party\\boringssl\\crypto\\x509v3\\v3_ocsp.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_pci.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_pcia.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_pcons.c " +
@ -654,7 +657,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\x509v3\\v3_sxnet.c " +
    "third_party\\boringssl\\crypto\\x509v3\\v3_utl.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 " +
@ -691,6 +693,11 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\ssl\\tls_method.cc " +
    "third_party\\boringssl\\ssl\\tls_record.cc " +
    "third_party\\boringssl\\third_party\\fiat\\curve25519.c " +
+    "third_party\\boringssl\\third_party\\sike\\P503.c " +
+    "third_party\\boringssl\\third_party\\sike\\asm\\fp_generic.c " +
+    "third_party\\boringssl\\third_party\\sike\\fpx.c " +
+    "third_party\\boringssl\\third_party\\sike\\isogeny.c " +
+    "third_party\\boringssl\\third_party\\sike\\sike.c " +
    "third_party\\zlib\\adler32.c " +
    "third_party\\zlib\\compress.c " +
    "third_party\\zlib\\crc32.c " +
@ -865,13 +872,14 @@ if (PHP_GRPC != "no") {
  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_extra");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ecdh");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\ecdh_extra");
  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\\hrss");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\lhash");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\obj");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\pem");
@ -888,6 +896,8 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\ssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party\\fiat");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party\\sike");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party\\sike\\asm");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\zlib");
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -896,9 +896,11 @@ Gem::Specification.new do |s|
  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/bytestring/internal.h )
+  s.files += %w( third_party/boringssl/crypto/chacha/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/cpu-arm-linux.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/aes.c )
@ -912,8 +914,10 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/cmp.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/ctx.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/div.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/div_extra.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/gcd.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/gcd_extra.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/generic.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/jacobi.c )
@ -941,18 +945,23 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_key.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/felem.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/oct.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p224-64.c )
  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.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/scalar.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/simple.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/simple_mul.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/util.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/wnaf.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/ecdh/ecdh.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/hmac/hmac.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/md4/md4.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/md5/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/md5/md5.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cbc.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ccm.c )
@ -972,12 +981,14 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/self_check/self_check.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha256.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha512.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/tls/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/tls/kdf.c )
+  s.files += %w( third_party/boringssl/crypto/hrss/internal.h )
  s.files += %w( third_party/boringssl/crypto/internal.h )
  s.files += %w( third_party/boringssl/crypto/obj/obj_dat.h )
  s.files += %w( third_party/boringssl/crypto/pkcs7/internal.h )
@ -988,6 +999,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/x509/internal.h )
  s.files += %w( third_party/boringssl/crypto/x509/vpm_int.h )
  s.files += %w( third_party/boringssl/crypto/x509v3/ext_dat.h )
+  s.files += %w( third_party/boringssl/crypto/x509v3/internal.h )
  s.files += %w( third_party/boringssl/crypto/x509v3/pcy_int.h )
  s.files += %w( third_party/boringssl/include/openssl/aead.h )
  s.files += %w( third_party/boringssl/include/openssl/aes.h )
@ -1016,6 +1028,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/digest.h )
  s.files += %w( third_party/boringssl/include/openssl/dsa.h )
  s.files += %w( third_party/boringssl/include/openssl/dtls1.h )
+  s.files += %w( third_party/boringssl/include/openssl/e_os2.h )
  s.files += %w( third_party/boringssl/include/openssl/ec.h )
  s.files += %w( third_party/boringssl/include/openssl/ec_key.h )
  s.files += %w( third_party/boringssl/include/openssl/ecdh.h )
@ -1026,9 +1039,9 @@ 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/hrss.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 )
  s.files += %w( third_party/boringssl/include/openssl/md5.h )
  s.files += %w( third_party/boringssl/include/openssl/mem.h )
@ -1063,9 +1076,17 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/x509_vfy.h )
  s.files += %w( third_party/boringssl/include/openssl/x509v3.h )
  s.files += %w( third_party/boringssl/ssl/internal.h )
+  s.files += %w( third_party/boringssl/third_party/fiat/curve25519_32.h )
+  s.files += %w( third_party/boringssl/third_party/fiat/curve25519_64.h )
  s.files += %w( third_party/boringssl/third_party/fiat/curve25519_tables.h )
  s.files += %w( third_party/boringssl/third_party/fiat/internal.h )
  s.files += %w( third_party/boringssl/third_party/fiat/p256.c )
+  s.files += %w( third_party/boringssl/third_party/fiat/p256_32.h )
+  s.files += %w( third_party/boringssl/third_party/fiat/p256_64.h )
+  s.files += %w( third_party/boringssl/third_party/sike/fpx.h )
+  s.files += %w( third_party/boringssl/third_party/sike/isogeny.h )
+  s.files += %w( third_party/boringssl/third_party/sike/sike.h )
+  s.files += %w( third_party/boringssl/third_party/sike/utils.h )
  s.files += %w( src/boringssl/err_data.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bitstr.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bool.c )
@ -1115,6 +1136,7 @@ Gem::Specification.new do |s|
  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/bytestring/unicode.c )
  s.files += %w( third_party/boringssl/crypto/chacha/chacha.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 )
@ -1125,7 +1147,6 @@ Gem::Specification.new do |s|
  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 )
@ -1146,7 +1167,7 @@ Gem::Specification.new do |s|
  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_extra/ec_asn1.c )
-  s.files += %w( third_party/boringssl/crypto/ecdh/ecdh.c )
+  s.files += %w( third_party/boringssl/crypto/ecdh_extra/ecdh_extra.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 )
@ -1169,6 +1190,7 @@ Gem::Specification.new do |s|
  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/hrss/hrss.c )
  s.files += %w( third_party/boringssl/crypto/lhash/lhash.c )
  s.files += %w( third_party/boringssl/crypto/mem.c )
  s.files += %w( third_party/boringssl/crypto/obj/obj.c )
@ -1199,6 +1221,7 @@ Gem::Specification.new do |s|
  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_extra/rsa_asn1.c )
+  s.files += %w( third_party/boringssl/crypto/rsa_extra/rsa_print.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 )
@ -1275,6 +1298,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_int.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_lib.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_ncons.c )
+  s.files += %w( third_party/boringssl/crypto/x509v3/v3_ocsp.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_pci.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_pcia.c )
  s.files += %w( third_party/boringssl/crypto/x509v3/v3_pcons.c )
@ -1286,7 +1310,6 @@ Gem::Specification.new do |s|
  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.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 )
@ -1323,6 +1346,11 @@ Gem::Specification.new do |s|
  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/boringssl/third_party/fiat/curve25519.c )
+  s.files += %w( third_party/boringssl/third_party/sike/P503.c )
+  s.files += %w( third_party/boringssl/third_party/sike/asm/fp_generic.c )
+  s.files += %w( third_party/boringssl/third_party/sike/fpx.c )
+  s.files += %w( third_party/boringssl/third_party/sike/isogeny.c )
+  s.files += %w( third_party/boringssl/third_party/sike/sike.c )
  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
@ -2007,6 +2007,7 @@
        '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/bytestring/unicode.c',
        'third_party/boringssl/crypto/chacha/chacha.c',
        'third_party/boringssl/crypto/cipher_extra/cipher_extra.c',
        'third_party/boringssl/crypto/cipher_extra/derive_key.c',
@ -2017,7 +2018,6 @@
        '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',
@ -2038,7 +2038,7 @@
        'third_party/boringssl/crypto/dsa/dsa.c',
        'third_party/boringssl/crypto/dsa/dsa_asn1.c',
        'third_party/boringssl/crypto/ec_extra/ec_asn1.c',
-        'third_party/boringssl/crypto/ecdh/ecdh.c',
+        'third_party/boringssl/crypto/ecdh_extra/ecdh_extra.c',
        'third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c',
        'third_party/boringssl/crypto/engine/engine.c',
        'third_party/boringssl/crypto/err/err.c',
@ -2061,6 +2061,7 @@
        '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/hrss/hrss.c',
        'third_party/boringssl/crypto/lhash/lhash.c',
        'third_party/boringssl/crypto/mem.c',
        'third_party/boringssl/crypto/obj/obj.c',
@ -2091,6 +2092,7 @@
        'third_party/boringssl/crypto/refcount_c11.c',
        'third_party/boringssl/crypto/refcount_lock.c',
        'third_party/boringssl/crypto/rsa_extra/rsa_asn1.c',
+        'third_party/boringssl/crypto/rsa_extra/rsa_print.c',
        'third_party/boringssl/crypto/stack/stack.c',
        'third_party/boringssl/crypto/thread.c',
        'third_party/boringssl/crypto/thread_none.c',
@ -2167,6 +2169,7 @@
        'third_party/boringssl/crypto/x509v3/v3_int.c',
        'third_party/boringssl/crypto/x509v3/v3_lib.c',
        'third_party/boringssl/crypto/x509v3/v3_ncons.c',
+        'third_party/boringssl/crypto/x509v3/v3_ocsp.c',
        'third_party/boringssl/crypto/x509v3/v3_pci.c',
        'third_party/boringssl/crypto/x509v3/v3_pcia.c',
        'third_party/boringssl/crypto/x509v3/v3_pcons.c',
@ -2178,7 +2181,6 @@
        'third_party/boringssl/crypto/x509v3/v3_sxnet.c',
        'third_party/boringssl/crypto/x509v3/v3_utl.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',
@ -2215,6 +2217,11 @@
        'third_party/boringssl/ssl/tls_method.cc',
        'third_party/boringssl/ssl/tls_record.cc',
        'third_party/boringssl/third_party/fiat/curve25519.c',
+        'third_party/boringssl/third_party/sike/P503.c',
+        'third_party/boringssl/third_party/sike/asm/fp_generic.c',
+        'third_party/boringssl/third_party/sike/fpx.c',
+        'third_party/boringssl/third_party/sike/isogeny.c',
+        'third_party/boringssl/third_party/sike/sike.c',
      ],
    },
    {
@ -2226,6 +2233,7 @@
        'third_party/boringssl/crypto/test/file_test.cc',
        'third_party/boringssl/crypto/test/malloc.cc',
        'third_party/boringssl/crypto/test/test_util.cc',
+        'third_party/boringssl/crypto/test/wycheproof_util.cc',
      ],
    },
    {
--- a/package.xml
+++ b/package.xml
@ -901,9 +901,11 @@
    <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/bytestring/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/chacha/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/cpu-arm-linux.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/aes.c" role="src" />
@ -917,8 +919,10 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/cmp.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/ctx.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/div.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/div_extra.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/gcd.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/gcd_extra.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/generic.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/jacobi.c" role="src" />
@ -946,18 +950,23 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec_key.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/felem.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/oct.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p224-64.c" 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.c" 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/ec/scalar.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/simple.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/simple_mul.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/util.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/wnaf.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ecdh/ecdh.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/hmac/hmac.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/md4/md4.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/md5/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/md5/md5.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/cbc.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/ccm.c" role="src" />
@ -977,12 +986,14 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/rsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/self_check/self_check.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha256.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha512.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/tls/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/tls/kdf.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/hrss/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/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" />
@ -993,6 +1004,7 @@
    <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" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/ext_dat.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/pcy_int.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/aead.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/aes.h" role="src" />
@ -1021,6 +1033,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/digest.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/dsa.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/dtls1.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/e_os2.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ec.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ec_key.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ecdh.h" role="src" />
@ -1031,9 +1044,9 @@
    <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/hrss.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" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/md5.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/mem.h" role="src" />
@ -1068,9 +1081,17 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/x509_vfy.h" role="src" />
    <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="third_party/boringssl/third_party/fiat/curve25519_32.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/curve25519_64.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/curve25519_tables.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/p256.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/p256_32.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/p256_64.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/fpx.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/isogeny.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/sike.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/utils.h" role="src" />
    <file baseinstalldir="/" name="src/boringssl/err_data.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" />
@ -1120,6 +1141,7 @@
    <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/bytestring/unicode.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/chacha/chacha.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" />
@ -1130,7 +1152,6 @@
    <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" />
@ -1151,7 +1172,7 @@
    <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_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/ecdh_extra/ecdh_extra.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" />
@ -1174,6 +1195,7 @@
    <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/hrss/hrss.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/lhash/lhash.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/mem.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/obj/obj.c" role="src" />
@ -1204,6 +1226,7 @@
    <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_extra/rsa_asn1.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/rsa_extra/rsa_print.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" />
@ -1280,6 +1303,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_int.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_lib.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_ncons.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_ocsp.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_pci.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_pcia.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/x509v3/v3_pcons.c" role="src" />
@ -1291,7 +1315,6 @@
    <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.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" />
@ -1328,6 +1351,11 @@
    <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/boringssl/third_party/fiat/curve25519.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/P503.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/asm/fp_generic.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/fpx.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/isogeny.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/third_party/sike/sike.c" 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/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/core/tsi/grpc_shadow_boringssl.h
+++ b/src/core/tsi/grpc_shadow_boringssl.h
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
--- a/src/objective-c/grpc_shadow_boringssl_symbol_list
+++ b/src/objective-c/grpc_shadow_boringssl_symbol_list
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -482,6 +482,7 @@ CORE_SOURCE_FILES = [
    '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/bytestring/unicode.c',
    'third_party/boringssl/crypto/chacha/chacha.c',
    'third_party/boringssl/crypto/cipher_extra/cipher_extra.c',
    'third_party/boringssl/crypto/cipher_extra/derive_key.c',
@ -492,7 +493,6 @@ CORE_SOURCE_FILES = [
    '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',
@ -513,7 +513,7 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/dsa/dsa.c',
    'third_party/boringssl/crypto/dsa/dsa_asn1.c',
    'third_party/boringssl/crypto/ec_extra/ec_asn1.c',
-    'third_party/boringssl/crypto/ecdh/ecdh.c',
+    'third_party/boringssl/crypto/ecdh_extra/ecdh_extra.c',
    'third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c',
    'third_party/boringssl/crypto/engine/engine.c',
    'third_party/boringssl/crypto/err/err.c',
@ -536,6 +536,7 @@ CORE_SOURCE_FILES = [
    '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/hrss/hrss.c',
    'third_party/boringssl/crypto/lhash/lhash.c',
    'third_party/boringssl/crypto/mem.c',
    'third_party/boringssl/crypto/obj/obj.c',
@ -566,6 +567,7 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/refcount_c11.c',
    'third_party/boringssl/crypto/refcount_lock.c',
    'third_party/boringssl/crypto/rsa_extra/rsa_asn1.c',
+    'third_party/boringssl/crypto/rsa_extra/rsa_print.c',
    'third_party/boringssl/crypto/stack/stack.c',
    'third_party/boringssl/crypto/thread.c',
    'third_party/boringssl/crypto/thread_none.c',
@ -642,6 +644,7 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/x509v3/v3_int.c',
    'third_party/boringssl/crypto/x509v3/v3_lib.c',
    'third_party/boringssl/crypto/x509v3/v3_ncons.c',
+    'third_party/boringssl/crypto/x509v3/v3_ocsp.c',
    'third_party/boringssl/crypto/x509v3/v3_pci.c',
    'third_party/boringssl/crypto/x509v3/v3_pcia.c',
    'third_party/boringssl/crypto/x509v3/v3_pcons.c',
@ -653,7 +656,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/x509v3/v3_sxnet.c',
    'third_party/boringssl/crypto/x509v3/v3_utl.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',
@ -690,6 +692,11 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/ssl/tls_method.cc',
    'third_party/boringssl/ssl/tls_record.cc',
    'third_party/boringssl/third_party/fiat/curve25519.c',
+    'third_party/boringssl/third_party/sike/P503.c',
+    'third_party/boringssl/third_party/sike/asm/fp_generic.c',
+    'third_party/boringssl/third_party/sike/fpx.c',
+    'third_party/boringssl/third_party/sike/isogeny.c',
+    'third_party/boringssl/third_party/sike/sike.c',
    'third_party/zlib/adler32.c',
    'third_party/zlib/compress.c',
    'third_party/zlib/crc32.c',