From aaa848e0786dcec3d3f612aeba1376aa50c007f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 25 Oct 2021 16:55:13 +0200 Subject: [PATCH] Delete BasicPacketSocketFactory::CreateServerTcpSocket support for fake tls Bug: webrtc:13065, webrtc:10947 Change-Id: Ia60343de90006d17dce92d30a4820a3dca5428cb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/236300 Reviewed-by: Harald Alvestrand Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#35261} --- p2p/base/basic_packet_socket_factory.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc index e0f21fefdc..c144e4e337 100644 --- a/p2p/base/basic_packet_socket_factory.cc +++ b/p2p/base/basic_packet_socket_factory.cc @@ -62,6 +62,10 @@ AsyncListenSocket* BasicPacketSocketFactory::CreateServerTcpSocket( return NULL; } + if (opts & PacketSocketFactory::OPT_TLS_FAKE) { + RTC_LOG(LS_ERROR) << "Fake TLS not supported."; + return NULL; + } Socket* socket = socket_factory_->CreateSocket(local_address.family(), SOCK_STREAM); if (!socket) { @@ -82,12 +86,6 @@ AsyncListenSocket* BasicPacketSocketFactory::CreateServerTcpSocket( << socket->GetError(); } - // If using fake TLS, wrap the TCP socket in a pseudo-SSL socket. - if (opts & PacketSocketFactory::OPT_TLS_FAKE) { - RTC_DCHECK(!(opts & PacketSocketFactory::OPT_TLS)); - socket = new AsyncSSLSocket(socket); - } - RTC_CHECK(!(opts & PacketSocketFactory::OPT_STUN)); return new AsyncTcpListenSocket(absl::WrapUnique(socket));