From 134fed3a8543ad59d090c74affe47652dae180b1 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 28 Mar 2017 14:27:18 -0700 Subject: [PATCH] Move src/core/lib/tsi --> src/core/tsi --- BUILD | 16 ++++---- CMakeLists.txt | 12 +++--- Makefile | 18 ++++----- binding.gyp | 6 +-- build.yaml | 18 ++++----- config.m4 | 8 ++-- gRPC-Core.podspec | 26 ++++++------- grpc.gemspec | 16 ++++---- package.xml | 16 ++++---- src/core/{lib => }/tsi/README.md | 0 .../{lib => }/tsi/fake_transport_security.c | 0 .../{lib => }/tsi/fake_transport_security.h | 0 .../{lib => }/tsi/ssl_transport_security.c | 0 .../{lib => }/tsi/ssl_transport_security.h | 0 src/core/{lib => }/tsi/ssl_types.h | 0 src/core/{lib => }/tsi/test_creds/BUILD | 0 src/core/{lib => }/tsi/test_creds/README | 0 .../{lib => }/tsi/test_creds/badclient.key | 0 .../{lib => }/tsi/test_creds/badclient.pem | 0 .../{lib => }/tsi/test_creds/badserver.key | 0 .../{lib => }/tsi/test_creds/badserver.pem | 0 .../{lib => }/tsi/test_creds/ca-openssl.cnf | 0 src/core/{lib => }/tsi/test_creds/ca.key | 0 src/core/{lib => }/tsi/test_creds/ca.pem | 0 src/core/{lib => }/tsi/test_creds/client.key | 0 src/core/{lib => }/tsi/test_creds/client.pem | 0 src/core/{lib => }/tsi/test_creds/server0.key | 0 src/core/{lib => }/tsi/test_creds/server0.pem | 0 .../tsi/test_creds/server1-openssl.cnf | 0 src/core/{lib => }/tsi/test_creds/server1.key | 0 src/core/{lib => }/tsi/test_creds/server1.pem | 0 src/core/{lib => }/tsi/transport_security.c | 0 src/core/{lib => }/tsi/transport_security.h | 0 .../tsi/transport_security_interface.h | 0 src/python/grpcio/grpc_core_dependencies.py | 6 +-- tools/doxygen/Doxyfile.core.internal | 18 ++++----- .../generated/sources_and_headers.json | 26 ++++++------- vsprojects/vcxproj/grpc/grpc.vcxproj | 16 ++++---- vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 38 +++++++++---------- 39 files changed, 120 insertions(+), 120 deletions(-) rename src/core/{lib => }/tsi/README.md (100%) rename src/core/{lib => }/tsi/fake_transport_security.c (100%) rename src/core/{lib => }/tsi/fake_transport_security.h (100%) rename src/core/{lib => }/tsi/ssl_transport_security.c (100%) rename src/core/{lib => }/tsi/ssl_transport_security.h (100%) rename src/core/{lib => }/tsi/ssl_types.h (100%) rename src/core/{lib => }/tsi/test_creds/BUILD (100%) rename src/core/{lib => }/tsi/test_creds/README (100%) rename src/core/{lib => }/tsi/test_creds/badclient.key (100%) rename src/core/{lib => }/tsi/test_creds/badclient.pem (100%) rename src/core/{lib => }/tsi/test_creds/badserver.key (100%) rename src/core/{lib => }/tsi/test_creds/badserver.pem (100%) rename src/core/{lib => }/tsi/test_creds/ca-openssl.cnf (100%) rename src/core/{lib => }/tsi/test_creds/ca.key (100%) rename src/core/{lib => }/tsi/test_creds/ca.pem (100%) rename src/core/{lib => }/tsi/test_creds/client.key (100%) rename src/core/{lib => }/tsi/test_creds/client.pem (100%) rename src/core/{lib => }/tsi/test_creds/server0.key (100%) rename src/core/{lib => }/tsi/test_creds/server0.pem (100%) rename src/core/{lib => }/tsi/test_creds/server1-openssl.cnf (100%) rename src/core/{lib => }/tsi/test_creds/server1.key (100%) rename src/core/{lib => }/tsi/test_creds/server1.pem (100%) rename src/core/{lib => }/tsi/transport_security.c (100%) rename src/core/{lib => }/tsi/transport_security.h (100%) rename src/core/{lib => }/tsi/transport_security_interface.h (100%) diff --git a/BUILD b/BUILD index d6598487fba..f6187e0998e 100644 --- a/BUILD +++ b/BUILD @@ -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 f54e78b560d..7b8e49e1262 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 diff --git a/Makefile b/Makefile index bfc43aab28e..425160403fe 100644 --- a/Makefile +++ b/Makefile @@ -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 b91f5f61e21..f1cef607ec0 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 6e590f4ca6b..6a89b71fb2f 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 diff --git a/config.m4 b/config.m4 index b6f0bff7ef0..6ce7d70c5b6 100644 --- a/config.m4 +++ b/config.m4 @@ -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 8ea9e5fbdec..97bd3c28643 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 06da332bed5..cb51da1b574 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 5d585845556..afac1800bed 100644 --- a/package.xml +++ b/package.xml @@ -329,11 +329,11 @@ - - - - - + + + + + @@ -553,9 +553,9 @@ - - - + + + diff --git a/src/core/lib/tsi/README.md b/src/core/tsi/README.md similarity index 100% rename from src/core/lib/tsi/README.md rename to src/core/tsi/README.md diff --git a/src/core/lib/tsi/fake_transport_security.c b/src/core/tsi/fake_transport_security.c similarity index 100% rename from src/core/lib/tsi/fake_transport_security.c rename to 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 similarity index 100% rename from src/core/lib/tsi/fake_transport_security.h rename to 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 similarity index 100% rename from src/core/lib/tsi/ssl_transport_security.c rename to 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 similarity index 100% rename from src/core/lib/tsi/ssl_transport_security.h rename to src/core/tsi/ssl_transport_security.h diff --git a/src/core/lib/tsi/ssl_types.h b/src/core/tsi/ssl_types.h similarity index 100% rename from src/core/lib/tsi/ssl_types.h rename to src/core/tsi/ssl_types.h diff --git a/src/core/lib/tsi/test_creds/BUILD b/src/core/tsi/test_creds/BUILD similarity index 100% rename from src/core/lib/tsi/test_creds/BUILD rename to src/core/tsi/test_creds/BUILD diff --git a/src/core/lib/tsi/test_creds/README b/src/core/tsi/test_creds/README similarity index 100% rename from src/core/lib/tsi/test_creds/README rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/badclient.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/badclient.pem rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/badserver.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/badserver.pem rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/ca-openssl.cnf rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/ca.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/ca.pem rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/client.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/client.pem rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/server0.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/server0.pem rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/server1-openssl.cnf rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/server1.key rename to 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 similarity index 100% rename from src/core/lib/tsi/test_creds/server1.pem rename to src/core/tsi/test_creds/server1.pem diff --git a/src/core/lib/tsi/transport_security.c b/src/core/tsi/transport_security.c similarity index 100% rename from src/core/lib/tsi/transport_security.c rename to src/core/tsi/transport_security.c diff --git a/src/core/lib/tsi/transport_security.h b/src/core/tsi/transport_security.h similarity index 100% rename from src/core/lib/tsi/transport_security.h rename to 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 similarity index 100% rename from src/core/lib/tsi/transport_security_interface.h rename to 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 258c65c08e9..970c70bb1b0 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 d09ddaa04dc..a15b624f34a 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 fd12ea5c471..446a27e6cfd 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 7abff218dde..22e61e768a2 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -448,11 +448,11 @@ - - - - - + + + + + @@ -845,11 +845,11 @@ - + - + - + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index aa3e5a77aa6..95e96142a92 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -514,14 +514,14 @@ src\core\lib\surface - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi src\core\ext\transport\chttp2\server @@ -1238,20 +1238,20 @@ src\core\lib\security\util - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi - - src\core\lib\tsi + + src\core\tsi src\core\ext\transport\chttp2\server @@ -1571,12 +1571,12 @@ {e9d0d3fc-c100-f3e6-89b8-649f241155bf} - - {95ad2811-c8d0-7a42-2a73-baf03fcbf699} - {02bec99b-ff39-88d7-9dea-e0ff9f4a2701} + + {0b0f9ab1-efa4-7f03-e446-6fb9b5227e84} + {aaab30a4-2a15-732e-c141-3fbc0f0f5a7a}