Fix some bad merge conflicts.

include/grpc/grpc_security.h

@@ -831,22 +831,6 @@ GRPCAPI void grpc_tls_credentials_options_set_min_tls_version(
 GRPCAPI void grpc_tls_credentials_options_set_max_tls_version(
     grpc_tls_credentials_options* options, grpc_tls_version max_tls_version);
 
-/**
- * EXPERIMENTAL API - Subject to change
- *
- * Copies a grpc_tls_credentials_options.
- */
-GRPCAPI grpc_tls_credentials_options* grpc_tls_credentials_options_copy(
-    grpc_tls_credentials_options* options);
-
-/**
- * EXPERIMENTAL API - Subject to change
- *
- * Destroys a grpc_tls_credentials_options.
- */
-GRPCAPI void grpc_tls_credentials_options_destroy(
-    grpc_tls_credentials_options* options);
-
 /**
  * EXPERIMENTAL API - Subject to change
  *

include/grpcpp/security/tls_credentials_options.h

@@ -104,8 +104,6 @@ class TlsCredentialsOptions {
   // version > 1.1.
   void set_crl_directory(const std::string& path);
 
-  void set_crl_provider(std::shared_ptr<CrlProvider> crl_provider);
-
   // Sets the minimum TLS version that will be negotiated during the TLS
   // handshake. If not set, the underlying SSL library will use TLS v1.2.
   // @param tls_version: The minimum TLS version.

src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc

@@ -121,21 +121,6 @@ void grpc_tls_credentials_options_set_tls_session_key_log_file_path(
   options->set_tls_session_key_log_file_path(path != nullptr ? path : "");
 }
 
-void grpc_tls_credentials_options_set_send_client_ca_list(
-    grpc_tls_credentials_options* options, bool send_client_ca_list) {
-  if (options == nullptr) {
-    return;
-  }
-  options->set_send_client_ca_list(send_client_ca_list);
-}
-
-void grpc_tls_credentials_options_set_crl_provider(
-    grpc_tls_credentials_options* options,
-    std::shared_ptr<grpc_core::experimental::CrlProvider> provider) {
-  GPR_ASSERT(options != nullptr);
-  options->set_crl_provider(provider);
-}
-
 void grpc_tls_credentials_options_set_min_tls_version(
     grpc_tls_credentials_options* options, grpc_tls_version min_tls_version) {
   GPR_ASSERT(options != nullptr);

src/core/lib/security/credentials/tls/tls_credentials.cc

@@ -62,14 +62,6 @@ bool CredentialOptionSanityCheck(grpc_tls_credentials_options* options,
     grpc_tls_credentials_options_destroy(options);
     return false;
   }
-  if (!options->crl_directory().empty() && options->crl_provider() != nullptr) {
-    gpr_log(GPR_ERROR,
-            "Setting crl_directory and crl_provider not supported. Using the "
-            "crl_provider.");
-    // TODO(gtcooke94) - Maybe return false here. Right now object lifetime of
-    // this options struct is leaky if false is returned and represents a more
-    // complex fix to handle in another PR.
-  }
   // In the following conditions, there won't be any issues, but it might
   // indicate callers are doing something wrong with the API.
   if (is_client && options->cert_request_type() !=

src/cpp/common/tls_credentials_options.cc

@@ -97,11 +97,6 @@ void TlsCredentialsOptions::set_max_tls_version(grpc_tls_version tls_version) {
   grpc_tls_credentials_options_set_max_tls_version(options, tls_version);
 }
 
-grpc_tls_credentials_options* TlsCredentialsOptions::c_credentials_options()
-    const {
-  return grpc_tls_credentials_options_copy(c_credentials_options_);
-}
-
 void TlsCredentialsOptions::set_check_call_host(bool check_call_host) {
   grpc_tls_credentials_options* options = c_credentials_options();
   GPR_ASSERT(options != nullptr);

test/cpp/client/credentials_test.cc

@@ -396,104 +396,6 @@ TEST(CredentialsTest, TlsChannelCredentialsWithCrlDirectory) {
   GPR_ASSERT(channel_credentials.get() != nullptr);
 }
 
-TEST(CredentialsTest, TlsChannelCredentialsWithCrlProvider) {
-  auto provider = experimental::CreateStaticCrlProvider({});
-  ASSERT_TRUE(provider.ok());
-  grpc::experimental::TlsChannelCredentialsOptions options;
-  options.set_crl_provider(*provider);
-  auto channel_credentials = grpc::experimental::TlsCredentials(options);
-  GPR_ASSERT(channel_credentials.get() != nullptr);
-}
-
-TEST(CredentialsTest, TlsChannelCredentialsWithCrlProviderAndDirectory) {
-  auto provider = experimental::CreateStaticCrlProvider({});
-  ASSERT_TRUE(provider.ok());
-  grpc::experimental::TlsChannelCredentialsOptions options;
-  options.set_crl_directory(CRL_DIR_PATH);
-  options.set_crl_provider(*provider);
-  auto channel_credentials = grpc::experimental::TlsCredentials(options);
-  // TODO(gtcooke94) - behavior might change to make this return nullptr in the
-  // future
-  GPR_ASSERT(channel_credentials.get() != nullptr);
-}
-
-TEST(CredentialsTest, TlsCredentialsOptionsDoesNotLeak) {
-  TlsCredentialsOptions options;
-  (void)options;
-}
-
-TEST(CredentialsTest, MultipleOptionsOneCertificateProviderDoesNotLeak) {
-  auto provider = std::make_shared<StaticDataCertificateProvider>("root-pem");
-  TlsCredentialsOptions options_1;
-  options_1.set_certificate_provider(provider);
-  TlsCredentialsOptions options_2;
-  options_2.set_certificate_provider(provider);
-}
-
-TEST(CredentialsTest, MultipleOptionsOneCertificateVerifierDoesNotLeak) {
-  auto verifier = std::make_shared<NoOpCertificateVerifier>();
-  TlsCredentialsOptions options_1;
-  options_1.set_certificate_verifier(verifier);
-  TlsCredentialsOptions options_2;
-  options_2.set_certificate_verifier(verifier);
-}
-
-TEST(CredentialsTest, MultipleOptionsOneCrlProviderDoesNotLeak) {
-  auto crl_provider = CreateStaticCrlProvider(/*crls=*/{});
-  EXPECT_TRUE(crl_provider.ok());
-  TlsCredentialsOptions options_1;
-  options_1.set_crl_provider(*crl_provider);
-  TlsCredentialsOptions options_2;
-  options_2.set_crl_provider(*crl_provider);
-}
-
-TEST(CredentialsTest, TlsChannelCredentialsDoesNotLeak) {
-  TlsChannelCredentialsOptions options;
-  auto channel_creds = TlsCredentials(options);
-  EXPECT_NE(channel_creds, nullptr);
-}
-
-TEST(CredentialsTest, MultipleChannelCredentialsSameOptionsDoesNotLeak) {
-  TlsChannelCredentialsOptions options;
-  auto channel_creds_1 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_1, nullptr);
-  auto channel_creds_2 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_2, nullptr);
-}
-
-TEST(CredentialsTest,
-     MultipleChannelCredentialsOneCertificateProviderDoesNotLeak) {
-  TlsChannelCredentialsOptions options;
-  auto provider = std::make_shared<StaticDataCertificateProvider>("root-pem");
-  options.set_certificate_provider(provider);
-  auto channel_creds_1 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_1, nullptr);
-  auto channel_creds_2 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_2, nullptr);
-}
-
-TEST(CredentialsTest,
-     MultipleChannelCredentialsOneCertificateVerifierDoesNotLeak) {
-  TlsChannelCredentialsOptions options;
-  auto verifier = std::make_shared<NoOpCertificateVerifier>();
-  options.set_certificate_verifier(verifier);
-  auto channel_creds_1 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_1, nullptr);
-  auto channel_creds_2 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_2, nullptr);
-}
-
-TEST(CredentialsTest, MultipleChannelCredentialsOneCrlProviderDoesNotLeak) {
-  TlsChannelCredentialsOptions options;
-  auto provider = CreateStaticCrlProvider(/*crls=*/{});
-  EXPECT_TRUE(provider.ok());
-  options.set_crl_provider(*provider);
-  auto channel_creds_1 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_1, nullptr);
-  auto channel_creds_2 = TlsCredentials(options);
-  EXPECT_NE(channel_creds_2, nullptr);
-}
-
 TEST(CredentialsTest, TlsChannelCredentialsWithGoodMinAndMaxTlsVersions) {
   grpc::experimental::TlsChannelCredentialsOptions options;
   options.set_min_tls_version(grpc_tls_version::TLS1_2);