Merge pull request grpc#13948 from matt-kwong/bsl

Update BoringSSL submodule
narzolliam · Jan 31, 2018 · 32b9bdd · 32b9bdd
2 parents 9c17817 + f2e99e9
commit 32b9bdd
Show file tree

Hide file tree

Showing 25 changed files with 8,489 additions and 8,271 deletions.
diff --git a/Makefile b/Makefile
diff --git a/build.yaml b/build.yaml
@@ -5063,6 +5063,7 @@ defaults:
  $(NO_W_EXTRA_SEMI)
  CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
  -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
+ CXXFLAGS: -fno-rtti -fno-exceptions
  global:
  COREFLAGS: -fno-rtti -fno-exceptions
  CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1

diff --git a/config.m4 b/config.m4
diff --git a/config.w32 b/config.w32
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
@@ -189,7 +189,7 @@ Pod::Spec.new do |s|
  ss.header_mappings_dir = '.'
  ss.libraries = 'z'
  ss.dependency "#{s.name}/Interface", version
- ss.dependency 'BoringSSL', '~> 9.0'
+ ss.dependency 'BoringSSL', '~> 10.0'
  ss.dependency 'nanopb', '~> 0.3'
 
  # To save you from scrolling, this is the last part of the podspec.

diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/grpc.gyp b/grpc.gyp
diff --git a/package.xml b/package.xml
diff --git a/setup.py b/setup.py
@@ -165,7 +165,8 @@
  # TODO(zyc): Re-enble c-ares on x64 and x86 windows after fixing the
  # ares_library_init compilation issue
  DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1), ('CARES_STATICLIB', 1),
- ('GRPC_ARES', 0), ('NTDDI_VERSION', 0x06000000),)
+ ('GRPC_ARES', 0), ('NTDDI_VERSION', 0x06000000),
+ ('NOMINMAX', 1),)
  if '64bit' in platform.architecture()[0]:
  DEFINE_MACROS += (('MS_WIN64', 1),)
  elif sys.version_info >= (3, 5):

diff --git a/src/boringssl/crypto_test_data.cc b/src/boringssl/crypto_test_data.cc