|  | @@ -3258,10 +3258,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  LIBEND2END_NOSEC_TESTS_SRC = \
 | 
	
		
			
				|  |  |      test/core/end2end/cq_verifier.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/end2end_nosec_tests.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/end2end_test_utils.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/fixtures/http_proxy_fixture.cc \
 | 
	
	
		
			
				|  | @@ -3370,10 +3366,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  LIBEND2END_TESTS_SRC = \
 | 
	
		
			
				|  |  |      test/core/end2end/cq_verifier.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/end2end_test_utils.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/end2end_tests.cc \
 | 
	
		
			
				|  |  |      test/core/end2end/fixtures/http_proxy_fixture.cc \
 | 
	
	
		
			
				|  | @@ -9999,10 +9991,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  SEQUENTIAL_CONNECTIVITY_TEST_SRC = \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/surface/sequential_connectivity_test.cc \
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  SEQUENTIAL_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SEQUENTIAL_CONNECTIVITY_TEST_SRC))))
 | 
	
	
		
			
				|  | @@ -10023,14 +10011,6 @@ $(BINDIR)/$(CONFIG)/sequential_connectivity_test: $(SEQUENTIAL_CONNECTIVITY_TEST
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/client_certs.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/surface/sequential_connectivity_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  deps_sequential_connectivity_test: $(SEQUENTIAL_CONNECTIVITY_TEST_OBJS:.o=.dep)
 | 
	
	
		
			
				|  | @@ -14701,10 +14681,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  GRPC_TLS_CREDENTIALS_OPTIONS_TEST_SRC = \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/security/grpc_tls_credentials_options_test.cc \
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  GRPC_TLS_CREDENTIALS_OPTIONS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_TLS_CREDENTIALS_OPTIONS_TEST_SRC))))
 | 
	
	
		
			
				|  | @@ -14736,14 +14712,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/client_certs.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/security/grpc_tls_credentials_options_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  deps_grpc_tls_credentials_options_test: $(GRPC_TLS_CREDENTIALS_OPTIONS_TEST_OBJS:.o=.dep)
 | 
	
	
		
			
				|  | @@ -17864,10 +17832,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  SSL_SERVER_FUZZER_SRC = \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/security/ssl_server_fuzzer.cc \
 | 
	
		
			
				|  |  |      test/core/util/fuzzer_corpus_test.cc \
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -17900,14 +17864,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/client_certs.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/security/ssl_server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/util/fuzzer_corpus_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
	
		
			
				|  | @@ -18507,10 +18463,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  TLS_SECURITY_CONNECTOR_TEST_SRC = \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/security/tls_security_connector_test.cc \
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  TLS_SECURITY_CONNECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TLS_SECURITY_CONNECTOR_TEST_SRC))))
 | 
	
	
		
			
				|  | @@ -18542,14 +18494,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/client_certs.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/security/tls_security_connector_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  deps_tls_security_connector_test: $(TLS_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
 | 
	
	
		
			
				|  | @@ -19884,10 +19828,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  SSL_SERVER_FUZZER_ONE_ENTRY_SRC = \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/client_certs.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_cert.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/server1_key.cc \
 | 
	
		
			
				|  |  | -    test/core/end2end/data/test_root_cert.cc \
 | 
	
		
			
				|  |  |      test/core/security/ssl_server_fuzzer.cc \
 | 
	
		
			
				|  |  |      test/core/util/one_corpus_entry_fuzzer.cc \
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -19920,14 +19860,6 @@ endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  endif
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/client_certs.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/security/ssl_server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  $(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
 | 
	
	
		
			
				|  | @@ -20091,6 +20023,10 @@ src/cpp/server/channelz/channelz_service_plugin.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  src/cpp/util/error_details.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  | +test/core/end2end/data/client_certs.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  | +test/core/end2end/data/server1_cert.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  | +test/core/end2end/data/server1_key.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  | +test/core/end2end/data/test_root_cert.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  test/core/end2end/end2end_tests.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  test/core/end2end/tests/call_creds.cc: $(OPENSSL_DEP)
 | 
	
		
			
				|  |  |  test/cpp/microbenchmarks/helpers.cc: $(OPENSSL_DEP)
 |