Merge pull request #20100 from jtattermusch/update_boringssl

Update boringssl and boringssl-with-bazel to latest master
5 years ago · aba7f7bd2b
parent 2d80e830c0 675732cb29
commit aba7f7bd2b
22 changed files with 8133 additions and 6170 deletions
--- a/60
+++ b/60
@ -7740,6 +7740,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 \
@ -7750,7 +7751,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 \
@ -7771,7 +7771,8 @@ 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/ec_extra/ec_derive.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 \
@ -7786,14 +7787,18 @@ LIBBORINGSSL_SRC = \
    third_party/boringssl/crypto/evp/p_ed25519_asn1.c \
    third_party/boringssl/crypto/evp/p_rsa.c \
    third_party/boringssl/crypto/evp/p_rsa_asn1.c \
+    third_party/boringssl/crypto/evp/p_x25519.c \
+    third_party/boringssl/crypto/evp/p_x25519_asn1.c \
    third_party/boringssl/crypto/evp/pbkdf.c \
    third_party/boringssl/crypto/evp/print.c \
    third_party/boringssl/crypto/evp/scrypt.c \
    third_party/boringssl/crypto/evp/sign.c \
    third_party/boringssl/crypto/ex_data.c \
    third_party/boringssl/crypto/fipsmodule/bcm.c \
+    third_party/boringssl/crypto/fipsmodule/fips_shared_support.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 \
@ -7824,6 +7829,8 @@ 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/siphash/siphash.c \
    third_party/boringssl/crypto/stack/stack.c \
    third_party/boringssl/crypto/thread.c \
    third_party/boringssl/crypto/thread_none.c \
@ -7900,6 +7907,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 \
@ -7911,7 +7919,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 \
@ -7978,6 +7985,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 += \

@ -20163,8 +20171,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))))
@ -20195,10 +20205,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-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)
@ -20210,6 +20224,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 \
@ -20221,13 +20236,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 \
@ -20238,24 +20254,34 @@ 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/siphash/siphash_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 \

@ -20289,6 +20315,8 @@ $(BORINGSSL_CRYPTO_TEST_OBJS): CXXFLAGS += -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
@ -20311,6 +20339,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
@ -20323,7 +20353,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

@ -20345,18 +20375,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
@ -20367,12 +20407,20 @@ $(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/siphash/siphash_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
@ -20381,6 +20429,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
@ -100,10 +100,9 @@ def grpc_deps():
    if "boringssl" not in native.existing_rules():
        http_archive(
            name = "boringssl",
-            # 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/83da28a68f32023fd3b95a8ae94991a07b1f6c62.tar.gz",
        )

    if "zlib" not in native.existing_rules():
--- a/config.m4
+++ b/config.m4
@ -515,6 +515,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 \
@ -525,7 +526,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 \
@ -546,7 +546,8 @@ 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/ec_extra/ec_derive.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 \
@ -561,14 +562,18 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/evp/p_ed25519_asn1.c \
    third_party/boringssl/crypto/evp/p_rsa.c \
    third_party/boringssl/crypto/evp/p_rsa_asn1.c \
+    third_party/boringssl/crypto/evp/p_x25519.c \
+    third_party/boringssl/crypto/evp/p_x25519_asn1.c \
    third_party/boringssl/crypto/evp/pbkdf.c \
    third_party/boringssl/crypto/evp/print.c \
    third_party/boringssl/crypto/evp/scrypt.c \
    third_party/boringssl/crypto/evp/sign.c \
    third_party/boringssl/crypto/ex_data.c \
    third_party/boringssl/crypto/fipsmodule/bcm.c \
+    third_party/boringssl/crypto/fipsmodule/fips_shared_support.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 \
@ -599,6 +604,8 @@ 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/siphash/siphash.c \
    third_party/boringssl/crypto/stack/stack.c \
    third_party/boringssl/crypto/thread.c \
    third_party/boringssl/crypto/thread_none.c \
@ -675,6 +682,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 \
@ -686,7 +694,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 \
@ -841,13 +848,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)
@ -858,6 +866,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rand_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rc4)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/rsa_extra)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/siphash)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/stack)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509v3)
--- a/config.w32
+++ b/config.w32
@ -485,6 +485,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 " +
@ -495,7 +496,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 " +
@ -516,7 +516,8 @@ 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\\ec_extra\\ec_derive.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 " +
@ -531,14 +532,18 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\evp\\p_ed25519_asn1.c " +
    "third_party\\boringssl\\crypto\\evp\\p_rsa.c " +
    "third_party\\boringssl\\crypto\\evp\\p_rsa_asn1.c " +
+    "third_party\\boringssl\\crypto\\evp\\p_x25519.c " +
+    "third_party\\boringssl\\crypto\\evp\\p_x25519_asn1.c " +
    "third_party\\boringssl\\crypto\\evp\\pbkdf.c " +
    "third_party\\boringssl\\crypto\\evp\\print.c " +
    "third_party\\boringssl\\crypto\\evp\\scrypt.c " +
    "third_party\\boringssl\\crypto\\evp\\sign.c " +
    "third_party\\boringssl\\crypto\\ex_data.c " +
    "third_party\\boringssl\\crypto\\fipsmodule\\bcm.c " +
+    "third_party\\boringssl\\crypto\\fipsmodule\\fips_shared_support.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 " +
@ -569,6 +574,8 @@ 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\\siphash\\siphash.c " +
    "third_party\\boringssl\\crypto\\stack\\stack.c " +
    "third_party\\boringssl\\crypto\\thread.c " +
    "third_party\\boringssl\\crypto\\thread_none.c " +
@ -645,6 +652,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 " +
@ -656,7 +664,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 " +
@ -868,13 +875,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");
@ -885,6 +893,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rand_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rc4");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\rsa_extra");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\siphash");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\stack");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509v3");
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -900,9 +900,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 )
@ -916,8 +918,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 )
@ -945,21 +949,25 @@ 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 )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cfb.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ctr.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/gcm.c )
@ -976,12 +984,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 )
@ -992,6 +1002,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 )
@ -1020,6 +1031,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 )
@ -1030,9 +1042,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 )
@ -1055,6 +1067,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/rsa.h )
  s.files += %w( third_party/boringssl/include/openssl/safestack.h )
  s.files += %w( third_party/boringssl/include/openssl/sha.h )
+  s.files += %w( third_party/boringssl/include/openssl/siphash.h )
  s.files += %w( third_party/boringssl/include/openssl/span.h )
  s.files += %w( third_party/boringssl/include/openssl/srtp.h )
  s.files += %w( third_party/boringssl/include/openssl/ssl.h )
@ -1067,9 +1080,13 @@ 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( 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 )
@ -1119,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 )
@ -1129,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 )
@ -1150,7 +1167,8 @@ 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/ec_extra/ec_derive.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 )
@ -1165,14 +1183,18 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/evp/p_ed25519_asn1.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_rsa.c )
  s.files += %w( third_party/boringssl/crypto/evp/p_rsa_asn1.c )
+  s.files += %w( third_party/boringssl/crypto/evp/p_x25519.c )
+  s.files += %w( third_party/boringssl/crypto/evp/p_x25519_asn1.c )
  s.files += %w( third_party/boringssl/crypto/evp/pbkdf.c )
  s.files += %w( third_party/boringssl/crypto/evp/print.c )
  s.files += %w( third_party/boringssl/crypto/evp/scrypt.c )
  s.files += %w( third_party/boringssl/crypto/evp/sign.c )
  s.files += %w( third_party/boringssl/crypto/ex_data.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bcm.c )
+  s.files += %w( third_party/boringssl/crypto/fipsmodule/fips_shared_support.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 )
@ -1203,6 +1225,8 @@ 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/siphash/siphash.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 )
@ -1279,6 +1303,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 )
@ -1290,7 +1315,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 )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -1987,6 +1987,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',
@ -1997,7 +1998,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',
@ -2018,7 +2018,8 @@
        '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/ec_extra/ec_derive.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',
@ -2033,14 +2034,18 @@
        'third_party/boringssl/crypto/evp/p_ed25519_asn1.c',
        'third_party/boringssl/crypto/evp/p_rsa.c',
        'third_party/boringssl/crypto/evp/p_rsa_asn1.c',
+        'third_party/boringssl/crypto/evp/p_x25519.c',
+        'third_party/boringssl/crypto/evp/p_x25519_asn1.c',
        'third_party/boringssl/crypto/evp/pbkdf.c',
        'third_party/boringssl/crypto/evp/print.c',
        'third_party/boringssl/crypto/evp/scrypt.c',
        'third_party/boringssl/crypto/evp/sign.c',
        'third_party/boringssl/crypto/ex_data.c',
        'third_party/boringssl/crypto/fipsmodule/bcm.c',
+        'third_party/boringssl/crypto/fipsmodule/fips_shared_support.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',
@ -2071,6 +2076,8 @@
        '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/siphash/siphash.c',
        'third_party/boringssl/crypto/stack/stack.c',
        'third_party/boringssl/crypto/thread.c',
        'third_party/boringssl/crypto/thread_none.c',
@ -2147,6 +2154,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',
@ -2158,7 +2166,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',
@ -2206,6 +2213,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
@ -905,9 +905,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" />
@ -921,8 +923,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" />
@ -950,21 +954,25 @@
    <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" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/cfb.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/ctr.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/gcm.c" role="src" />
@ -981,12 +989,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" />
@ -997,6 +1007,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" />
@ -1025,6 +1036,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" />
@ -1035,9 +1047,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" />
@ -1060,6 +1072,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/rsa.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/safestack.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/sha.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/siphash.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/span.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/srtp.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/ssl.h" role="src" />
@ -1072,9 +1085,13 @@
    <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="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" />
@ -1124,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" />
@ -1134,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" />
@ -1155,7 +1172,8 @@
    <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/ec_extra/ec_derive.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" />
@ -1170,14 +1188,18 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_ed25519_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_rsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_rsa_asn1.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_x25519.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/p_x25519_asn1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/pbkdf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/print.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/scrypt.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/sign.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/ex_data.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bcm.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/fips_shared_support.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" />
@ -1208,6 +1230,8 @@
    <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/siphash/siphash.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" />
@ -1284,6 +1308,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" />
@ -1295,7 +1320,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" />
--- 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
@ -484,6 +484,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',
@ -494,7 +495,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',
@ -515,7 +515,8 @@ 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/ec_extra/ec_derive.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',
@ -530,14 +531,18 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/crypto/evp/p_ed25519_asn1.c',
    'third_party/boringssl/crypto/evp/p_rsa.c',
    'third_party/boringssl/crypto/evp/p_rsa_asn1.c',
+    'third_party/boringssl/crypto/evp/p_x25519.c',
+    'third_party/boringssl/crypto/evp/p_x25519_asn1.c',
    'third_party/boringssl/crypto/evp/pbkdf.c',
    'third_party/boringssl/crypto/evp/print.c',
    'third_party/boringssl/crypto/evp/scrypt.c',
    'third_party/boringssl/crypto/evp/sign.c',
    'third_party/boringssl/crypto/ex_data.c',
    'third_party/boringssl/crypto/fipsmodule/bcm.c',
+    'third_party/boringssl/crypto/fipsmodule/fips_shared_support.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',
@ -568,6 +573,8 @@ 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/siphash/siphash.c',
    'third_party/boringssl/crypto/stack/stack.c',
    'third_party/boringssl/crypto/thread.c',
    'third_party/boringssl/crypto/thread_none.c',
@ -644,6 +651,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',
@ -655,7 +663,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',
--- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template
+++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
--- a/third_party/boringssl
+++ b/third_party/boringssl
@ -1 +1 @@
-Subproject commit b29b21a81b32ec273f118f589f46d56ad3332420
+Subproject commit 7f02881e96e51f1873afcf384d02f782b48967ca
--- a/third_party/boringssl-with-bazel
+++ b/third_party/boringssl-with-bazel
@ -1 +1 @@
-Subproject commit afc30d43eef92979b05776ec0963c9cede5fb80f
+Subproject commit 83da28a68f32023fd3b95a8ae94991a07b1f6c62
--- a/tools/buildgen/plugins/grpc_shadow_boringssl.py
+++ b/tools/buildgen/plugins/grpc_shadow_boringssl.py
@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Buldigen generate grpc_shadow_boringssl headers
+"""Buildgen generate grpc_shadow_boringssl headers
 This script takes the list of symbols from
 src/objective-c/grpc_shadow_boringssl_symbols and populate them in
 settings.grpc_shadow_boringssl_symbols
@ -24,7 +24,7 @@ def mako_plugin(dictionary):
    # Remove trailing '\n'
    symbols = [s.strip() for s in symbols]
    # Remove comments
-    symbols = [s for s in symbols if s[0] != '#']
+    symbols = [s for s in symbols if len(s) > 0 and s[0] != '#']
    # Remove the commit number
    del symbols[0]

--- a/tools/distrib/check_shadow_boringssl_symbol_list.sh
+++ b/tools/distrib/check_shadow_boringssl_symbol_list.sh
@ -27,6 +27,6 @@ symbol_list="../../src/objective-c/grpc_shadow_boringssl_symbol_list"
 ver1=$(git submodule |grep "boringssl " | awk '{print $1}' | head -n 1)
 ver2=$(cat $boringssl_podspec_original | grep ':commit =>' | sed -E 's/.*"(.*)".*/\1/g')
 ver3=$(cat $symbol_list | sed -n '2 p')
-[ $ver1 == $ver2 ] && [ $ver1 == $ver3 ] || { echo "BoringSSL podspec (src/objective-c/BoringSSL.podspec), BoringSSL submodule (third_party/boringssl), and BoringSSL symbol list (src/objective-c/grpc_shadow_boringssl_symbol_list) commit do not match." ; echo "BoringSSL podspec: $ver1" ; echo "BoringSSL submodule: $ver2" ; echo "BoringSSL symbol list: $ver3" ; exit 1 ; }
+[ $ver1 == $ver2 ] && [ $ver1 == $ver3 ] || { echo "BoringSSL submodule (third_party/boringssl), BoringSSL podspec (src/objective-c/BoringSSL.podspec), and BoringSSL symbol list (src/objective-c/grpc_shadow_boringssl_symbol_list) commit do not match." ; echo "BoringSSL submodule: $ver1" ; echo "BoringSSL podspec: $ver2" ;  echo "BoringSSL symbol list: $ver3" ; exit 1 ; }

 exit 0
--- a/tools/internal_ci/helper_scripts/prepare_build_windows.bat
+++ b/tools/internal_ci/helper_scripts/prepare_build_windows.bat
@ -35,6 +35,10 @@ python -m pip install google-api-python-client
 powershell -File src\csharp\install_dotnet_sdk.ps1
 set PATH=%LOCALAPPDATA%\Microsoft\dotnet;%PATH%

+@rem Newest version of Go is required to be able to build boringssl with cmake
+@rem TODO(jtattermusch): try to eliminate the dependency on Go
+choco install golang -y --version 1.13.1 --limit-output
+
@rem Disable some unwanted dotnet options
 set NUGET_XMLDOC_MODE=skip
 set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
--- a/tools/internal_ci/windows/grpc_build_artifacts.bat
+++ b/tools/internal_ci/windows/grpc_build_artifacts.bat
@ -20,6 +20,10 @@ rename C:\Python35_32bit Python35_32bits
 rename C:\Python36_32bit Python36_32bits
 rename C:\Python37_32bit Python37_32bits

+@rem Boringssl build no longer supports yasm
+choco uninstall yasm -y --limit-output
+choco install nasm -y --limit-output
+
@rem enter repo root
 cd /d %~dp0\..\..\..

--- a/tools/run_tests/artifacts/artifact_targets.py
+++ b/tools/run_tests/artifacts/artifact_targets.py
@ -153,6 +153,13 @@ class PythonArtifact:
            environ['GRPC_BUILD_GRPCIO_TOOLS_DEPENDENTS'] = 'TRUE'
            environ['GRPC_BUILD_MANYLINUX_WHEEL'] = 'TRUE'

+            if self.platform == 'manylinux1':
+                # manylinux1 currently has too old version of gcc
+                # so we need to use this workaround to avoid
+                # the "SSE2 instruction set not enabled" boringssl build error
+                # https://gcc.gnu.org/ml/gcc-patches/2013-04/msg00740.html
+                environ['CFLAGS'] += ' -msse2'
+
            return create_docker_jobspec(
                self.name,
                'tools/dockerfile/grpc_artifact_python_%s_%s' % (self.platform,
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -29,8 +29,8 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
 74d91756c11bc22f9b0108b94da9326f7f9e376f third_party/abseil-cpp (74d9175)
 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0)
 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
- b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable)
- afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e)
+ 7f02881e96e51f1873afcf384d02f782b48967ca third_party/boringssl (remotes/origin/HEAD)
+ 83da28a68f32023fd3b95a8ae94991a07b1f6c62 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel)
 e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0)
 c181f78882e54c0e5c63f332562ef6954ee7932f third_party/envoy-api (heads/master)
 28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81)