From dce61741f6b4a9f13e97620aabe4a9826b982718 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sun, 12 Apr 2020 18:05:18 +0200 Subject: [PATCH] Remove deprecated SSLAdapter::SetIdentity. Bug: webrtc:10198 Change-Id: I675bc08bffa2774546357fb0b554bd52ca69c095 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173465 Commit-Queue: Mirko Bonadei Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#31061} --- rtc_base/openssl_adapter.cc | 5 ----- rtc_base/openssl_adapter.h | 1 - rtc_base/ssl_adapter.h | 1 - 3 files changed, 7 deletions(-) diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc index 8e8301b701..8fd882c2b3 100644 --- a/rtc_base/openssl_adapter.cc +++ b/rtc_base/openssl_adapter.cc @@ -221,11 +221,6 @@ void OpenSSLAdapter::SetCertVerifier( ssl_cert_verifier_ = ssl_cert_verifier; } -void OpenSSLAdapter::SetIdentity(SSLIdentity* identity) { - RTC_DCHECK(!identity_); - identity_.reset(static_cast(identity)); -} - void OpenSSLAdapter::SetIdentity(std::unique_ptr identity) { RTC_DCHECK(!identity_); identity_ = diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h index 122264727c..0e76836baf 100644 --- a/rtc_base/openssl_adapter.h +++ b/rtc_base/openssl_adapter.h @@ -53,7 +53,6 @@ class OpenSSLAdapter final : public SSLAdapter, public MessageHandler { void SetEllipticCurves(const std::vector& curves) override; void SetMode(SSLMode mode) override; void SetCertVerifier(SSLCertificateVerifier* ssl_cert_verifier) override; - void SetIdentity(SSLIdentity* identity) override; void SetIdentity(std::unique_ptr identity) override; void SetRole(SSLRole role) override; AsyncSocket* Accept(SocketAddress* paddr) override; diff --git a/rtc_base/ssl_adapter.h b/rtc_base/ssl_adapter.h index 4bf6ef1528..805fdc7ba0 100644 --- a/rtc_base/ssl_adapter.h +++ b/rtc_base/ssl_adapter.h @@ -70,7 +70,6 @@ class SSLAdapter : public AsyncSocketAdapter { // Set the certificate this socket will present to incoming clients. // Takes ownership of |identity|. - RTC_DEPRECATED virtual void SetIdentity(SSLIdentity* identity) = 0; virtual void SetIdentity(std::unique_ptr identity) = 0; // Choose whether the socket acts as a server socket or client socket.