aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD4
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile6
-rw-r--r--build.yaml6
-rw-r--r--config.m42
-rw-r--r--config.w322
-rw-r--r--gRPC-Core.podspec6
-rw-r--r--grpc.gemspec4
-rw-r--r--grpc.gyp2
-rw-r--r--package.xml4
-rw-r--r--src/core/plugin_registry/grpc_cronet_plugin_registry.cc8
-rw-r--r--src/core/plugin_registry/grpc_plugin_registry.cc8
-rw-r--r--src/core/tsi/alts_transport_security.cc (renamed from src/core/tsi/gts_transport_security.cc)26
-rw-r--r--src/core/tsi/alts_transport_security.h (renamed from src/core/tsi/gts_transport_security.h)14
-rw-r--r--src/python/grpcio/grpc_core_dependencies.py2
-rw-r--r--tools/doxygen/Doxyfile.core.internal4
-rw-r--r--tools/run_tests/generated/sources_and_headers.json6
17 files changed, 55 insertions, 53 deletions
diff --git a/BUILD b/BUILD
index 0a8be79e8a..9b03685f5e 100644
--- a/BUILD
+++ b/BUILD
@@ -1533,14 +1533,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 c557e9469a..6e9ed42276 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -981,8 +981,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
@@ -1349,8 +1349,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 36acfd8a1a..aff6412a64 100644
--- a/Makefile
+++ b/Makefile
@@ -3183,8 +3183,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 \
@@ -3553,8 +3553,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 \
@@ -20570,8 +20570,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 2c9a37ec0f..ab21875b39 100644
--- a/build.yaml
+++ b/build.yaml
@@ -935,19 +935,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 9fc624d880..1453d63987 100644
--- a/config.m4
+++ b/config.m4
@@ -272,8 +272,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 bb9a17da33..2d87e46c62 100644
--- a/config.w32
+++ b/config.w32
@@ -249,8 +249,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 7ee7bb52d2..c57fd36ea3 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -298,8 +298,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',
@@ -660,8 +660,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',
@@ -783,8 +783,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 41e56d0bf1..43f5148add 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -224,8 +224,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 )
@@ -590,8 +590,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 7b1178f898..e074bb159a 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -413,8 +413,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 3f529a2096..b0814247c5 100644
--- a/package.xml
+++ b/package.xml
@@ -231,8 +231,8 @@
<file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/util/json_util.h" role="src" />
+ <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.h" role="src" />
<file baseinstalldir="/" name="src/core/tsi/fake_transport_security.h" role="src" />
- <file baseinstalldir="/" name="src/core/tsi/gts_transport_security.h" role="src" />
<file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.h" role="src" />
<file baseinstalldir="/" name="src/core/tsi/ssl_types.h" role="src" />
<file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.h" role="src" />
@@ -597,8 +597,8 @@
<file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/util/json_util.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/surface/init_secure.cc" role="src" />
+ <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.cc" role="src" />
<file baseinstalldir="/" name="src/core/tsi/fake_transport_security.cc" role="src" />
- <file baseinstalldir="/" name="src/core/tsi/gts_transport_security.cc" role="src" />
<file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.cc" role="src" />
<file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/tsi/transport_security.cc" role="src" />
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/gts_transport_security.cc b/src/core/tsi/alts_transport_security.cc
index 2b099773c4..ddd75cbd02 100644
--- a/src/core/tsi/gts_transport_security.cc
+++ b/src/core/tsi/alts_transport_security.cc
@@ -16,25 +16,27 @@
*
*/
-#include "src/core/tsi/gts_transport_security.h"
+#include "src/core/tsi/alts_transport_security.h"
#include <string.h>
-static gts_shared_resource g_gts_resource;
+static alts_shared_resource g_alts_resource;
-gts_shared_resource* gts_get_shared_resource(void) { return &g_gts_resource; }
+alts_shared_resource* alts_get_shared_resource(void) {
+ return &g_alts_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_alts_init() {
+ memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
+ gpr_mu_init(&g_alts_resource.mu);
}
-void grpc_tsi_gts_shutdown() {
- gpr_mu_destroy(&g_gts_resource.mu);
- if (g_gts_resource.cq == nullptr) {
+void grpc_tsi_alts_shutdown() {
+ gpr_mu_destroy(&g_alts_resource.mu);
+ if (g_alts_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);
+ 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/gts_transport_security.h b/src/core/tsi/alts_transport_security.h
index 23b2b66fb3..c90e31478e 100644
--- a/src/core/tsi/gts_transport_security.h
+++ b/src/core/tsi/alts_transport_security.h
@@ -16,22 +16,22 @@
*
*/
-#ifndef GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H
-#define GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H
+#ifndef GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H
+#define GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H
#include <grpc/grpc.h>
#include <grpc/support/sync.h>
#include <grpc/support/thd.h>
-typedef struct gts_shared_resource {
+typedef struct alts_shared_resource {
gpr_thd_id thread_id;
grpc_channel* channel;
grpc_completion_queue* cq;
gpr_mu mu;
-} gts_shared_resource;
+} alts_shared_resource;
-/* This method returns the address of gts_shared_resource object shared by all
+/* This method returns the address of alts_shared_resource object shared by all
* TSI handshakes. */
-gts_shared_resource* gts_get_shared_resource(void);
+alts_shared_resource* alts_get_shared_resource(void);
-#endif /* GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H */
+#endif /* GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H */
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 86122f909c..0d87b7427f 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -248,8 +248,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 00057c2897..365c80cde9 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1407,10 +1407,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 f61288b70d..11c37233d5 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -9456,8 +9456,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"
@@ -9466,10 +9466,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",
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 21:47:21 +0000