zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated SSLAdapter::SetIdentity.

Browse Source 
Bug: webrtc:10198
Change-Id: I675bc08bffa2774546357fb0b554bd52ca69c095
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173465
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31061}
This commit is contained in:
Mirko Bonadei
2020-04-12 18:05:18 +02:00
committed by Commit Bot
parent cc34441554
commit dce61741f6
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtc_base/openssl_adapter.cc
View File

@ -221,11 +221,6 @@ void OpenSSLAdapter::SetCertVerifier(
ssl_cert_verifier_ = ssl_cert_verifier; ssl_cert_verifier_ = ssl_cert_verifier;
} }
void OpenSSLAdapter::SetIdentity(SSLIdentity* identity) {
RTC_DCHECK(!identity_);
identity_.reset(static_cast<OpenSSLIdentity*>(identity));
}
void OpenSSLAdapter::SetIdentity(std::unique_ptr<SSLIdentity> identity) { void OpenSSLAdapter::SetIdentity(std::unique_ptr<SSLIdentity> identity) {
RTC_DCHECK(!identity_); RTC_DCHECK(!identity_);
identity_ = identity_ =

1
rtc_base/openssl_adapter.h
View File

@ -53,7 +53,6 @@ class OpenSSLAdapter final : public SSLAdapter, public MessageHandler {
void SetEllipticCurves(const std::vector<std::string>& curves) override; void SetEllipticCurves(const std::vector<std::string>& curves) override;
void SetMode(SSLMode mode) override; void SetMode(SSLMode mode) override;
void SetCertVerifier(SSLCertificateVerifier* ssl_cert_verifier) override; void SetCertVerifier(SSLCertificateVerifier* ssl_cert_verifier) override;
void SetIdentity(SSLIdentity* identity) override;
void SetIdentity(std::unique_ptr<SSLIdentity> identity) override; void SetIdentity(std::unique_ptr<SSLIdentity> identity) override;
void SetRole(SSLRole role) override; void SetRole(SSLRole role) override;
AsyncSocket* Accept(SocketAddress* paddr) override; AsyncSocket* Accept(SocketAddress* paddr) override;

1
rtc_base/ssl_adapter.h
View File

@ -70,7 +70,6 @@ class SSLAdapter : public AsyncSocketAdapter {
// Set the certificate this socket will present to incoming clients. // Set the certificate this socket will present to incoming clients.
// Takes ownership of |identity|. // Takes ownership of |identity|.
RTC_DEPRECATED virtual void SetIdentity(SSLIdentity* identity) = 0;
virtual void SetIdentity(std::unique_ptr<SSLIdentity> identity) = 0; virtual void SetIdentity(std::unique_ptr<SSLIdentity> identity) = 0;
// Choose whether the socket acts as a server socket or client socket. // Choose whether the socket acts as a server socket or client socket.