Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BoringSSL] Update third_party/boringssl-with-bazel (#35842)

Browse Source 
Closes #35842

PiperOrigin-RevId: 605091673
pull/35847/head
Eugene Ostroukhov 10 months ago committed by Copybara-Service
parent 6028810942
commit c968d1a56a
9 changed files with 536 additions and 529 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      bazel/grpc_deps.bzl
  2. 2
      gRPC-Core.podspec
  3. 1
      setup.py
  4. 7
      src/boringssl/boringssl_prefix_symbols.h
  5. 1039
      src/objective-c/BoringSSL-GRPC.podspec
  6. 2
      templates/gRPC-Core.podspec.template
  7. 2
      templates/src/objective-c/BoringSSL-GRPC.podspec.template
  8. 2
      third_party/boringssl-with-bazel
  9. 2
      tools/run_tests/sanity/check_submodules.sh

8
bazel/grpc_deps.bzl
Unescape View File

@ -240,11 +240,11 @@ def grpc_deps():
name = "boringssl", name = "boringssl",
# Use github mirror instead of https://boringssl.googlesource.com/boringssl # Use github mirror instead of https://boringssl.googlesource.com/boringssl
# to obtain a boringssl archive with consistent sha256 # to obtain a boringssl archive with consistent sha256
sha256 = "057f662b0e85931a84945b2e89ba201fd44b0583da827c948fe443593690fb83", sha256 = "c21ac7356f885189959b7f8b3df5fcc65e54098bfae323396fbb467205c64030",
strip_prefix = "boringssl-ae72a4514c7afd150596b0a80947f3ca9b8363b5", strip_prefix = "boringssl-311e6f6d8e77da1f64c3256b30bd1992a555ce6c",
urls = [ urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz", "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz",
"https://github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz", "https://github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz",
], ],
) )

2
gRPC-Core.podspec generated
Unescape View File

@ -195,7 +195,7 @@ Pod::Spec.new do |s|
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.32' ss.dependency 'BoringSSL-GRPC', '0.0.33'
ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/algorithm/container', abseil_version
ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/base/config', abseil_version ss.dependency 'abseil/base/config', abseil_version

1
setup.py
Unescape View File

@ -393,6 +393,7 @@ if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL:
if BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM if BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM
else sysconfig.get_platform() else sysconfig.get_platform()
) )
EXTRA_COMPILE_ARGS.append("-msse2")
# BoringSSL's gas-compatible assembly files are all internally conditioned # BoringSSL's gas-compatible assembly files are all internally conditioned
# by the preprocessor. Provided the platform has a gas-compatible assembler # by the preprocessor. Provided the platform has a gas-compatible assembler
# (i.e. not Windows), we can include the assembly files and let BoringSSL # (i.e. not Windows), we can include the assembly files and let BoringSSL

7
src/boringssl/boringssl_prefix_symbols.h
Unescape View File

@ -1,4 +1,4 @@
// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: ae72a4514c7afd150596b0a80947f3ca9b8363b5 // generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 311e6f6d8e77da1f64c3256b30bd1992a555ce6c
// Copyright (c) 2018, Google Inc. // Copyright (c) 2018, Google Inc.
// //
@ -1285,12 +1285,17 @@
#define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x) #define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x)
#define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3) #define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3)
#define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt) #define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt)
#define DES_ecb3_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt_ex)
#define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt) #define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt)
#define DES_ecb_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt_ex)
#define DES_ede2_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede2_cbc_encrypt) #define DES_ede2_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede2_cbc_encrypt)
#define DES_ede3_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt) #define DES_ede3_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt)
#define DES_ede3_cbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt_ex)
#define DES_encrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_encrypt3) #define DES_encrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_encrypt3)
#define DES_ncbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt) #define DES_ncbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt)
#define DES_ncbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt_ex)
#define DES_set_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key) #define DES_set_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key)
#define DES_set_key_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_ex)
#define DES_set_key_unchecked BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_unchecked) #define DES_set_key_unchecked BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_unchecked)
#define DES_set_odd_parity BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_odd_parity) #define DES_set_odd_parity BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_odd_parity)
#define DH_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DH_bits) #define DH_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DH_bits)

1039
src/objective-c/BoringSSL-GRPC.podspec
View File

File diff suppressed because it is too large Load Diff

2
templates/gRPC-Core.podspec.template
Unescape View File

@ -198,7 +198,7 @@
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.32' ss.dependency 'BoringSSL-GRPC', '0.0.33'
% for abseil_spec in grpc_abseil_specs: % for abseil_spec in grpc_abseil_specs:
ss.dependency '${abseil_spec}', abseil_version ss.dependency '${abseil_spec}', abseil_version
% endfor % endfor

2
templates/src/objective-c/BoringSSL-GRPC.podspec.template
Unescape View File

@ -70,7 +70,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL-GRPC' s.name = 'BoringSSL-GRPC'
version = '0.0.32' version = '0.0.33'
s.version = version s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
# Adapted from the homepage: # Adapted from the homepage:

2
third_party/boringssl-with-bazel vendored

@ -1 +1 @@
Subproject commit ae72a4514c7afd150596b0a80947f3ca9b8363b5 Subproject commit 311e6f6d8e77da1f64c3256b30bd1992a555ce6c

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -28,7 +28,7 @@ cat <<EOF | sort >"$want_submodules"
third_party/abseil-cpp 4a2c63365eff8823a5221db86ef490e828306f9d third_party/abseil-cpp 4a2c63365eff8823a5221db86ef490e828306f9d
third_party/benchmark 344117638c8ff7e239044fd0fa7085839fc03021 third_party/benchmark 344117638c8ff7e239044fd0fa7085839fc03021
third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
third_party/boringssl-with-bazel ae72a4514c7afd150596b0a80947f3ca9b8363b5 third_party/boringssl-with-bazel 311e6f6d8e77da1f64c3256b30bd1992a555ce6c
third_party/cares/cares 6360e96b5cf8e5980c887ce58ef727e53d77243a third_party/cares/cares 6360e96b5cf8e5980c887ce58ef727e53d77243a
third_party/envoy-api 78f198cf96ecdc7120ef640406770aa01af775c4 third_party/envoy-api 78f198cf96ecdc7120ef640406770aa01af775c4
third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92

Write Preview
Loading…
Cancel
Save