diff options
-rw-r--r-- | BUILD | 16 | ||||
-rw-r--r-- | CMakeLists.txt | 12 | ||||
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | binding.gyp | 6 | ||||
-rw-r--r-- | build.yaml | 18 | ||||
-rw-r--r-- | config.m4 | 8 | ||||
-rw-r--r-- | gRPC-Core.podspec | 26 | ||||
-rwxr-xr-x | grpc.gemspec | 16 | ||||
-rw-r--r-- | package.xml | 16 | ||||
-rw-r--r-- | src/core/tsi/README.md (renamed from src/core/lib/tsi/README.md) | 0 | ||||
-rw-r--r-- | src/core/tsi/fake_transport_security.c (renamed from src/core/lib/tsi/fake_transport_security.c) | 0 | ||||
-rw-r--r-- | src/core/tsi/fake_transport_security.h (renamed from src/core/lib/tsi/fake_transport_security.h) | 0 | ||||
-rw-r--r-- | src/core/tsi/ssl_transport_security.c (renamed from src/core/lib/tsi/ssl_transport_security.c) | 0 | ||||
-rw-r--r-- | src/core/tsi/ssl_transport_security.h (renamed from src/core/lib/tsi/ssl_transport_security.h) | 0 | ||||
-rw-r--r-- | src/core/tsi/ssl_types.h (renamed from src/core/lib/tsi/ssl_types.h) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/BUILD (renamed from src/core/lib/tsi/test_creds/BUILD) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/README (renamed from src/core/lib/tsi/test_creds/README) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/badclient.key (renamed from src/core/lib/tsi/test_creds/badclient.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/badclient.pem (renamed from src/core/lib/tsi/test_creds/badclient.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/badserver.key (renamed from src/core/lib/tsi/test_creds/badserver.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/badserver.pem (renamed from src/core/lib/tsi/test_creds/badserver.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/ca-openssl.cnf (renamed from src/core/lib/tsi/test_creds/ca-openssl.cnf) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/ca.key (renamed from src/core/lib/tsi/test_creds/ca.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/ca.pem (renamed from src/core/lib/tsi/test_creds/ca.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/client.key (renamed from src/core/lib/tsi/test_creds/client.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/client.pem (renamed from src/core/lib/tsi/test_creds/client.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/server0.key (renamed from src/core/lib/tsi/test_creds/server0.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/server0.pem (renamed from src/core/lib/tsi/test_creds/server0.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/server1-openssl.cnf (renamed from src/core/lib/tsi/test_creds/server1-openssl.cnf) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/server1.key (renamed from src/core/lib/tsi/test_creds/server1.key) | 0 | ||||
-rw-r--r-- | src/core/tsi/test_creds/server1.pem (renamed from src/core/lib/tsi/test_creds/server1.pem) | 0 | ||||
-rw-r--r-- | src/core/tsi/transport_security.c (renamed from src/core/lib/tsi/transport_security.c) | 0 | ||||
-rw-r--r-- | src/core/tsi/transport_security.h (renamed from src/core/lib/tsi/transport_security.h) | 0 | ||||
-rw-r--r-- | src/core/tsi/transport_security_interface.h (renamed from src/core/lib/tsi/transport_security_interface.h) | 0 | ||||
-rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 6 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 18 | ||||
-rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 26 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc/grpc.vcxproj | 16 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 38 |
39 files changed, 120 insertions, 120 deletions
@@ -1128,16 +1128,16 @@ grpc_cc_library( grpc_cc_library( name = "tsi", srcs = [ - "src/core/lib/tsi/fake_transport_security.c", - "src/core/lib/tsi/ssl_transport_security.c", - "src/core/lib/tsi/transport_security.c", + "src/core/tsi/fake_transport_security.c", + "src/core/tsi/ssl_transport_security.c", + "src/core/tsi/transport_security.c", ], hdrs = [ - "src/core/lib/tsi/fake_transport_security.h", - "src/core/lib/tsi/ssl_transport_security.h", - "src/core/lib/tsi/ssl_types.h", - "src/core/lib/tsi/transport_security.h", - "src/core/lib/tsi/transport_security_interface.h", + "src/core/tsi/fake_transport_security.h", + "src/core/tsi/ssl_transport_security.h", + "src/core/tsi/ssl_types.h", + "src/core/tsi/transport_security.h", + "src/core/tsi/transport_security_interface.h", ], external_deps = [ "libssl", diff --git a/CMakeLists.txt b/CMakeLists.txt index f54e78b560..7b8e49e126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1078,9 +1078,9 @@ add_library(grpc src/core/lib/security/transport/tsi_error.c src/core/lib/security/util/json_util.c src/core/lib/surface/init_secure.c - src/core/lib/tsi/fake_transport_security.c - src/core/lib/tsi/ssl_transport_security.c - src/core/lib/tsi/transport_security.c + src/core/tsi/fake_transport_security.c + src/core/tsi/ssl_transport_security.c + src/core/tsi/transport_security.c src/core/ext/transport/chttp2/server/chttp2_server.c src/core/ext/transport/chttp2/client/secure/secure_channel_create.c src/core/ext/client_channel/channel_connectivity.c @@ -1422,9 +1422,9 @@ add_library(grpc_cronet src/core/lib/security/transport/tsi_error.c src/core/lib/security/util/json_util.c src/core/lib/surface/init_secure.c - src/core/lib/tsi/fake_transport_security.c - src/core/lib/tsi/ssl_transport_security.c - src/core/lib/tsi/transport_security.c + src/core/tsi/fake_transport_security.c + src/core/tsi/ssl_transport_security.c + src/core/tsi/transport_security.c src/core/ext/transport/chttp2/client/chttp2_connector.c src/core/ext/load_reporting/load_reporting.c src/core/ext/load_reporting/load_reporting_filter.c @@ -2972,9 +2972,9 @@ LIBGRPC_SRC = \ src/core/lib/security/transport/tsi_error.c \ src/core/lib/security/util/json_util.c \ src/core/lib/surface/init_secure.c \ - src/core/lib/tsi/fake_transport_security.c \ - src/core/lib/tsi/ssl_transport_security.c \ - src/core/lib/tsi/transport_security.c \ + src/core/tsi/fake_transport_security.c \ + src/core/tsi/ssl_transport_security.c \ + src/core/tsi/transport_security.c \ src/core/ext/transport/chttp2/server/chttp2_server.c \ src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ src/core/ext/client_channel/channel_connectivity.c \ @@ -3314,9 +3314,9 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/security/transport/tsi_error.c \ src/core/lib/security/util/json_util.c \ src/core/lib/surface/init_secure.c \ - src/core/lib/tsi/fake_transport_security.c \ - src/core/lib/tsi/ssl_transport_security.c \ - src/core/lib/tsi/transport_security.c \ + src/core/tsi/fake_transport_security.c \ + src/core/tsi/ssl_transport_security.c \ + src/core/tsi/transport_security.c \ src/core/ext/transport/chttp2/client/chttp2_connector.c \ src/core/ext/load_reporting/load_reporting.c \ src/core/ext/load_reporting/load_reporting_filter.c \ @@ -18807,11 +18807,11 @@ src/core/lib/security/transport/server_auth_filter.c: $(OPENSSL_DEP) src/core/lib/security/transport/tsi_error.c: $(OPENSSL_DEP) src/core/lib/security/util/json_util.c: $(OPENSSL_DEP) src/core/lib/surface/init_secure.c: $(OPENSSL_DEP) -src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP) -src/core/lib/tsi/ssl_transport_security.c: $(OPENSSL_DEP) -src/core/lib/tsi/transport_security.c: $(OPENSSL_DEP) src/core/plugin_registry/grpc_cronet_plugin_registry.c: $(OPENSSL_DEP) src/core/plugin_registry/grpc_plugin_registry.c: $(OPENSSL_DEP) +src/core/tsi/fake_transport_security.c: $(OPENSSL_DEP) +src/core/tsi/ssl_transport_security.c: $(OPENSSL_DEP) +src/core/tsi/transport_security.c: $(OPENSSL_DEP) src/cpp/client/cronet_credentials.cc: $(OPENSSL_DEP) src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP) src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP) diff --git a/binding.gyp b/binding.gyp index b91f5f61e2..f1cef607ec 100644 --- a/binding.gyp +++ b/binding.gyp @@ -785,9 +785,9 @@ 'src/core/lib/security/transport/tsi_error.c', 'src/core/lib/security/util/json_util.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/tsi/fake_transport_security.c', - 'src/core/lib/tsi/ssl_transport_security.c', - 'src/core/lib/tsi/transport_security.c', + 'src/core/tsi/fake_transport_security.c', + 'src/core/tsi/ssl_transport_security.c', + 'src/core/tsi/transport_security.c', 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/client_channel/channel_connectivity.c', diff --git a/build.yaml b/build.yaml index 6e590f4ca6..6a89b71fb2 100644 --- a/build.yaml +++ b/build.yaml @@ -770,15 +770,15 @@ filegroups: - third_party/nanopb/pb_encode.c - name: tsi headers: - - src/core/lib/tsi/fake_transport_security.h - - src/core/lib/tsi/ssl_transport_security.h - - src/core/lib/tsi/ssl_types.h - - src/core/lib/tsi/transport_security.h - - src/core/lib/tsi/transport_security_interface.h - src: - - src/core/lib/tsi/fake_transport_security.c - - src/core/lib/tsi/ssl_transport_security.c - - src/core/lib/tsi/transport_security.c + - src/core/tsi/fake_transport_security.h + - src/core/tsi/ssl_transport_security.h + - src/core/tsi/ssl_types.h + - src/core/tsi/transport_security.h + - src/core/tsi/transport_security_interface.h + src: + - src/core/tsi/fake_transport_security.c + - src/core/tsi/ssl_transport_security.c + - src/core/tsi/transport_security.c deps: - gpr secure: true @@ -253,9 +253,9 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/transport/tsi_error.c \ src/core/lib/security/util/json_util.c \ src/core/lib/surface/init_secure.c \ - src/core/lib/tsi/fake_transport_security.c \ - src/core/lib/tsi/ssl_transport_security.c \ - src/core/lib/tsi/transport_security.c \ + src/core/tsi/fake_transport_security.c \ + src/core/tsi/ssl_transport_security.c \ + src/core/tsi/transport_security.c \ src/core/ext/transport/chttp2/server/chttp2_server.c \ src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ src/core/ext/client_channel/channel_connectivity.c \ @@ -668,8 +668,8 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/support) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/tsi) PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/aes) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/asn1) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 8ea9e5fbde..97bd3c2864 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -404,11 +404,11 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/b64.h', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/tsi/fake_transport_security.h', - 'src/core/lib/tsi/ssl_transport_security.h', - 'src/core/lib/tsi/ssl_types.h', - 'src/core/lib/tsi/transport_security.h', - 'src/core/lib/tsi/transport_security_interface.h', + 'src/core/tsi/fake_transport_security.h', + 'src/core/tsi/ssl_transport_security.h', + 'src/core/tsi/ssl_types.h', + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_interface.h', 'src/core/ext/transport/chttp2/server/chttp2_server.h', 'src/core/ext/client_channel/client_channel.h', 'src/core/ext/client_channel/client_channel_factory.h', @@ -628,9 +628,9 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/tsi_error.c', 'src/core/lib/security/util/json_util.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/tsi/fake_transport_security.c', - 'src/core/lib/tsi/ssl_transport_security.c', - 'src/core/lib/tsi/transport_security.c', + 'src/core/tsi/fake_transport_security.c', + 'src/core/tsi/ssl_transport_security.c', + 'src/core/tsi/transport_security.c', 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/client_channel/channel_connectivity.c', @@ -852,11 +852,11 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/b64.h', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/tsi/fake_transport_security.h', - 'src/core/lib/tsi/ssl_transport_security.h', - 'src/core/lib/tsi/ssl_types.h', - 'src/core/lib/tsi/transport_security.h', - 'src/core/lib/tsi/transport_security_interface.h', + 'src/core/tsi/fake_transport_security.h', + 'src/core/tsi/ssl_transport_security.h', + 'src/core/tsi/ssl_types.h', + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_interface.h', 'src/core/ext/transport/chttp2/server/chttp2_server.h', 'src/core/ext/client_channel/client_channel.h', 'src/core/ext/client_channel/client_channel_factory.h', diff --git a/grpc.gemspec b/grpc.gemspec index 06da332bed..cb51da1b57 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -320,11 +320,11 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/transport/tsi_error.h ) s.files += %w( src/core/lib/security/util/b64.h ) s.files += %w( src/core/lib/security/util/json_util.h ) - s.files += %w( src/core/lib/tsi/fake_transport_security.h ) - s.files += %w( src/core/lib/tsi/ssl_transport_security.h ) - s.files += %w( src/core/lib/tsi/ssl_types.h ) - s.files += %w( src/core/lib/tsi/transport_security.h ) - s.files += %w( src/core/lib/tsi/transport_security_interface.h ) + s.files += %w( src/core/tsi/fake_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.h ) + s.files += %w( src/core/tsi/transport_security_interface.h ) s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.h ) s.files += %w( src/core/ext/client_channel/client_channel.h ) s.files += %w( src/core/ext/client_channel/client_channel_factory.h ) @@ -544,9 +544,9 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/transport/tsi_error.c ) s.files += %w( src/core/lib/security/util/json_util.c ) s.files += %w( src/core/lib/surface/init_secure.c ) - s.files += %w( src/core/lib/tsi/fake_transport_security.c ) - s.files += %w( src/core/lib/tsi/ssl_transport_security.c ) - s.files += %w( src/core/lib/tsi/transport_security.c ) + s.files += %w( src/core/tsi/fake_transport_security.c ) + s.files += %w( src/core/tsi/ssl_transport_security.c ) + s.files += %w( src/core/tsi/transport_security.c ) s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.c ) s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c ) s.files += %w( src/core/ext/client_channel/channel_connectivity.c ) diff --git a/package.xml b/package.xml index 5d58584555..afac1800be 100644 --- a/package.xml +++ b/package.xml @@ -329,11 +329,11 @@ <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/util/b64.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/util/json_util.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/ssl_types.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/transport_security_interface.h" role="src" /> + <file baseinstalldir="/" name="src/core/tsi/fake_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.h" role="src" /> + <file baseinstalldir="/" name="src/core/tsi/transport_security_interface.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel_factory.h" role="src" /> @@ -553,9 +553,9 @@ <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/util/json_util.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/init_secure.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" /> + <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.c" role="src" /> + <file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.c" role="src" /> + <file baseinstalldir="/" name="src/core/tsi/transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/channel_connectivity.c" role="src" /> diff --git a/src/core/lib/tsi/README.md b/src/core/tsi/README.md index 3ca3c1ef38..3ca3c1ef38 100644 --- a/src/core/lib/tsi/README.md +++ b/src/core/tsi/README.md diff --git a/src/core/lib/tsi/fake_transport_security.c b/src/core/tsi/fake_transport_security.c index bbe323df3b..bbe323df3b 100644 --- a/src/core/lib/tsi/fake_transport_security.c +++ b/src/core/tsi/fake_transport_security.c diff --git a/src/core/lib/tsi/fake_transport_security.h b/src/core/tsi/fake_transport_security.h index 54a9469b58..54a9469b58 100644 --- a/src/core/lib/tsi/fake_transport_security.h +++ b/src/core/tsi/fake_transport_security.h diff --git a/src/core/lib/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 53aabdb926..53aabdb926 100644 --- a/src/core/lib/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c diff --git a/src/core/lib/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index 7407246118..7407246118 100644 --- a/src/core/lib/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h diff --git a/src/core/lib/tsi/ssl_types.h b/src/core/tsi/ssl_types.h index 0a988effd0..0a988effd0 100644 --- a/src/core/lib/tsi/ssl_types.h +++ b/src/core/tsi/ssl_types.h diff --git a/src/core/lib/tsi/test_creds/BUILD b/src/core/tsi/test_creds/BUILD index 5cf04caf17..5cf04caf17 100644 --- a/src/core/lib/tsi/test_creds/BUILD +++ b/src/core/tsi/test_creds/BUILD diff --git a/src/core/lib/tsi/test_creds/README b/src/core/tsi/test_creds/README index eb8482d648..eb8482d648 100644 --- a/src/core/lib/tsi/test_creds/README +++ b/src/core/tsi/test_creds/README diff --git a/src/core/lib/tsi/test_creds/badclient.key b/src/core/tsi/test_creds/badclient.key index 5832685122..5832685122 100644 --- a/src/core/lib/tsi/test_creds/badclient.key +++ b/src/core/tsi/test_creds/badclient.key diff --git a/src/core/lib/tsi/test_creds/badclient.pem b/src/core/tsi/test_creds/badclient.pem index 1785970221..1785970221 100644 --- a/src/core/lib/tsi/test_creds/badclient.pem +++ b/src/core/tsi/test_creds/badclient.pem diff --git a/src/core/lib/tsi/test_creds/badserver.key b/src/core/tsi/test_creds/badserver.key index abfbde10ff..abfbde10ff 100644 --- a/src/core/lib/tsi/test_creds/badserver.key +++ b/src/core/tsi/test_creds/badserver.key diff --git a/src/core/lib/tsi/test_creds/badserver.pem b/src/core/tsi/test_creds/badserver.pem index 983c979f31..983c979f31 100644 --- a/src/core/lib/tsi/test_creds/badserver.pem +++ b/src/core/tsi/test_creds/badserver.pem diff --git a/src/core/lib/tsi/test_creds/ca-openssl.cnf b/src/core/tsi/test_creds/ca-openssl.cnf index e97b945e4b..e97b945e4b 100644 --- a/src/core/lib/tsi/test_creds/ca-openssl.cnf +++ b/src/core/tsi/test_creds/ca-openssl.cnf diff --git a/src/core/lib/tsi/test_creds/ca.key b/src/core/tsi/test_creds/ca.key index 03c4f950e3..03c4f950e3 100644 --- a/src/core/lib/tsi/test_creds/ca.key +++ b/src/core/tsi/test_creds/ca.key diff --git a/src/core/lib/tsi/test_creds/ca.pem b/src/core/tsi/test_creds/ca.pem index 6c8511a73c..6c8511a73c 100644 --- a/src/core/lib/tsi/test_creds/ca.pem +++ b/src/core/tsi/test_creds/ca.pem diff --git a/src/core/lib/tsi/test_creds/client.key b/src/core/tsi/test_creds/client.key index f48d0735d9..f48d0735d9 100644 --- a/src/core/lib/tsi/test_creds/client.key +++ b/src/core/tsi/test_creds/client.key diff --git a/src/core/lib/tsi/test_creds/client.pem b/src/core/tsi/test_creds/client.pem index e332091019..e332091019 100644 --- a/src/core/lib/tsi/test_creds/client.pem +++ b/src/core/tsi/test_creds/client.pem diff --git a/src/core/lib/tsi/test_creds/server0.key b/src/core/tsi/test_creds/server0.key index add153c9ae..add153c9ae 100644 --- a/src/core/lib/tsi/test_creds/server0.key +++ b/src/core/tsi/test_creds/server0.key diff --git a/src/core/lib/tsi/test_creds/server0.pem b/src/core/tsi/test_creds/server0.pem index ade75d8563..ade75d8563 100644 --- a/src/core/lib/tsi/test_creds/server0.pem +++ b/src/core/tsi/test_creds/server0.pem diff --git a/src/core/lib/tsi/test_creds/server1-openssl.cnf b/src/core/tsi/test_creds/server1-openssl.cnf index 8a02108289..8a02108289 100644 --- a/src/core/lib/tsi/test_creds/server1-openssl.cnf +++ b/src/core/tsi/test_creds/server1-openssl.cnf diff --git a/src/core/lib/tsi/test_creds/server1.key b/src/core/tsi/test_creds/server1.key index 143a5b8765..143a5b8765 100644 --- a/src/core/lib/tsi/test_creds/server1.key +++ b/src/core/tsi/test_creds/server1.key diff --git a/src/core/lib/tsi/test_creds/server1.pem b/src/core/tsi/test_creds/server1.pem index f3d43fcc5b..f3d43fcc5b 100644 --- a/src/core/lib/tsi/test_creds/server1.pem +++ b/src/core/tsi/test_creds/server1.pem diff --git a/src/core/lib/tsi/transport_security.c b/src/core/tsi/transport_security.c index 2cbf381c88..2cbf381c88 100644 --- a/src/core/lib/tsi/transport_security.c +++ b/src/core/tsi/transport_security.c diff --git a/src/core/lib/tsi/transport_security.h b/src/core/tsi/transport_security.h index aaf110ee05..aaf110ee05 100644 --- a/src/core/lib/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h diff --git a/src/core/lib/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index 3e8c9d7ffe..3e8c9d7ffe 100644 --- a/src/core/lib/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 258c65c08e..970c70bb1b 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -247,9 +247,9 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/transport/tsi_error.c', 'src/core/lib/security/util/json_util.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/tsi/fake_transport_security.c', - 'src/core/lib/tsi/ssl_transport_security.c', - 'src/core/lib/tsi/transport_security.c', + 'src/core/tsi/fake_transport_security.c', + 'src/core/tsi/ssl_transport_security.c', + 'src/core/tsi/transport_security.c', 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/client_channel/channel_connectivity.c', diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index d09ddaa04d..a15b624f34 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1359,16 +1359,16 @@ src/core/lib/transport/transport.c \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_impl.h \ src/core/lib/transport/transport_op_string.c \ -src/core/lib/tsi/README.md \ -src/core/lib/tsi/fake_transport_security.c \ -src/core/lib/tsi/fake_transport_security.h \ -src/core/lib/tsi/ssl_transport_security.c \ -src/core/lib/tsi/ssl_transport_security.h \ -src/core/lib/tsi/ssl_types.h \ -src/core/lib/tsi/transport_security.c \ -src/core/lib/tsi/transport_security.h \ -src/core/lib/tsi/transport_security_interface.h \ src/core/plugin_registry/grpc_plugin_registry.c \ +src/core/tsi/README.md \ +src/core/tsi/fake_transport_security.c \ +src/core/tsi/fake_transport_security.h \ +src/core/tsi/ssl_transport_security.c \ +src/core/tsi/ssl_transport_security.h \ +src/core/tsi/ssl_types.h \ +src/core/tsi/transport_security.c \ +src/core/tsi/transport_security.h \ +src/core/tsi/transport_security_interface.h \ third_party/nanopb/pb.h \ third_party/nanopb/pb_common.c \ third_party/nanopb/pb_common.h \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index fd12ea5c47..446a27e6cf 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -8517,24 +8517,24 @@ "gpr" ], "headers": [ - "src/core/lib/tsi/fake_transport_security.h", - "src/core/lib/tsi/ssl_transport_security.h", - "src/core/lib/tsi/ssl_types.h", - "src/core/lib/tsi/transport_security.h", - "src/core/lib/tsi/transport_security_interface.h" + "src/core/tsi/fake_transport_security.h", + "src/core/tsi/ssl_transport_security.h", + "src/core/tsi/ssl_types.h", + "src/core/tsi/transport_security.h", + "src/core/tsi/transport_security_interface.h" ], "is_filegroup": true, "language": "c", "name": "tsi", "src": [ - "src/core/lib/tsi/fake_transport_security.c", - "src/core/lib/tsi/fake_transport_security.h", - "src/core/lib/tsi/ssl_transport_security.c", - "src/core/lib/tsi/ssl_transport_security.h", - "src/core/lib/tsi/ssl_types.h", - "src/core/lib/tsi/transport_security.c", - "src/core/lib/tsi/transport_security.h", - "src/core/lib/tsi/transport_security_interface.h" + "src/core/tsi/fake_transport_security.c", + "src/core/tsi/fake_transport_security.h", + "src/core/tsi/ssl_transport_security.c", + "src/core/tsi/ssl_transport_security.h", + "src/core/tsi/ssl_types.h", + "src/core/tsi/transport_security.c", + "src/core/tsi/transport_security.h", + "src/core/tsi/transport_security_interface.h" ], "third_party": false, "type": "filegroup" diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 7abff218dd..22e61e768a 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -448,11 +448,11 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\b64.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_types.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security_interface.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_channel\client_channel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_channel\client_channel_factory.h" /> @@ -845,11 +845,11 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.c"> </ClCompile> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index aa3e5a77aa..95e96142a9 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -514,14 +514,14 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c"> - <Filter>src\core\lib\tsi</Filter> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> + <Filter>src\core\tsi</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.c"> - <Filter>src\core\lib\tsi</Filter> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> + <Filter>src\core\tsi</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c"> - <Filter>src\core\lib\tsi</Filter> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> + <Filter>src\core\tsi</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.c"> <Filter>src\core\ext\transport\chttp2\server</Filter> @@ -1238,20 +1238,20 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.h"> <Filter>src\core\lib\security\util</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.h"> - <Filter>src\core\lib\tsi</Filter> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h"> + <Filter>src\core\tsi</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.h"> - <Filter>src\core\lib\tsi</Filter> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h"> + <Filter>src\core\tsi</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_types.h"> - <Filter>src\core\lib\tsi</Filter> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h"> + <Filter>src\core\tsi</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.h"> - <Filter>src\core\lib\tsi</Filter> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h"> + <Filter>src\core\tsi</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security_interface.h"> - <Filter>src\core\lib\tsi</Filter> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h"> + <Filter>src\core\tsi</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.h"> <Filter>src\core\ext\transport\chttp2\server</Filter> @@ -1571,12 +1571,12 @@ <Filter Include="src\core\lib\transport"> <UniqueIdentifier>{e9d0d3fc-c100-f3e6-89b8-649f241155bf}</UniqueIdentifier> </Filter> - <Filter Include="src\core\lib\tsi"> - <UniqueIdentifier>{95ad2811-c8d0-7a42-2a73-baf03fcbf699}</UniqueIdentifier> - </Filter> <Filter Include="src\core\plugin_registry"> <UniqueIdentifier>{02bec99b-ff39-88d7-9dea-e0ff9f4a2701}</UniqueIdentifier> </Filter> + <Filter Include="src\core\tsi"> + <UniqueIdentifier>{0b0f9ab1-efa4-7f03-e446-6fb9b5227e84}</UniqueIdentifier> + </Filter> <Filter Include="third_party"> <UniqueIdentifier>{aaab30a4-2a15-732e-c141-3fbc0f0f5a7a}</UniqueIdentifier> </Filter> |