From 2b226adf60eac113e6c2780aa551c775e72511d6 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 11 Jan 2018 16:11:35 -0800 Subject: Remove alarm from core, implement in C++ layer only --- gRPC-Core.podspec | 3 --- 1 file changed, 3 deletions(-) (limited to 'gRPC-Core.podspec') diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ca072602a9..e16e7fd624 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -424,7 +424,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_hash_table.h', 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/alarm_internal.h', 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', @@ -571,7 +570,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_hash_table.cc', 'src/core/lib/slice/slice_intern.cc', 'src/core/lib/slice/slice_string_helpers.cc', - 'src/core/lib/surface/alarm.cc', 'src/core/lib/surface/api_trace.cc', 'src/core/lib/surface/byte_buffer.cc', 'src/core/lib/surface/byte_buffer_reader.cc', @@ -906,7 +904,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_hash_table.h', 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/alarm_internal.h', 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', -- cgit v1.2.3 From d36fe0708b90491252ce4d192621f36fb39ab2b7 Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Tue, 23 Jan 2018 10:40:45 -0800 Subject: rename gts to alts --- BUILD | 4 +-- CMakeLists.txt | 4 +-- Makefile | 6 ++-- build.yaml | 6 ++-- config.m4 | 2 +- config.w32 | 2 +- gRPC-Core.podspec | 6 ++-- grpc.gemspec | 4 +-- grpc.gyp | 2 +- package.xml | 4 +-- .../plugin_registry/grpc_cronet_plugin_registry.cc | 8 ++--- src/core/plugin_registry/grpc_plugin_registry.cc | 8 ++--- src/core/tsi/alts_transport_security.cc | 42 ++++++++++++++++++++++ src/core/tsi/alts_transport_security.h | 37 +++++++++++++++++++ src/core/tsi/gts_transport_security.cc | 40 --------------------- src/core/tsi/gts_transport_security.h | 37 ------------------- src/python/grpcio/grpc_core_dependencies.py | 2 +- tools/doxygen/Doxyfile.core.internal | 4 +-- tools/run_tests/generated/sources_and_headers.json | 6 ++-- 19 files changed, 113 insertions(+), 111 deletions(-) create mode 100644 src/core/tsi/alts_transport_security.cc create mode 100644 src/core/tsi/alts_transport_security.h delete mode 100644 src/core/tsi/gts_transport_security.cc delete mode 100644 src/core/tsi/gts_transport_security.h (limited to 'gRPC-Core.podspec') diff --git a/BUILD b/BUILD index 6ed4a5a0ae..290c473f22 100644 --- a/BUILD +++ b/BUILD @@ -1524,14 +1524,14 @@ grpc_cc_library( grpc_cc_library( name = "tsi", srcs = [ + "src/core/tsi/alts_transport_security.cc", "src/core/tsi/fake_transport_security.cc", - "src/core/tsi/gts_transport_security.cc", "src/core/tsi/ssl_transport_security.cc", "src/core/tsi/transport_security_grpc.cc", ], hdrs = [ + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", "src/core/tsi/transport_security_grpc.h", diff --git a/CMakeLists.txt b/CMakeLists.txt index b679fb85ab..ed8a87014a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -978,8 +978,8 @@ add_library(grpc src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc src/core/lib/surface/init_secure.cc + src/core/tsi/alts_transport_security.cc src/core/tsi/fake_transport_security.cc - src/core/tsi/gts_transport_security.cc src/core/tsi/ssl_transport_security.cc src/core/tsi/transport_security_grpc.cc src/core/tsi/transport_security.cc @@ -1343,8 +1343,8 @@ add_library(grpc_cronet src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc src/core/lib/surface/init_secure.cc + src/core/tsi/alts_transport_security.cc src/core/tsi/fake_transport_security.cc - src/core/tsi/gts_transport_security.cc src/core/tsi/ssl_transport_security.cc src/core/tsi/transport_security_grpc.cc src/core/tsi/transport_security.cc diff --git a/Makefile b/Makefile index ada461fb37..28ba920046 100644 --- a/Makefile +++ b/Makefile @@ -3176,8 +3176,8 @@ LIBGRPC_SRC = \ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ src/core/lib/surface/init_secure.cc \ + src/core/tsi/alts_transport_security.cc \ src/core/tsi/fake_transport_security.cc \ - src/core/tsi/gts_transport_security.cc \ src/core/tsi/ssl_transport_security.cc \ src/core/tsi/transport_security_grpc.cc \ src/core/tsi/transport_security.cc \ @@ -3543,8 +3543,8 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ src/core/lib/surface/init_secure.cc \ + src/core/tsi/alts_transport_security.cc \ src/core/tsi/fake_transport_security.cc \ - src/core/tsi/gts_transport_security.cc \ src/core/tsi/ssl_transport_security.cc \ src/core/tsi/transport_security_grpc.cc \ src/core/tsi/transport_security.cc \ @@ -20505,8 +20505,8 @@ src/core/lib/security/util/json_util.cc: $(OPENSSL_DEP) src/core/lib/surface/init_secure.cc: $(OPENSSL_DEP) src/core/plugin_registry/grpc_cronet_plugin_registry.cc: $(OPENSSL_DEP) src/core/plugin_registry/grpc_plugin_registry.cc: $(OPENSSL_DEP) +src/core/tsi/alts_transport_security.cc: $(OPENSSL_DEP) src/core/tsi/fake_transport_security.cc: $(OPENSSL_DEP) -src/core/tsi/gts_transport_security.cc: $(OPENSSL_DEP) src/core/tsi/ssl_transport_security.cc: $(OPENSSL_DEP) src/core/tsi/transport_security.cc: $(OPENSSL_DEP) src/core/tsi/transport_security_adapter.cc: $(OPENSSL_DEP) diff --git a/build.yaml b/build.yaml index 61f76f205c..60f568d4a1 100644 --- a/build.yaml +++ b/build.yaml @@ -931,19 +931,19 @@ filegroups: - grpc - name: tsi headers: + - src/core/tsi/alts_transport_security.h - src/core/tsi/fake_transport_security.h - - src/core/tsi/gts_transport_security.h - src/core/tsi/ssl_transport_security.h - src/core/tsi/ssl_types.h - src/core/tsi/transport_security_grpc.h src: + - src/core/tsi/alts_transport_security.cc - src/core/tsi/fake_transport_security.cc - - src/core/tsi/gts_transport_security.cc - src/core/tsi/ssl_transport_security.cc - src/core/tsi/transport_security_grpc.cc deps: - gpr - plugin: grpc_tsi_gts + plugin: grpc_tsi_alts secure: true uses: - tsi_interface diff --git a/config.m4 b/config.m4 index 54e29cc41d..5c492bde05 100644 --- a/config.m4 +++ b/config.m4 @@ -270,8 +270,8 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ src/core/lib/surface/init_secure.cc \ + src/core/tsi/alts_transport_security.cc \ src/core/tsi/fake_transport_security.cc \ - src/core/tsi/gts_transport_security.cc \ src/core/tsi/ssl_transport_security.cc \ src/core/tsi/transport_security_grpc.cc \ src/core/tsi/transport_security.cc \ diff --git a/config.w32 b/config.w32 index c8003140d8..59692aa6a3 100644 --- a/config.w32 +++ b/config.w32 @@ -247,8 +247,8 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\security\\transport\\tsi_error.cc " + "src\\core\\lib\\security\\util\\json_util.cc " + "src\\core\\lib\\surface\\init_secure.cc " + + "src\\core\\tsi\\alts_transport_security.cc " + "src\\core\\tsi\\fake_transport_security.cc " + - "src\\core\\tsi\\gts_transport_security.cc " + "src\\core\\tsi\\ssl_transport_security.cc " + "src\\core\\tsi\\transport_security_grpc.cc " + "src\\core\\tsi\\transport_security.cc " + diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ca072602a9..92c90b36b9 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -297,8 +297,8 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', + 'src/core/tsi/alts_transport_security.h', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/gts_transport_security.h', 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/ssl_types.h', 'src/core/tsi/transport_security_grpc.h', @@ -656,8 +656,8 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/surface/init_secure.cc', + 'src/core/tsi/alts_transport_security.cc', 'src/core/tsi/fake_transport_security.cc', - 'src/core/tsi/gts_transport_security.cc', 'src/core/tsi/ssl_transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', 'src/core/tsi/transport_security.cc', @@ -779,8 +779,8 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', + 'src/core/tsi/alts_transport_security.h', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/gts_transport_security.h', 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/ssl_types.h', 'src/core/tsi/transport_security_grpc.h', diff --git a/grpc.gemspec b/grpc.gemspec index 35b2776eba..791d766a08 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -223,8 +223,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/transport/security_handshaker.h ) s.files += %w( src/core/lib/security/transport/tsi_error.h ) s.files += %w( src/core/lib/security/util/json_util.h ) + s.files += %w( src/core/tsi/alts_transport_security.h ) s.files += %w( src/core/tsi/fake_transport_security.h ) - s.files += %w( src/core/tsi/gts_transport_security.h ) s.files += %w( src/core/tsi/ssl_transport_security.h ) s.files += %w( src/core/tsi/ssl_types.h ) s.files += %w( src/core/tsi/transport_security_grpc.h ) @@ -586,8 +586,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/transport/tsi_error.cc ) s.files += %w( src/core/lib/security/util/json_util.cc ) s.files += %w( src/core/lib/surface/init_secure.cc ) + s.files += %w( src/core/tsi/alts_transport_security.cc ) s.files += %w( src/core/tsi/fake_transport_security.cc ) - s.files += %w( src/core/tsi/gts_transport_security.cc ) s.files += %w( src/core/tsi/ssl_transport_security.cc ) s.files += %w( src/core/tsi/transport_security_grpc.cc ) s.files += %w( src/core/tsi/transport_security.cc ) diff --git a/grpc.gyp b/grpc.gyp index 49dcdf93a2..0bdf01205d 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -411,8 +411,8 @@ 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/surface/init_secure.cc', + 'src/core/tsi/alts_transport_security.cc', 'src/core/tsi/fake_transport_security.cc', - 'src/core/tsi/gts_transport_security.cc', 'src/core/tsi/ssl_transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', 'src/core/tsi/transport_security.cc', diff --git a/package.xml b/package.xml index 1b099a8dad..946c955af9 100644 --- a/package.xml +++ b/package.xml @@ -230,8 +230,8 @@ + - @@ -593,8 +593,8 @@ + - diff --git a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc index 101e29c481..fe5eb28f05 100644 --- a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc @@ -26,8 +26,8 @@ void grpc_deadline_filter_init(void); void grpc_deadline_filter_shutdown(void); void grpc_client_channel_init(void); void grpc_client_channel_shutdown(void); -void grpc_tsi_gts_init(void); -void grpc_tsi_gts_shutdown(void); +void grpc_tsi_alts_init(void); +void grpc_tsi_alts_shutdown(void); void grpc_server_load_reporting_plugin_init(void); void grpc_server_load_reporting_plugin_shutdown(void); @@ -40,8 +40,8 @@ void grpc_register_built_in_plugins(void) { grpc_deadline_filter_shutdown); grpc_register_plugin(grpc_client_channel_init, grpc_client_channel_shutdown); - grpc_register_plugin(grpc_tsi_gts_init, - grpc_tsi_gts_shutdown); + grpc_register_plugin(grpc_tsi_alts_init, + grpc_tsi_alts_shutdown); grpc_register_plugin(grpc_server_load_reporting_plugin_init, grpc_server_load_reporting_plugin_shutdown); } diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc index 89be351785..fdf9acc09c 100644 --- a/src/core/plugin_registry/grpc_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_plugin_registry.cc @@ -22,8 +22,8 @@ void grpc_http_filters_init(void); void grpc_http_filters_shutdown(void); void grpc_chttp2_plugin_init(void); void grpc_chttp2_plugin_shutdown(void); -void grpc_tsi_gts_init(void); -void grpc_tsi_gts_shutdown(void); +void grpc_tsi_alts_init(void); +void grpc_tsi_alts_shutdown(void); void grpc_deadline_filter_init(void); void grpc_deadline_filter_shutdown(void); void grpc_client_channel_init(void); @@ -58,8 +58,8 @@ void grpc_register_built_in_plugins(void) { grpc_http_filters_shutdown); grpc_register_plugin(grpc_chttp2_plugin_init, grpc_chttp2_plugin_shutdown); - grpc_register_plugin(grpc_tsi_gts_init, - grpc_tsi_gts_shutdown); + grpc_register_plugin(grpc_tsi_alts_init, + grpc_tsi_alts_shutdown); grpc_register_plugin(grpc_deadline_filter_init, grpc_deadline_filter_shutdown); grpc_register_plugin(grpc_client_channel_init, diff --git a/src/core/tsi/alts_transport_security.cc b/src/core/tsi/alts_transport_security.cc new file mode 100644 index 0000000000..ddd75cbd02 --- /dev/null +++ b/src/core/tsi/alts_transport_security.cc @@ -0,0 +1,42 @@ +/* + * + * Copyright 2017 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + * + */ + +#include "src/core/tsi/alts_transport_security.h" + +#include + +static alts_shared_resource g_alts_resource; + +alts_shared_resource* alts_get_shared_resource(void) { + return &g_alts_resource; +} + +void grpc_tsi_alts_init() { + memset(&g_alts_resource, 0, sizeof(alts_shared_resource)); + gpr_mu_init(&g_alts_resource.mu); +} + +void grpc_tsi_alts_shutdown() { + gpr_mu_destroy(&g_alts_resource.mu); + if (g_alts_resource.cq == nullptr) { + return; + } + grpc_completion_queue_destroy(g_alts_resource.cq); + grpc_channel_destroy(g_alts_resource.channel); + gpr_thd_join(g_alts_resource.thread_id); +} diff --git a/src/core/tsi/alts_transport_security.h b/src/core/tsi/alts_transport_security.h new file mode 100644 index 0000000000..c90e31478e --- /dev/null +++ b/src/core/tsi/alts_transport_security.h @@ -0,0 +1,37 @@ +/* + * + * Copyright 2017 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + * + */ + +#ifndef GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H +#define GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H + +#include +#include +#include + +typedef struct alts_shared_resource { + gpr_thd_id thread_id; + grpc_channel* channel; + grpc_completion_queue* cq; + gpr_mu mu; +} alts_shared_resource; + +/* This method returns the address of alts_shared_resource object shared by all + * TSI handshakes. */ +alts_shared_resource* alts_get_shared_resource(void); + +#endif /* GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/gts_transport_security.cc b/src/core/tsi/gts_transport_security.cc deleted file mode 100644 index 2b099773c4..0000000000 --- a/src/core/tsi/gts_transport_security.cc +++ /dev/null @@ -1,40 +0,0 @@ -/* - * - * Copyright 2017 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - * - */ - -#include "src/core/tsi/gts_transport_security.h" - -#include - -static gts_shared_resource g_gts_resource; - -gts_shared_resource* gts_get_shared_resource(void) { return &g_gts_resource; } - -void grpc_tsi_gts_init() { - memset(&g_gts_resource, 0, sizeof(gts_shared_resource)); - gpr_mu_init(&g_gts_resource.mu); -} - -void grpc_tsi_gts_shutdown() { - gpr_mu_destroy(&g_gts_resource.mu); - if (g_gts_resource.cq == nullptr) { - return; - } - grpc_completion_queue_destroy(g_gts_resource.cq); - grpc_channel_destroy(g_gts_resource.channel); - gpr_thd_join(g_gts_resource.thread_id); -} diff --git a/src/core/tsi/gts_transport_security.h b/src/core/tsi/gts_transport_security.h deleted file mode 100644 index 23b2b66fb3..0000000000 --- a/src/core/tsi/gts_transport_security.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright 2017 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - * - */ - -#ifndef GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H -#define GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H - -#include -#include -#include - -typedef struct gts_shared_resource { - gpr_thd_id thread_id; - grpc_channel* channel; - grpc_completion_queue* cq; - gpr_mu mu; -} gts_shared_resource; - -/* This method returns the address of gts_shared_resource object shared by all - * TSI handshakes. */ -gts_shared_resource* gts_get_shared_resource(void); - -#endif /* GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H */ diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 9debb22249..70019e887b 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -246,8 +246,8 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/surface/init_secure.cc', + 'src/core/tsi/alts_transport_security.cc', 'src/core/tsi/fake_transport_security.cc', - 'src/core/tsi/gts_transport_security.cc', 'src/core/tsi/ssl_transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', 'src/core/tsi/transport_security.cc', diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f3e624ba72..95db1415db 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1403,10 +1403,10 @@ src/core/lib/transport/transport_impl.h \ src/core/lib/transport/transport_op_string.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/tsi/README.md \ +src/core/tsi/alts_transport_security.cc \ +src/core/tsi/alts_transport_security.h \ src/core/tsi/fake_transport_security.cc \ src/core/tsi/fake_transport_security.h \ -src/core/tsi/gts_transport_security.cc \ -src/core/tsi/gts_transport_security.h \ src/core/tsi/ssl_transport_security.cc \ src/core/tsi/ssl_transport_security.h \ src/core/tsi/ssl_types.h \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 362effd7d2..c312601ec6 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -9431,8 +9431,8 @@ "tsi_interface" ], "headers": [ + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", "src/core/tsi/transport_security_grpc.h" @@ -9441,10 +9441,10 @@ "language": "c", "name": "tsi", "src": [ + "src/core/tsi/alts_transport_security.cc", + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.cc", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.cc", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.cc", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", -- cgit v1.2.3 From 74958c59e23b2b121419ee62967849415b252f4b Mon Sep 17 00:00:00 2001 From: Matt Kwong Date: Tue, 30 Jan 2018 11:52:02 -0800 Subject: Update Podspec version for ObjC --- gRPC-Core.podspec | 2 +- templates/gRPC-Core.podspec.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gRPC-Core.podspec') diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index c57fd36ea3..862fda31c9 100644 --- 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/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 2be7692e04..c28b78dbdf 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -166,7 +166,7 @@ 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. -- cgit v1.2.3