Revert "Add ALTS C stack to gRPC core"

7 files changed, 2 insertions, 940 deletions

diff --git a/tools/codegen/core/gen_nano_proto.sh b/tools/codegen/core/gen_nano_proto.sh
index 6ce15178bd..4246840173 100755
--- a/tools/codegen/core/gen_nano_proto.sh
+++ b/tools/codegen/core/gen_nano_proto.sh
@@ -43,9 +43,9 @@ if [[ ! -f "$INPUT_PROTO" ]]; then
   echo "Input proto file '$INPUT_PROTO' doesn't exist."
   exit 2
 fi
-
 if [[ ! -f "${EXPECTED_OPTIONS_FILE_PATH}" ]]; then
-  echo "Input proto file may need .options file to be correctly compiled."
+  echo "Expected nanopb options file '${EXPECTED_OPTIONS_FILE_PATH}' missing"
+  exit 3
 fi
 
 if [[ "${OUTPUT_DIR:0:1}" != '/' ]]; then
@@ -81,11 +81,6 @@ readonly PROTO_BASENAME=$(basename $INPUT_PROTO .proto)
 sed -i "s:$PROTO_BASENAME.pb.h:${GRPC_OUTPUT_DIR}/$PROTO_BASENAME.pb.h:g" \
   "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
 
-if [ $PROTO_BASENAME == "handshaker" ] || [ $PROTO_BASENAME == "altscontext" ]; then
-  sed -i "s:transport_security_common.pb.h:${GRPC_OUTPUT_DIR}/transport_security_common.pb.h:g" \
-    "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
-fi
-
 # Fix up the include guards such that they pass the check_include_guards.py
 # test. Assumes that the generated files are being placed in gRPC src dir.
 readonly INCLUDE_GUARD_BASE=`echo $GRPC_OUTPUT_DIR | tr [a-z/] [A-Z_] | sed s:^.*SRC_::`
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py
index e7893a1fd5..6e1a303fb0 100755
--- a/tools/distrib/check_copyright.py
+++ b/tools/distrib/check_copyright.py
@@ -77,12 +77,6 @@ _EXEMPT = frozenset((
     'examples/python/route_guide/route_guide_pb2_grpc.py',
     'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
     'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
-    'src/core/tsi/alts/handshaker/altscontext.pb.h',
-    'src/core/tsi/alts/handshaker/altscontext.pb.c',
-    'src/core/tsi/alts/handshaker/handshaker.pb.h',
-    'src/core/tsi/alts/handshaker/handshaker.pb.c',
-    'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
-    'src/core/tsi/alts/handshaker/transport_security_common.pb.c',
     'src/cpp/server/health/health.pb.h',
     'src/cpp/server/health/health.pb.c',
 
diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py
index b356a74d2d..05d34c2b28 100755
--- a/tools/distrib/check_include_guards.py
+++ b/tools/distrib/check_include_guards.py
@@ -157,9 +157,6 @@ args = argp.parse_args()
 
 KNOWN_BAD = set([
     'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
-    'src/core/tsi/alts/handshaker/altscontext.pb.h',
-    'src/core/tsi/alts/handshaker/handshaker.pb.h',
-    'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
     'include/grpc++/ext/reflection.grpc.pb.h',
     'include/grpc++/ext/reflection.pb.h',
 ])
diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh
index 8b5823b938..a30b73f689 100755
--- a/tools/distrib/check_nanopb_output.sh
+++ b/tools/distrib/check_nanopb_output.sh
@@ -15,7 +15,6 @@
 
 set -ex
 
-readonly NANOPB_ALTS_TMP_OUTPUT="$(mktemp -d)"
 readonly NANOPB_TMP_OUTPUT="$(mktemp -d)"
 readonly PROTOBUF_INSTALL_PREFIX="$(mktemp -d)"
 
@@ -56,29 +55,3 @@ if ! diff -r "$NANOPB_TMP_OUTPUT" src/core/ext/filters/client_channel/lb_policy/
   echo "Outputs differ: $NANOPB_TMP_OUTPUT vs $LOAD_BALANCER_GRPC_OUTPUT_PATH"
   exit 2
 fi
-
-#
-# Checks for handshaker.proto and transport_security_common.proto
-#
-readonly HANDSHAKER_GRPC_OUTPUT_PATH='src/core/tsi/alts/handshaker'
-# nanopb-compile the proto to a temp location
-./tools/codegen/core/gen_nano_proto.sh \
-  src/core/tsi/alts/handshaker/proto/handshaker.proto \
-  "$NANOPB_ALTS_TMP_OUTPUT" \
-  "$HANDSHAKER_GRPC_OUTPUT_PATH"
-./tools/codegen/core/gen_nano_proto.sh \
-  src/core/tsi/alts/handshaker/proto/transport_security_common.proto \
-  "$NANOPB_ALTS_TMP_OUTPUT" \
-  "$HANDSHAKER_GRPC_OUTPUT_PATH"
-./tools/codegen/core/gen_nano_proto.sh \
-  src/core/tsi/alts/handshaker/proto/altscontext.proto \
-  "$NANOPB_ALTS_TMP_OUTPUT" \
-  "$HANDSHAKER_GRPC_OUTPUT_PATH"
-
-# compare outputs to checked compiled code
-for NANOPB_OUTPUT_FILE in $NANOPB_ALTS_TMP_OUTPUT/*.pb.*; do
-  if ! diff "$NANOPB_OUTPUT_FILE" "src/core/tsi/alts/handshaker/$(basename $NANOPB_OUTPUT_FILE)"; then
-    echo "Outputs differ: $NANOPB_ALTS_TMP_OUTPUT vs $HANDSHAKER_GRPC_OUTPUT_PATH"
-    exit 2
-  fi
-done
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index e7e9e04979..57f9147f44 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1284,17 +1284,6 @@ src/core/lib/profiling/stap_timers.cc \
 src/core/lib/profiling/timers.h \
 src/core/lib/security/context/security_context.cc \
 src/core/lib/security/context/security_context.h \
-src/core/lib/security/credentials/alts/alts_credentials.cc \
-src/core/lib/security/credentials/alts/alts_credentials.h \
-src/core/lib/security/credentials/alts/check_gcp_environment.cc \
-src/core/lib/security/credentials/alts/check_gcp_environment.h \
-src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc \
-src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc \
-src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc \
-src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc \
-src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc \
-src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h \
-src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc \
 src/core/lib/security/credentials/composite/composite_credentials.cc \
 src/core/lib/security/credentials/composite/composite_credentials.h \
 src/core/lib/security/credentials/credentials.cc \
@@ -1319,8 +1308,6 @@ src/core/lib/security/credentials/plugin/plugin_credentials.cc \
 src/core/lib/security/credentials/plugin/plugin_credentials.h \
 src/core/lib/security/credentials/ssl/ssl_credentials.cc \
 src/core/lib/security/credentials/ssl/ssl_credentials.h \
-src/core/lib/security/security_connector/alts_security_connector.cc \
-src/core/lib/security/security_connector/alts_security_connector.h \
 src/core/lib/security/security_connector/security_connector.cc \
 src/core/lib/security/security_connector/security_connector.h \
 src/core/lib/security/transport/auth_filters.h \
@@ -1414,53 +1401,6 @@ 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/crypt/aes_gcm.cc \
-src/core/tsi/alts/crypt/gsec.cc \
-src/core/tsi/alts/crypt/gsec.h \
-src/core/tsi/alts/frame_protector/alts_counter.cc \
-src/core/tsi/alts/frame_protector/alts_counter.h \
-src/core/tsi/alts/frame_protector/alts_crypter.cc \
-src/core/tsi/alts/frame_protector/alts_crypter.h \
-src/core/tsi/alts/frame_protector/alts_frame_protector.cc \
-src/core/tsi/alts/frame_protector/alts_frame_protector.h \
-src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc \
-src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h \
-src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc \
-src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
-src/core/tsi/alts/frame_protector/frame_handler.cc \
-src/core/tsi/alts/frame_protector/frame_handler.h \
-src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
-src/core/tsi/alts/handshaker/alts_handshaker_client.h \
-src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc \
-src/core/tsi/alts/handshaker/alts_handshaker_service_api.h \
-src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc \
-src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h \
-src/core/tsi/alts/handshaker/alts_tsi_event.cc \
-src/core/tsi/alts/handshaker/alts_tsi_event.h \
-src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
-src/core/tsi/alts/handshaker/alts_tsi_handshaker.h \
-src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h \
-src/core/tsi/alts/handshaker/alts_tsi_utils.cc \
-src/core/tsi/alts/handshaker/alts_tsi_utils.h \
-src/core/tsi/alts/handshaker/altscontext.pb.c \
-src/core/tsi/alts/handshaker/altscontext.pb.h \
-src/core/tsi/alts/handshaker/handshaker.pb.c \
-src/core/tsi/alts/handshaker/handshaker.pb.h \
-src/core/tsi/alts/handshaker/transport_security_common.pb.c \
-src/core/tsi/alts/handshaker/transport_security_common.pb.h \
-src/core/tsi/alts/handshaker/transport_security_common_api.cc \
-src/core/tsi/alts/handshaker/transport_security_common_api.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc \
-src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc \
-src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h \
-src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc \
-src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h \
 src/core/tsi/alts_transport_security.cc \
 src/core/tsi/alts_transport_security.h \
 src/core/tsi/fake_transport_security.cc \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 724967145e..6b8b26f41b 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -2417,215 +2417,6 @@
   }, 
   {
     "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_counter_test", 
-    "src": [
-      "test/core/tsi/alts/frame_protector/alts_counter_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_crypt_test", 
-    "src": [
-      "test/core/tsi/alts/crypt/aes_gcm_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_crypter_test", 
-    "src": [
-      "test/core/tsi/alts/frame_protector/alts_crypter_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_frame_handler_test", 
-    "src": [
-      "test/core/tsi/alts/frame_protector/frame_handler_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc", 
-      "transport_security_test_lib"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_frame_protector_test", 
-    "src": [
-      "test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_grpc_record_protocol_test", 
-    "src": [
-      "test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_handshaker_client_test", 
-    "src": [
-      "test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_handshaker_service_api_test", 
-    "src": [
-      "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_iovec_record_protocol_test", 
-    "src": [
-      "test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_security_connector_test", 
-    "src": [
-      "test/core/security/alts_security_connector_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_tsi_handshaker_test", 
-    "src": [
-      "test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_tsi_utils_test", 
-    "src": [
-      "test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "alts_zero_copy_grpc_protector_test", 
-    "src": [
-      "test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3037,36 +2828,6 @@
   {
     "deps": [
       "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "check_gcp_environment_linux_test", 
-    "src": [
-      "test/core/security/check_gcp_environment_linux_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "check_gcp_environment_windows_test", 
-    "src": [
-      "test/core/security/check_gcp_environment_windows_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "gpr", 
       "gpr_test_util", 
       "grpc", 
       "grpc_test_util"
@@ -3452,21 +3213,6 @@
   {
     "deps": [
       "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "grpc_alts_credentials_options_test", 
-    "src": [
-      "test/core/security/grpc_alts_credentials_options_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "gpr", 
       "grpc", 
       "grpc++", 
       "grpc++_proto_reflection_desc_db", 
@@ -4627,22 +4373,6 @@
   }, 
   {
     "deps": [
-      "alts_test_util", 
-      "gpr", 
-      "grpc"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "transport_security_common_api_test", 
-    "src": [
-      "test/core/tsi/alts/handshaker/transport_security_common_api_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6561,26 +6291,6 @@
   }, 
   {
     "deps": [
-      "grpc"
-    ], 
-    "headers": [
-      "test/core/tsi/alts/crypt/gsec_test_util.h", 
-      "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
-    ], 
-    "is_filegroup": false, 
-    "language": "c", 
-    "name": "alts_test_util", 
-    "src": [
-      "test/core/tsi/alts/crypt/gsec_test_util.cc", 
-      "test/core/tsi/alts/crypt/gsec_test_util.h", 
-      "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc", 
-      "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
-    ], 
-    "third_party": false, 
-    "type": "lib"
-  }, 
-  {
-    "deps": [
       "gpr_base"
     ], 
     "headers": [], 
@@ -8579,138 +8289,6 @@
   }, 
   {
     "deps": [
-      "nanopb"
-    ], 
-    "headers": [
-      "src/core/tsi/alts/handshaker/altscontext.pb.h", 
-      "src/core/tsi/alts/handshaker/handshaker.pb.h", 
-      "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
-    ], 
-    "is_filegroup": true, 
-    "language": "c", 
-    "name": "alts_proto", 
-    "src": [
-      "src/core/tsi/alts/handshaker/altscontext.pb.c", 
-      "src/core/tsi/alts/handshaker/altscontext.pb.h", 
-      "src/core/tsi/alts/handshaker/handshaker.pb.c", 
-      "src/core/tsi/alts/handshaker/handshaker.pb.h", 
-      "src/core/tsi/alts/handshaker/transport_security_common.pb.c", 
-      "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
-    ], 
-    "third_party": false, 
-    "type": "filegroup"
-  }, 
-  {
-    "deps": [
-      "alts_util", 
-      "gpr", 
-      "grpc_base", 
-      "grpc_transport_chttp2_client_insecure", 
-      "tsi", 
-      "tsi_interface"
-    ], 
-    "headers": [
-      "src/core/tsi/alts/crypt/gsec.h", 
-      "src/core/tsi/alts/frame_protector/alts_counter.h", 
-      "src/core/tsi/alts/frame_protector/alts_crypter.h", 
-      "src/core/tsi/alts/frame_protector/alts_frame_protector.h", 
-      "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h", 
-      "src/core/tsi/alts/frame_protector/frame_handler.h", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_client.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_event.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
-    ], 
-    "is_filegroup": true, 
-    "language": "c", 
-    "name": "alts_tsi", 
-    "src": [
-      "src/core/tsi/alts/crypt/aes_gcm.cc", 
-      "src/core/tsi/alts/crypt/gsec.cc", 
-      "src/core/tsi/alts/crypt/gsec.h", 
-      "src/core/tsi/alts/frame_protector/alts_counter.cc", 
-      "src/core/tsi/alts/frame_protector/alts_counter.h", 
-      "src/core/tsi/alts/frame_protector/alts_crypter.cc", 
-      "src/core/tsi/alts/frame_protector/alts_crypter.h", 
-      "src/core/tsi/alts/frame_protector/alts_frame_protector.cc", 
-      "src/core/tsi/alts/frame_protector/alts_frame_protector.h", 
-      "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc", 
-      "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h", 
-      "src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc", 
-      "src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc", 
-      "src/core/tsi/alts/frame_protector/frame_handler.cc", 
-      "src/core/tsi/alts/frame_protector/frame_handler.h", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_client.cc", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_client.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_event.cc", 
-      "src/core/tsi/alts/handshaker/alts_tsi_event.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc", 
-      "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc", 
-      "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
-    ], 
-    "third_party": false, 
-    "type": "filegroup"
-  }, 
-  {
-    "deps": [
-      "alts_proto", 
-      "gpr", 
-      "grpc_base", 
-      "nanopb", 
-      "tsi_interface"
-    ], 
-    "headers": [
-      "src/core/lib/security/credentials/alts/check_gcp_environment.h", 
-      "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api.h", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_utils.h", 
-      "src/core/tsi/alts/handshaker/transport_security_common_api.h"
-    ], 
-    "is_filegroup": true, 
-    "language": "c", 
-    "name": "alts_util", 
-    "src": [
-      "src/core/lib/security/credentials/alts/check_gcp_environment.cc", 
-      "src/core/lib/security/credentials/alts/check_gcp_environment.h", 
-      "src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc", 
-      "src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc", 
-      "src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc", 
-      "src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc", 
-      "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc", 
-      "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h", 
-      "src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api.h", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc", 
-      "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h", 
-      "src/core/tsi/alts/handshaker/alts_tsi_utils.cc", 
-      "src/core/tsi/alts/handshaker/alts_tsi_utils.h", 
-      "src/core/tsi/alts/handshaker/transport_security_common_api.cc", 
-      "src/core/tsi/alts/handshaker/transport_security_common_api.h"
-    ], 
-    "third_party": false, 
-    "type": "filegroup"
-  }, 
-  {
-    "deps": [
       "gpr", 
       "grpc_base", 
       "nanopb"
@@ -9793,7 +9371,6 @@
   }, 
   {
     "deps": [
-      "alts_tsi", 
       "gpr", 
       "grpc_base", 
       "grpc_transport_chttp2_alpn", 
@@ -9802,7 +9379,6 @@
     "headers": [
       "include/grpc/grpc_security.h", 
       "src/core/lib/security/context/security_context.h", 
-      "src/core/lib/security/credentials/alts/alts_credentials.h", 
       "src/core/lib/security/credentials/composite/composite_credentials.h", 
       "src/core/lib/security/credentials/credentials.h", 
       "src/core/lib/security/credentials/fake/fake_credentials.h", 
@@ -9814,7 +9390,6 @@
       "src/core/lib/security/credentials/oauth2/oauth2_credentials.h", 
       "src/core/lib/security/credentials/plugin/plugin_credentials.h", 
       "src/core/lib/security/credentials/ssl/ssl_credentials.h", 
-      "src/core/lib/security/security_connector/alts_security_connector.h", 
       "src/core/lib/security/security_connector/security_connector.h", 
       "src/core/lib/security/transport/auth_filters.h", 
       "src/core/lib/security/transport/secure_endpoint.h", 
@@ -9831,8 +9406,6 @@
       "src/core/lib/http/httpcli_security_connector.cc", 
       "src/core/lib/security/context/security_context.cc", 
       "src/core/lib/security/context/security_context.h", 
-      "src/core/lib/security/credentials/alts/alts_credentials.cc", 
-      "src/core/lib/security/credentials/alts/alts_credentials.h", 
       "src/core/lib/security/credentials/composite/composite_credentials.cc", 
       "src/core/lib/security/credentials/composite/composite_credentials.h", 
       "src/core/lib/security/credentials/credentials.cc", 
@@ -9857,8 +9430,6 @@
       "src/core/lib/security/credentials/plugin/plugin_credentials.h", 
       "src/core/lib/security/credentials/ssl/ssl_credentials.cc", 
       "src/core/lib/security/credentials/ssl/ssl_credentials.h", 
-      "src/core/lib/security/security_connector/alts_security_connector.cc", 
-      "src/core/lib/security/security_connector/alts_security_connector.h", 
       "src/core/lib/security/security_connector/security_connector.cc", 
       "src/core/lib/security/security_connector/security_connector.h", 
       "src/core/lib/security/transport/auth_filters.h", 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index b7fdb6f579..6ce7ec28c4 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2876,318 +2876,6 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_counter_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_crypt_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_crypter_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_frame_handler_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_frame_protector_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_grpc_record_protocol_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_handshaker_client_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_handshaker_service_api_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_iovec_record_protocol_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_security_connector_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_tsi_handshaker_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_tsi_utils_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "alts_zero_copy_grpc_protector_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
     "gtest": true, 
     "language": "c++", 
     "name": "async_end2end_test", 
@@ -3662,54 +3350,6 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "check_gcp_environment_linux_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "check_gcp_environment_windows_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
     "gtest": true, 
     "language": "c++", 
     "name": "chttp2_settings_timeout_test", 
@@ -4142,30 +3782,6 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "grpc_alts_credentials_options_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
     "gtest": true, 
     "language": "c++", 
     "name": "grpc_tool_test", 
@@ -5062,30 +4678,6 @@
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": false, 
-    "language": "c++", 
-    "name": "transport_security_common_api_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
       "posix"
     ], 
     "cpu_cost": 0.5,