From b33a0ca1eec34e686c251172ee86274755c2a818 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Thu, 16 Apr 2020 14:59:40 +0200 Subject: [PATCH] Remove deprecated ssl_identity methods This is a followup to https://webrtc-review.googlesource.com/c/src/+/170637 Bug: webrtc:11450 Change-Id: I69928ed7236c6a8a569c7dc0383f7debb4408179 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171224 Commit-Queue: Harald Alvestrand Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#31086} --- pc/stats_collector_unittest.cc | 3 +-- rtc_base/fake_ssl_identity.cc | 4 ---- rtc_base/fake_ssl_identity.h | 1 - rtc_base/openssl_identity.cc | 4 ---- rtc_base/openssl_identity.h | 1 - rtc_base/ssl_identity.cc | 17 ----------------- rtc_base/ssl_identity.h | 19 ------------------- rtc_base/ssl_stream_adapter.h | 6 ------ 8 files changed, 1 insertion(+), 54 deletions(-) diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc index c6b57c278e..471f3821ca 100644 --- a/pc/stats_collector_unittest.cc +++ b/pc/stats_collector_unittest.cc @@ -682,8 +682,7 @@ class StatsCollectorTest : public ::testing::Test { // Fake certificate to report. rtc::scoped_refptr local_certificate( - rtc::RTCCertificate::Create( - std::unique_ptr(local_identity.GetReference()))); + rtc::RTCCertificate::Create(local_identity.Clone())); pc->SetLocalCertificate(kTransportName, local_certificate); pc->SetRemoteCertChain(kTransportName, remote_identity.cert_chain().Clone()); diff --git a/rtc_base/fake_ssl_identity.cc b/rtc_base/fake_ssl_identity.cc index 7374d2ebdb..0648363b2e 100644 --- a/rtc_base/fake_ssl_identity.cc +++ b/rtc_base/fake_ssl_identity.cc @@ -90,10 +90,6 @@ FakeSSLIdentity::FakeSSLIdentity(const FakeSSLIdentity& o) FakeSSLIdentity::~FakeSSLIdentity() = default; -FakeSSLIdentity* FakeSSLIdentity::GetReference() const { - return new FakeSSLIdentity(*this); -} - std::unique_ptr FakeSSLIdentity::CloneInternal() const { return std::make_unique(*this); } diff --git a/rtc_base/fake_ssl_identity.h b/rtc_base/fake_ssl_identity.h index a592154953..512baba9fb 100644 --- a/rtc_base/fake_ssl_identity.h +++ b/rtc_base/fake_ssl_identity.h @@ -62,7 +62,6 @@ class FakeSSLIdentity : public SSLIdentity { ~FakeSSLIdentity() override; // SSLIdentity implementation. - FakeSSLIdentity* GetReference() const override; const SSLCertificate& certificate() const override; const SSLCertChain& cert_chain() const override; // Not implemented. diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc index ae38121f10..3bf2e9a93c 100644 --- a/rtc_base/openssl_identity.cc +++ b/rtc_base/openssl_identity.cc @@ -333,10 +333,6 @@ const SSLCertChain& OpenSSLIdentity::cert_chain() const { return *cert_chain_.get(); } -OpenSSLIdentity* OpenSSLIdentity::GetReference() const { - return static_cast(CloneInternal().release()); -} - std::unique_ptr OpenSSLIdentity::CloneInternal() const { // We cannot use std::make_unique here because the referenced OpenSSLIdentity // constructor is private. diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h index 4b64111870..53d0fa9972 100644 --- a/rtc_base/openssl_identity.h +++ b/rtc_base/openssl_identity.h @@ -82,7 +82,6 @@ class OpenSSLIdentity final : public SSLIdentity { const OpenSSLCertificate& certificate() const override; const SSLCertChain& cert_chain() const override; - RTC_DEPRECATED OpenSSLIdentity* GetReference() const override; // Configure an SSL context object to use our key and certificate. bool ConfigureIdentity(SSL_CTX* ctx); diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc index 0a4c0feec6..09d25d228e 100644 --- a/rtc_base/ssl_identity.cc +++ b/rtc_base/ssl_identity.cc @@ -254,23 +254,6 @@ std::unique_ptr SSLIdentity::CreateFromPEMChainStrings( certificate_chain); } -SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) { - return OpenSSLIdentity::GenerateForTest(params); -} - -// static -SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key, - const std::string& certificate) { - return OpenSSLIdentity::FromPEMStrings(private_key, certificate); -} - -// static -SSLIdentity* SSLIdentity::FromPEMChainStrings( - const std::string& private_key, - const std::string& certificate_chain) { - return OpenSSLIdentity::FromPEMChainStrings(private_key, certificate_chain); -} - bool operator==(const SSLIdentity& a, const SSLIdentity& b) { return static_cast(a) == static_cast(b); diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h index e7a47346a7..ac642ad1e8 100644 --- a/rtc_base/ssl_identity.h +++ b/rtc_base/ssl_identity.h @@ -129,29 +129,10 @@ class RTC_EXPORT SSLIdentity { const std::string& private_key, const std::string& certificate_chain); - // Generates an identity with the specified validity period. - // TODO(torbjorng): Now that Generate() accepts relevant params, make tests - // use that instead of this function. - RTC_DEPRECATED static SSLIdentity* GenerateForTest( - const SSLIdentityParams& params); - - // Construct an identity from a private key and a certificate. - RTC_DEPRECATED static SSLIdentity* FromPEMStrings( - const std::string& private_key, - const std::string& certificate); - - // Construct an identity from a private key and a certificate chain. - RTC_DEPRECATED static SSLIdentity* FromPEMChainStrings( - const std::string& private_key, - const std::string& certificate_chain); - virtual ~SSLIdentity() {} // Returns a new SSLIdentity object instance wrapping the same // identity information. - // Caller is responsible for freeing the returned object. - // TODO(hbos,torbjorng): Rename to a less confusing name. - RTC_DEPRECATED virtual SSLIdentity* GetReference() const = 0; std::unique_ptr Clone() const { return CloneInternal(); } // Returns a temporary reference to the end-entity (leaf) certificate. diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h index b5756a4322..3da0b09469 100644 --- a/rtc_base/ssl_stream_adapter.h +++ b/rtc_base/ssl_stream_adapter.h @@ -126,9 +126,6 @@ class SSLStreamAdapter : public StreamAdapterInterface { // Caller is responsible for freeing the returned object. static std::unique_ptr Create( std::unique_ptr stream); - RTC_DEPRECATED static SSLStreamAdapter* Create(StreamInterface* stream) { - return Create(absl::WrapUnique(stream)).release(); - } explicit SSLStreamAdapter(std::unique_ptr stream); ~SSLStreamAdapter() override; @@ -137,9 +134,6 @@ class SSLStreamAdapter : public StreamAdapterInterface { // of the SSLIdentity object and will free it when appropriate. Should be // called no more than once on a given SSLStream instance. virtual void SetIdentity(std::unique_ptr identity) = 0; - RTC_DEPRECATED virtual void SetIdentity(SSLIdentity* identity) { - SetIdentity(absl::WrapUnique(identity)); - } virtual SSLIdentity* GetIdentityForTesting() const = 0; // Call this to indicate that we are to play the server role (or client role,