Fix ObjC sike issue and update BoringSSL to master

pull/20100/head
Muxi Yan 5 years ago
parent 1ff2226619
commit 64b7febefa
  1. 6
      Makefile
  2. 8
      config.m4
  3. 8
      config.w32
  4. 10
      grpc.gemspec
  5. 6
      grpc.gyp
  6. 10
      package.xml
  7. 283
      src/boringssl/crypto_test_data.cc
  8. 38
      src/core/tsi/grpc_shadow_boringssl.h
  9. 43
      src/objective-c/BoringSSL-GRPC.podspec
  10. 40
      src/objective-c/grpc_shadow_boringssl_symbol_list
  11. 6
      src/python/grpcio/grpc_core_dependencies.py
  12. 5
      templates/src/objective-c/BoringSSL-GRPC.podspec.template
  13. 2
      third_party/boringssl
  14. 4
      tools/run_tests/sanity/check_submodules.sh

@ -7790,6 +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/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 \
@ -7973,11 +7974,6 @@ 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/asm/fp_generic.c \
third_party/boringssl/third_party/sike/curve_params.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 += \

@ -544,6 +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/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 \
@ -727,11 +728,6 @@ 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/asm/fp_generic.c \
third_party/boringssl/third_party/sike/curve_params.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 \
@ -873,7 +869,5 @@ 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

@ -514,6 +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\\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 " +
@ -697,11 +698,6 @@ 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\\asm\\fp_generic.c " +
"third_party\\boringssl\\third_party\\sike\\curve_params.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 " +
@ -901,8 +897,6 @@ 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");

@ -1083,10 +1083,6 @@ Gem::Specification.new do |s|
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 )
@ -1167,6 +1163,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/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 )
@ -1350,11 +1347,6 @@ 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/asm/fp_generic.c )
s.files += %w( third_party/boringssl/third_party/sike/curve_params.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 )

@ -2038,6 +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/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',
@ -2221,11 +2222,6 @@
'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/asm/fp_generic.c',
'third_party/boringssl/third_party/sike/curve_params.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',
],
},
{

@ -1088,10 +1088,6 @@
<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" />
@ -1172,6 +1168,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/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" />
@ -1355,11 +1352,6 @@
<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/asm/fp_generic.c" role="src" />
<file baseinstalldir="/" name="third_party/boringssl/third_party/sike/curve_params.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" />

File diff suppressed because one or more lines are too long

@ -752,6 +752,7 @@
#define EC_GROUP_set_point_conversion_form GRPC_SHADOW_EC_GROUP_set_point_conversion_form
#define EC_KEY_check_fips GRPC_SHADOW_EC_KEY_check_fips
#define EC_KEY_check_key GRPC_SHADOW_EC_KEY_check_key
#define EC_KEY_derive_from_secret GRPC_SHADOW_EC_KEY_derive_from_secret
#define EC_KEY_dup GRPC_SHADOW_EC_KEY_dup
#define EC_KEY_free GRPC_SHADOW_EC_KEY_free
#define EC_KEY_generate_key GRPC_SHADOW_EC_KEY_generate_key
@ -1519,9 +1520,6 @@
#define SHA512_Init GRPC_SHADOW_SHA512_Init
#define SHA512_Transform GRPC_SHADOW_SHA512_Transform
#define SHA512_Update GRPC_SHADOW_SHA512_Update
#define SIKE_decaps GRPC_SHADOW_SIKE_decaps
#define SIKE_encaps GRPC_SHADOW_SIKE_encaps
#define SIKE_keypair GRPC_SHADOW_SIKE_keypair
#define SIPHASH_24 GRPC_SHADOW_SIPHASH_24
#define SPAKE2_CTX_free GRPC_SHADOW_SPAKE2_CTX_free
#define SPAKE2_CTX_new GRPC_SHADOW_SPAKE2_CTX_new
@ -1821,6 +1819,8 @@
#define SSL_get_ivs GRPC_SHADOW_SSL_get_ivs
#define SSL_get_key_block_len GRPC_SHADOW_SSL_get_key_block_len
#define SSL_get_max_cert_list GRPC_SHADOW_SSL_get_max_cert_list
#define SSL_get_max_proto_version GRPC_SHADOW_SSL_get_max_proto_version
#define SSL_get_min_proto_version GRPC_SHADOW_SSL_get_min_proto_version
#define SSL_get_mode GRPC_SHADOW_SSL_get_mode
#define SSL_get_negotiated_token_binding_param GRPC_SHADOW_SSL_get_negotiated_token_binding_param
#define SSL_get_options GRPC_SHADOW_SSL_get_options
@ -2658,6 +2658,8 @@
#define bn_lcm_consttime GRPC_SHADOW_bn_lcm_consttime
#define bn_less_than_montgomery_R GRPC_SHADOW_bn_less_than_montgomery_R
#define bn_less_than_words GRPC_SHADOW_bn_less_than_words
#define bn_miller_rabin_init GRPC_SHADOW_bn_miller_rabin_init
#define bn_miller_rabin_iteration GRPC_SHADOW_bn_miller_rabin_iteration
#define bn_minimal_width GRPC_SHADOW_bn_minimal_width
#define bn_mod_add_consttime GRPC_SHADOW_bn_mod_add_consttime
#define bn_mod_add_words GRPC_SHADOW_bn_mod_add_words
@ -2709,6 +2711,7 @@
#define bn_uadd_consttime GRPC_SHADOW_bn_uadd_consttime
#define bn_usub_consttime GRPC_SHADOW_bn_usub_consttime
#define bn_wexpand GRPC_SHADOW_bn_wexpand
#define boringssl_fips_self_test GRPC_SHADOW_boringssl_fips_self_test
#define c2i_ASN1_BIT_STRING GRPC_SHADOW_c2i_ASN1_BIT_STRING
#define c2i_ASN1_INTEGER GRPC_SHADOW_c2i_ASN1_INTEGER
#define c2i_ASN1_OBJECT GRPC_SHADOW_c2i_ASN1_OBJECT
@ -3131,35 +3134,6 @@
#define sha1_block_data_order GRPC_SHADOW_sha1_block_data_order
#define sha256_block_data_order GRPC_SHADOW_sha256_block_data_order
#define sha512_block_data_order GRPC_SHADOW_sha512_block_data_order
#define sike_cswap_asm GRPC_SHADOW_sike_cswap_asm
#define sike_eval_3_isog GRPC_SHADOW_sike_eval_3_isog
#define sike_eval_4_isog GRPC_SHADOW_sike_eval_4_isog
#define sike_fp2inv_mont GRPC_SHADOW_sike_fp2inv_mont
#define sike_fp2mul_mont GRPC_SHADOW_sike_fp2mul_mont
#define sike_fp2sqr_mont GRPC_SHADOW_sike_fp2sqr_mont
#define sike_fpadd GRPC_SHADOW_sike_fpadd
#define sike_fpcopy GRPC_SHADOW_sike_fpcopy
#define sike_fpcorrection GRPC_SHADOW_sike_fpcorrection
#define sike_fpdiv2 GRPC_SHADOW_sike_fpdiv2
#define sike_fpmul_mont GRPC_SHADOW_sike_fpmul_mont
#define sike_fpneg GRPC_SHADOW_sike_fpneg
#define sike_fprdc GRPC_SHADOW_sike_fprdc
#define sike_fpsub GRPC_SHADOW_sike_fpsub
#define sike_from_mont GRPC_SHADOW_sike_from_mont
#define sike_get_3_isog GRPC_SHADOW_sike_get_3_isog
#define sike_get_4_isog GRPC_SHADOW_sike_get_4_isog
#define sike_get_A GRPC_SHADOW_sike_get_A
#define sike_inv_3_way GRPC_SHADOW_sike_inv_3_way
#define sike_j_inv GRPC_SHADOW_sike_j_inv
#define sike_mpadd_asm GRPC_SHADOW_sike_mpadd_asm
#define sike_mpdblsubx2_asm GRPC_SHADOW_sike_mpdblsubx2_asm
#define sike_mpmul GRPC_SHADOW_sike_mpmul
#define sike_mpsubx2_asm GRPC_SHADOW_sike_mpsubx2_asm
#define sike_params GRPC_SHADOW_sike_params
#define sike_xDBLADD GRPC_SHADOW_sike_xDBLADD
#define sike_xDBLe GRPC_SHADOW_sike_xDBLe
#define sike_xTPL GRPC_SHADOW_sike_xTPL
#define sike_xTPLe GRPC_SHADOW_sike_xTPLe
#define sk_CRYPTO_BUFFER_call_copy_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_copy_func
#define sk_CRYPTO_BUFFER_call_copy_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_copy_func
#define sk_CRYPTO_BUFFER_call_free_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_free_func

@ -76,7 +76,7 @@ Pod::Spec.new do |s|
s.source = {
:git => 'https://github.com/google/boringssl.git',
:commit => "1458b49a9e53b0db0ad63e8ef3156214f1473d87",
:commit => "7f02881e96e51f1873afcf384d02f782b48967ca",
}
s.ios.deployment_target = '7.0'
@ -136,8 +136,7 @@ Pod::Spec.new do |s|
'ssl/**/*.h',
'*.h',
'crypto/*.h',
'crypto/**/*.h',
'third_party/sike/*.h'
'crypto/**/*.h'
# bcm.c includes other source files, creating duplicated symbols. Since it is not used, we
# explicitly exclude it from the pod.
# TODO (mxyan): Work with BoringSSL team to remove this hack.
@ -2344,6 +2343,7 @@ Pod::Spec.new do |s|
'#define EC_GROUP_set_point_conversion_form GRPC_SHADOW_EC_GROUP_set_point_conversion_form',
'#define EC_KEY_check_fips GRPC_SHADOW_EC_KEY_check_fips',
'#define EC_KEY_check_key GRPC_SHADOW_EC_KEY_check_key',
'#define EC_KEY_derive_from_secret GRPC_SHADOW_EC_KEY_derive_from_secret',
'#define EC_KEY_dup GRPC_SHADOW_EC_KEY_dup',
'#define EC_KEY_free GRPC_SHADOW_EC_KEY_free',
'#define EC_KEY_generate_key GRPC_SHADOW_EC_KEY_generate_key',
@ -3111,9 +3111,6 @@ Pod::Spec.new do |s|
'#define SHA512_Init GRPC_SHADOW_SHA512_Init',
'#define SHA512_Transform GRPC_SHADOW_SHA512_Transform',
'#define SHA512_Update GRPC_SHADOW_SHA512_Update',
'#define SIKE_decaps GRPC_SHADOW_SIKE_decaps',
'#define SIKE_encaps GRPC_SHADOW_SIKE_encaps',
'#define SIKE_keypair GRPC_SHADOW_SIKE_keypair',
'#define SIPHASH_24 GRPC_SHADOW_SIPHASH_24',
'#define SPAKE2_CTX_free GRPC_SHADOW_SPAKE2_CTX_free',
'#define SPAKE2_CTX_new GRPC_SHADOW_SPAKE2_CTX_new',
@ -3413,6 +3410,8 @@ Pod::Spec.new do |s|
'#define SSL_get_ivs GRPC_SHADOW_SSL_get_ivs',
'#define SSL_get_key_block_len GRPC_SHADOW_SSL_get_key_block_len',
'#define SSL_get_max_cert_list GRPC_SHADOW_SSL_get_max_cert_list',
'#define SSL_get_max_proto_version GRPC_SHADOW_SSL_get_max_proto_version',
'#define SSL_get_min_proto_version GRPC_SHADOW_SSL_get_min_proto_version',
'#define SSL_get_mode GRPC_SHADOW_SSL_get_mode',
'#define SSL_get_negotiated_token_binding_param GRPC_SHADOW_SSL_get_negotiated_token_binding_param',
'#define SSL_get_options GRPC_SHADOW_SSL_get_options',
@ -4250,6 +4249,8 @@ Pod::Spec.new do |s|
'#define bn_lcm_consttime GRPC_SHADOW_bn_lcm_consttime',
'#define bn_less_than_montgomery_R GRPC_SHADOW_bn_less_than_montgomery_R',
'#define bn_less_than_words GRPC_SHADOW_bn_less_than_words',
'#define bn_miller_rabin_init GRPC_SHADOW_bn_miller_rabin_init',
'#define bn_miller_rabin_iteration GRPC_SHADOW_bn_miller_rabin_iteration',
'#define bn_minimal_width GRPC_SHADOW_bn_minimal_width',
'#define bn_mod_add_consttime GRPC_SHADOW_bn_mod_add_consttime',
'#define bn_mod_add_words GRPC_SHADOW_bn_mod_add_words',
@ -4301,6 +4302,7 @@ Pod::Spec.new do |s|
'#define bn_uadd_consttime GRPC_SHADOW_bn_uadd_consttime',
'#define bn_usub_consttime GRPC_SHADOW_bn_usub_consttime',
'#define bn_wexpand GRPC_SHADOW_bn_wexpand',
'#define boringssl_fips_self_test GRPC_SHADOW_boringssl_fips_self_test',
'#define c2i_ASN1_BIT_STRING GRPC_SHADOW_c2i_ASN1_BIT_STRING',
'#define c2i_ASN1_INTEGER GRPC_SHADOW_c2i_ASN1_INTEGER',
'#define c2i_ASN1_OBJECT GRPC_SHADOW_c2i_ASN1_OBJECT',
@ -4723,35 +4725,6 @@ Pod::Spec.new do |s|
'#define sha1_block_data_order GRPC_SHADOW_sha1_block_data_order',
'#define sha256_block_data_order GRPC_SHADOW_sha256_block_data_order',
'#define sha512_block_data_order GRPC_SHADOW_sha512_block_data_order',
'#define sike_cswap_asm GRPC_SHADOW_sike_cswap_asm',
'#define sike_eval_3_isog GRPC_SHADOW_sike_eval_3_isog',
'#define sike_eval_4_isog GRPC_SHADOW_sike_eval_4_isog',
'#define sike_fp2inv_mont GRPC_SHADOW_sike_fp2inv_mont',
'#define sike_fp2mul_mont GRPC_SHADOW_sike_fp2mul_mont',
'#define sike_fp2sqr_mont GRPC_SHADOW_sike_fp2sqr_mont',
'#define sike_fpadd GRPC_SHADOW_sike_fpadd',
'#define sike_fpcopy GRPC_SHADOW_sike_fpcopy',
'#define sike_fpcorrection GRPC_SHADOW_sike_fpcorrection',
'#define sike_fpdiv2 GRPC_SHADOW_sike_fpdiv2',
'#define sike_fpmul_mont GRPC_SHADOW_sike_fpmul_mont',
'#define sike_fpneg GRPC_SHADOW_sike_fpneg',
'#define sike_fprdc GRPC_SHADOW_sike_fprdc',
'#define sike_fpsub GRPC_SHADOW_sike_fpsub',
'#define sike_from_mont GRPC_SHADOW_sike_from_mont',
'#define sike_get_3_isog GRPC_SHADOW_sike_get_3_isog',
'#define sike_get_4_isog GRPC_SHADOW_sike_get_4_isog',
'#define sike_get_A GRPC_SHADOW_sike_get_A',
'#define sike_inv_3_way GRPC_SHADOW_sike_inv_3_way',
'#define sike_j_inv GRPC_SHADOW_sike_j_inv',
'#define sike_mpadd_asm GRPC_SHADOW_sike_mpadd_asm',
'#define sike_mpdblsubx2_asm GRPC_SHADOW_sike_mpdblsubx2_asm',
'#define sike_mpmul GRPC_SHADOW_sike_mpmul',
'#define sike_mpsubx2_asm GRPC_SHADOW_sike_mpsubx2_asm',
'#define sike_params GRPC_SHADOW_sike_params',
'#define sike_xDBLADD GRPC_SHADOW_sike_xDBLADD',
'#define sike_xDBLe GRPC_SHADOW_sike_xDBLe',
'#define sike_xTPL GRPC_SHADOW_sike_xTPL',
'#define sike_xTPLe GRPC_SHADOW_sike_xTPLe',
'#define sk_CRYPTO_BUFFER_call_copy_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_copy_func',
'#define sk_CRYPTO_BUFFER_call_copy_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_copy_func',
'#define sk_CRYPTO_BUFFER_call_free_func GRPC_SHADOW_sk_CRYPTO_BUFFER_call_free_func',

@ -1,5 +1,5 @@
# Automatically generated by tools/distrib/generate_grpc_shadow_boringssl_symbol_list.sh
1458b49a9e53b0db0ad63e8ef3156214f1473d87
7f02881e96e51f1873afcf384d02f782b48967ca
ACCESS_DESCRIPTION_free
ACCESS_DESCRIPTION_it
ACCESS_DESCRIPTION_new
@ -724,6 +724,7 @@ EC_GROUP_set_generator
EC_GROUP_set_point_conversion_form
EC_KEY_check_fips
EC_KEY_check_key
EC_KEY_derive_from_secret
EC_KEY_dup
EC_KEY_free
EC_KEY_generate_key
@ -1491,9 +1492,6 @@ SHA512_Final
SHA512_Init
SHA512_Transform
SHA512_Update
SIKE_decaps
SIKE_encaps
SIKE_keypair
SIPHASH_24
SPAKE2_CTX_free
SPAKE2_CTX_new
@ -1793,6 +1791,8 @@ SSL_get_info_callback
SSL_get_ivs
SSL_get_key_block_len
SSL_get_max_cert_list
SSL_get_max_proto_version
SSL_get_min_proto_version
SSL_get_mode
SSL_get_negotiated_token_binding_param
SSL_get_options
@ -2630,6 +2630,8 @@ bn_jacobi
bn_lcm_consttime
bn_less_than_montgomery_R
bn_less_than_words
bn_miller_rabin_init
bn_miller_rabin_iteration
bn_minimal_width
bn_mod_add_consttime
bn_mod_add_words
@ -2681,6 +2683,7 @@ bn_to_montgomery_small
bn_uadd_consttime
bn_usub_consttime
bn_wexpand
boringssl_fips_self_test
c2i_ASN1_BIT_STRING
c2i_ASN1_INTEGER
c2i_ASN1_OBJECT
@ -3103,35 +3106,6 @@ sdallocx
sha1_block_data_order
sha256_block_data_order
sha512_block_data_order
sike_cswap_asm
sike_eval_3_isog
sike_eval_4_isog
sike_fp2inv_mont
sike_fp2mul_mont
sike_fp2sqr_mont
sike_fpadd
sike_fpcopy
sike_fpcorrection
sike_fpdiv2
sike_fpmul_mont
sike_fpneg
sike_fprdc
sike_fpsub
sike_from_mont
sike_get_3_isog
sike_get_4_isog
sike_get_A
sike_inv_3_way
sike_j_inv
sike_mpadd_asm
sike_mpdblsubx2_asm
sike_mpmul
sike_mpsubx2_asm
sike_params
sike_xDBLADD
sike_xDBLe
sike_xTPL
sike_xTPLe
sk_CRYPTO_BUFFER_call_copy_func
sk_CRYPTO_BUFFER_call_copy_func
sk_CRYPTO_BUFFER_call_free_func

@ -513,6 +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/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',
@ -696,11 +697,6 @@ 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/asm/fp_generic.c',
'third_party/boringssl/third_party/sike/curve_params.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',

@ -81,7 +81,7 @@
s.source = {
:git => 'https://github.com/google/boringssl.git',
:commit => "1458b49a9e53b0db0ad63e8ef3156214f1473d87",
:commit => "7f02881e96e51f1873afcf384d02f782b48967ca",
}
s.ios.deployment_target = '7.0'
@ -141,8 +141,7 @@
'ssl/**/*.h',
'*.h',
'crypto/*.h',
'crypto/**/*.h',
'third_party/sike/*.h'
'crypto/**/*.h'
# bcm.c includes other source files, creating duplicated symbols. Since it is not used, we
# explicitly exclude it from the pod.
# TODO (mxyan): Work with BoringSSL team to remove this hack.

@ -1 +1 @@
Subproject commit 1458b49a9e53b0db0ad63e8ef3156214f1473d87
Subproject commit 7f02881e96e51f1873afcf384d02f782b48967ca

@ -28,8 +28,8 @@ git submodule | awk '{ print $1 }' | sort > "$submodules"
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)
1458b49a9e53b0db0ad63e8ef3156214f1473d87 third_party/boringssl (remotes/origin/HEAD)
7f02881e96e51f1873afcf384d02f782b48967ca third_party/bloaty (remotes/origin/wide-14-g73594cd)
7f02881e96e51f1873afcf384d02f782b48967ca third_party/boringssl (remotes/origin/HEAD)
a21f78d24bf645ccd6774b2c7e52e3c0514f7f29 third_party/boringssl-with-bazel (remotes/origin/chromium-stable-with-bazel)
e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0)
c181f78882e54c0e5c63f332562ef6954ee7932f third_party/envoy-api (heads/master)

Loading…
Cancel
Save