diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc index 1476939a3d..8be9079338 100644 --- a/p2p/base/basic_packet_socket_factory.cc +++ b/p2p/base/basic_packet_socket_factory.cc @@ -157,7 +157,7 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket( socket = ssl_adapter; - if (ssl_adapter->StartSSL(remote_address.hostname().c_str(), false) != 0) { + if (ssl_adapter->StartSSL(remote_address.hostname().c_str()) != 0) { delete ssl_adapter; return NULL; } diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc index e71758b66c..8e8301b701 100644 --- a/rtc_base/openssl_adapter.cc +++ b/rtc_base/openssl_adapter.cc @@ -177,7 +177,6 @@ OpenSSLAdapter::OpenSSLAdapter(AsyncSocket* socket, role_(SSL_CLIENT), ssl_read_needs_write_(false), ssl_write_needs_read_(false), - restartable_(false), ssl_(nullptr), ssl_ctx_(nullptr), ssl_mode_(SSL_MODE_TLS), @@ -248,16 +247,15 @@ AsyncSocket* OpenSSLAdapter::Accept(SocketAddress* paddr) { adapter->SetIdentity(identity_->Clone()); adapter->SetRole(rtc::SSL_SERVER); adapter->SetIgnoreBadCert(ignore_bad_cert_); - adapter->StartSSL("", false); + adapter->StartSSL(""); return adapter; } -int OpenSSLAdapter::StartSSL(const char* hostname, bool restartable) { +int OpenSSLAdapter::StartSSL(const char* hostname) { if (state_ != SSL_NONE) return -1; ssl_host_name_ = hostname; - restartable_ = restartable; if (socket_->GetState() != Socket::CS_CONNECTED) { state_ = SSL_WAIT; @@ -653,7 +651,7 @@ int OpenSSLAdapter::RecvFrom(void* pv, int OpenSSLAdapter::Close() { Cleanup(); - state_ = restartable_ ? SSL_WAIT : SSL_NONE; + state_ = SSL_NONE; return AsyncSocketAdapter::Close(); } diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h index 7079fe39b4..122264727c 100644 --- a/rtc_base/openssl_adapter.h +++ b/rtc_base/openssl_adapter.h @@ -57,7 +57,7 @@ class OpenSSLAdapter final : public SSLAdapter, public MessageHandler { void SetIdentity(std::unique_ptr identity) override; void SetRole(SSLRole role) override; AsyncSocket* Accept(SocketAddress* paddr) override; - int StartSSL(const char* hostname, bool restartable) override; + int StartSSL(const char* hostname) override; int Send(const void* pv, size_t cb) override; int SendTo(const void* pv, size_t cb, const SocketAddress& addr) override; int Recv(void* pv, size_t cb, int64_t* timestamp) override; @@ -128,9 +128,6 @@ class OpenSSLAdapter final : public SSLAdapter, public MessageHandler { SSLRole role_; bool ssl_read_needs_write_; bool ssl_write_needs_read_; - // If true, socket will retain SSL configuration after Close. - // TODO(juberti): Remove this unused flag. - bool restartable_; // This buffer is used if SSL_write fails with SSL_ERROR_WANT_WRITE, which // means we need to keep retrying with *the same exact data* until it // succeeds. Afterwards it will be cleared. diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc index 77603e0a3b..b161304d65 100644 --- a/rtc_base/openssl_adapter_unittest.cc +++ b/rtc_base/openssl_adapter_unittest.cc @@ -80,7 +80,7 @@ TEST(OpenSSLAdapterTest, TestTransformAlpnProtocols) { TEST(OpenSSLAdapterTest, TestBeginSSLBeforeConnection) { AsyncSocket* async_socket = new MockAsyncSocket(); OpenSSLAdapter adapter(async_socket); - EXPECT_EQ(adapter.StartSSL("webrtc.org", false), 0); + EXPECT_EQ(adapter.StartSSL("webrtc.org"), 0); } // Verifies that the adapter factory can create new adapters. diff --git a/rtc_base/ssl_adapter.h b/rtc_base/ssl_adapter.h index f72871af31..4bf6ef1528 100644 --- a/rtc_base/ssl_adapter.h +++ b/rtc_base/ssl_adapter.h @@ -79,8 +79,7 @@ class SSLAdapter : public AsyncSocketAdapter { // StartSSL returns 0 if successful. // If StartSSL is called while the socket is closed or connecting, the SSL // negotiation will begin as soon as the socket connects. - // TODO(juberti): Remove |restartable|. - virtual int StartSSL(const char* hostname, bool restartable = false) = 0; + virtual int StartSSL(const char* hostname) = 0; // When an SSLAdapterFactory is used, an SSLAdapter may be used to resume // a previous SSL session, which results in an abbreviated handshake. diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc index fbbde78a5a..125b4bd50d 100644 --- a/rtc_base/ssl_adapter_unittest.cc +++ b/rtc_base/ssl_adapter_unittest.cc @@ -111,7 +111,7 @@ class SSLAdapterTestDummyClient : public sigslot::has_slots<> { RTC_LOG(LS_INFO) << "Starting " << GetSSLProtocolName(ssl_mode_) << " handshake with " << hostname; - if (ssl_adapter_->StartSSL(hostname.c_str(), false) != 0) { + if (ssl_adapter_->StartSSL(hostname.c_str()) != 0) { return -1; } }