From 9f297b5960aef0b1dbb0e5921be84412a808a5b1 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Sun, 12 Apr 2020 18:36:55 +0200
Subject: [PATCH] Remove OpenSSLIdentity::GenerateWithExpiration.

These static functions were marked as deprecated and since they
are not used this CL just removes them.

Bug: webrtc:10198
Change-Id: I4872e31701543c988fe71ab4e0b32bd73ff07753
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173467
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31057}
---
 rtc_base/openssl_identity.cc |  8 --------
 rtc_base/openssl_identity.h  |  5 +----
 rtc_base/ssl_identity.cc     | 22 ----------------------
 rtc_base/ssl_identity.h      | 11 -----------
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc
index 5b23df9f53..ae38121f10 100644
--- a/rtc_base/openssl_identity.cc
+++ b/rtc_base/openssl_identity.cc
@@ -241,14 +241,6 @@ std::unique_ptr<OpenSSLIdentity> OpenSSLIdentity::CreateWithExpiration(
   return CreateInternal(params);
 }
 
-OpenSSLIdentity* OpenSSLIdentity::GenerateWithExpiration(
-    const std::string& common_name,
-    const KeyParams& key_params,
-    time_t certificate_lifetime) {
-  return CreateWithExpiration(common_name, key_params, certificate_lifetime)
-      .release();
-}
-
 std::unique_ptr<OpenSSLIdentity> OpenSSLIdentity::CreateForTest(
     const SSLIdentityParams& params) {
   return CreateInternal(params);
diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h
index c499b06332..4b64111870 100644
--- a/rtc_base/openssl_identity.h
+++ b/rtc_base/openssl_identity.h
@@ -72,10 +72,7 @@ class OpenSSLIdentity final : public SSLIdentity {
   static std::unique_ptr<SSLIdentity> CreateFromPEMChainStrings(
       const std::string& private_key,
       const std::string& certificate_chain);
-  // Deprecated versions
-  static OpenSSLIdentity* GenerateWithExpiration(const std::string& common_name,
-                                                 const KeyParams& key_params,
-                                                 time_t certificate_lifetime);
+  // Deprecated
   static OpenSSLIdentity* GenerateForTest(const SSLIdentityParams& params);
   static SSLIdentity* FromPEMStrings(const std::string& private_key,
                                      const std::string& certificate);
diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc
index 410bb6118e..0a4c0feec6 100644
--- a/rtc_base/ssl_identity.cc
+++ b/rtc_base/ssl_identity.cc
@@ -254,28 +254,6 @@ std::unique_ptr<SSLIdentity> SSLIdentity::CreateFromPEMChainStrings(
                                                     certificate_chain);
 }
 
-// static
-SSLIdentity* SSLIdentity::GenerateWithExpiration(const std::string& common_name,
-                                                 const KeyParams& key_params,
-                                                 time_t certificate_lifetime) {
-  return OpenSSLIdentity::GenerateWithExpiration(common_name, key_params,
-                                                 certificate_lifetime);
-}
-
-// static
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
-                                   const KeyParams& key_params) {
-  return OpenSSLIdentity::GenerateWithExpiration(
-      common_name, key_params, kDefaultCertificateLifetimeInSeconds);
-}
-
-// static
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
-                                   KeyType key_type) {
-  return OpenSSLIdentity::GenerateWithExpiration(
-      common_name, KeyParams(key_type), kDefaultCertificateLifetimeInSeconds);
-}
-
 SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
   return OpenSSLIdentity::GenerateForTest(params);
 }
diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h
index ae4dbea99b..e7a47346a7 100644
--- a/rtc_base/ssl_identity.h
+++ b/rtc_base/ssl_identity.h
@@ -129,17 +129,6 @@ class RTC_EXPORT SSLIdentity {
       const std::string& private_key,
       const std::string& certificate_chain);
 
-  // Old versions of Create(). These return a pointer, but still require the
-  // caller to take ownership.
-  RTC_DEPRECATED static SSLIdentity* GenerateWithExpiration(
-      const std::string& common_name,
-      const KeyParams& key_param,
-      time_t certificate_lifetime);
-  RTC_DEPRECATED static SSLIdentity* Generate(const std::string& common_name,
-                                              const KeyParams& key_param);
-  RTC_DEPRECATED static SSLIdentity* Generate(const std::string& common_name,
-                                              KeyType key_type);
-
   // Generates an identity with the specified validity period.
   // TODO(torbjorng): Now that Generate() accepts relevant params, make tests
   // use that instead of this function.