From 4479a822c03f957dc0dee78931ead43364863947 Mon Sep 17 00:00:00 2001
From: Taylor Brandstetter <deadbeef@webrtc.org>
Date: Tue, 14 Apr 2020 16:36:29 -0700
Subject: [PATCH] Remove deprecated SSLIdentity methods that return raw
 pointers.

Bug: webrtc:11410
Change-Id: I40e5549cb7c1082eebd870e0f133a3be0918dcaf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173571
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Taylor <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31092}
---
 rtc_base/openssl_identity.cc | 16 ----------------
 rtc_base/openssl_identity.h  |  6 ------
 rtc_base/ssl_identity.h      |  2 ++
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc
index 3bf2e9a93c..c94df40bfb 100644
--- a/rtc_base/openssl_identity.cc
+++ b/rtc_base/openssl_identity.cc
@@ -246,11 +246,6 @@ std::unique_ptr<OpenSSLIdentity> OpenSSLIdentity::CreateForTest(
   return CreateInternal(params);
 }
 
-OpenSSLIdentity* OpenSSLIdentity::GenerateForTest(
-    const SSLIdentityParams& params) {
-  return CreateInternal(params).release();
-}
-
 std::unique_ptr<SSLIdentity> OpenSSLIdentity::CreateFromPEMStrings(
     const std::string& private_key,
     const std::string& certificate) {
@@ -272,11 +267,6 @@ std::unique_ptr<SSLIdentity> OpenSSLIdentity::CreateFromPEMStrings(
       new OpenSSLIdentity(std::move(key_pair), std::move(cert)));
 }
 
-SSLIdentity* OpenSSLIdentity::FromPEMStrings(const std::string& private_key,
-                                             const std::string& certificate) {
-  return CreateFromPEMStrings(private_key, certificate).release();
-}
-
 std::unique_ptr<SSLIdentity> OpenSSLIdentity::CreateFromPEMChainStrings(
     const std::string& private_key,
     const std::string& certificate_chain) {
@@ -319,12 +309,6 @@ std::unique_ptr<SSLIdentity> OpenSSLIdentity::CreateFromPEMChainStrings(
       std::move(key_pair), std::make_unique<SSLCertChain>(std::move(certs))));
 }
 
-SSLIdentity* OpenSSLIdentity::FromPEMChainStrings(
-    const std::string& private_key,
-    const std::string& certificate_chain) {
-  return CreateFromPEMChainStrings(private_key, certificate_chain).release();
-}
-
 const OpenSSLCertificate& OpenSSLIdentity::certificate() const {
   return *static_cast<const OpenSSLCertificate*>(&cert_chain_->Get(0));
 }
diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h
index 53d0fa9972..a2ac87cf45 100644
--- a/rtc_base/openssl_identity.h
+++ b/rtc_base/openssl_identity.h
@@ -72,12 +72,6 @@ class OpenSSLIdentity final : public SSLIdentity {
   static std::unique_ptr<SSLIdentity> CreateFromPEMChainStrings(
       const std::string& private_key,
       const std::string& certificate_chain);
-  // Deprecated
-  static OpenSSLIdentity* GenerateForTest(const SSLIdentityParams& params);
-  static SSLIdentity* FromPEMStrings(const std::string& private_key,
-                                     const std::string& certificate);
-  static SSLIdentity* FromPEMChainStrings(const std::string& private_key,
-                                          const std::string& certificate_chain);
   ~OpenSSLIdentity() override;
 
   const OpenSSLCertificate& certificate() const override;
diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h
index ac642ad1e8..d078b045a7 100644
--- a/rtc_base/ssl_identity.h
+++ b/rtc_base/ssl_identity.h
@@ -116,6 +116,8 @@ class RTC_EXPORT SSLIdentity {
                                              const KeyParams& key_param);
   static std::unique_ptr<SSLIdentity> Create(const std::string& common_name,
                                              KeyType key_type);
+
+  // Allows fine-grained control over expiration time.
   static std::unique_ptr<SSLIdentity> CreateForTest(
       const SSLIdentityParams& params);