From 9b5b5be3e2692e36bbb9bdf05dabfbe230c7195c Mon Sep 17 00:00:00 2001 From: Srini Polavarapu Date: Fri, 14 Aug 2020 18:33:42 -0700 Subject: [PATCH] regenerate files --- Makefile | 4 ++++ config.m4 | 2 ++ config.w32 | 2 ++ grpc.gemspec | 2 ++ grpc.gyp | 1 + package.xml | 2 ++ src/objective-c/BoringSSL-GRPC.podspec | 2 +- src/python/grpcio/grpc_core_dependencies.py | 1 + 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dd61842d777..5d20e282683 100644 --- a/Makefile +++ b/Makefile @@ -5960,6 +5960,7 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c \ third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c \ third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c \ + third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c \ third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c \ third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c \ third_party/boringssl-with-bazel/src/crypto/mem.c \ @@ -19420,6 +19421,7 @@ BORINGSSL_CRYPTO_TEST_SRC = \ third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha_test.cc \ third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf_test.cc \ third_party/boringssl-with-bazel/src/crypto/hmac_extra/hmac_test.cc \ + third_party/boringssl-with-bazel/src/crypto/hpke/hpke_test.cc \ third_party/boringssl-with-bazel/src/crypto/hrss/hrss_test.cc \ third_party/boringssl-with-bazel/src/crypto/impl_dispatch_test.cc \ third_party/boringssl-with-bazel/src/crypto/lhash/lhash_test.cc \ @@ -19550,6 +19552,8 @@ $(OBJDIR)/$(CONFIG)/third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf_test.o $(OBJDIR)/$(CONFIG)/third_party/boringssl-with-bazel/src/crypto/hmac_extra/hmac_test.o: $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a +$(OBJDIR)/$(CONFIG)/third_party/boringssl-with-bazel/src/crypto/hpke/hpke_test.o: $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a + $(OBJDIR)/$(CONFIG)/third_party/boringssl-with-bazel/src/crypto/hrss/hrss_test.o: $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(OBJDIR)/$(CONFIG)/third_party/boringssl-with-bazel/src/crypto/impl_dispatch_test.o: $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a diff --git a/config.m4 b/config.m4 index f6f0b7df063..68098a6eddf 100644 --- a/config.m4 +++ b/config.m4 @@ -700,6 +700,7 @@ if test "$PHP_GRPC" != "no"; then third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c \ third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c \ third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c \ + third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c \ third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c \ third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c \ third_party/boringssl-with-bazel/src/crypto/mem.c \ @@ -1047,6 +1048,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/evp) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/fipsmodule) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/hkdf) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/hpke) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/hrss) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/lhash) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/obj) diff --git a/config.w32 b/config.w32 index 4c40d56ebbf..44abe47a3f1 100644 --- a/config.w32 +++ b/config.w32 @@ -668,6 +668,7 @@ if (PHP_GRPC != "no") { "third_party\\boringssl-with-bazel\\src\\crypto\\fipsmodule\\fips_shared_support.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\fipsmodule\\is_fips.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\hkdf\\hkdf.c " + + "third_party\\boringssl-with-bazel\\src\\crypto\\hpke\\hpke.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\hrss\\hrss.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\lhash\\lhash.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\mem.c " + @@ -1102,6 +1103,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\evp"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\fipsmodule"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\hkdf"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\hpke"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\hrss"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\lhash"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\obj"); diff --git a/grpc.gemspec b/grpc.gemspec index d8fa1bce506..4060a7ef09b 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1419,6 +1419,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/tls/internal.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/tls/kdf.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c ) + s.files += %w( third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c ) + s.files += %w( third_party/boringssl-with-bazel/src/crypto/hpke/internal.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/hrss/internal.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/internal.h ) diff --git a/grpc.gyp b/grpc.gyp index d5b9709c35b..efee6feb949 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -1679,6 +1679,7 @@ 'third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c', 'third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c', 'third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c', + 'third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c', 'third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c', 'third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c', 'third_party/boringssl-with-bazel/src/crypto/mem.c', diff --git a/package.xml b/package.xml index a2ae3c6a1c2..fc26c837c46 100644 --- a/package.xml +++ b/package.xml @@ -1421,6 +1421,8 @@ + + diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 6b99e192935..d25d986c5cc 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -76,7 +76,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/google/boringssl.git', - :commit => "e8a935e323510419e0b37638716f6df4dcbbe6f6", + :commit => "412844d75b14b9090b58423fd5f5ed8c2fd80212", } s.ios.deployment_target = '7.0' diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 17e1d557f28..88cd4d7e0c8 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -667,6 +667,7 @@ CORE_SOURCE_FILES = [ 'third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c', 'third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c', 'third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c', + 'third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c', 'third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c', 'third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c', 'third_party/boringssl-with-bazel/src/crypto/mem.c',