commit aaa848e0786dcec3d3f612aeba1376aa50c007f9
author Niels Möller <nisse@webrtc.org> Mon Oct 25 14:55:13 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 26 09:39:53 2021
tree c940cc747e2d10ae4dcc79d6d142ced26ea49e6d
parent d30ece1804dc91e84850cf07100c27a8e7b00d81

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 <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35261}

p2p/base/basic_packet_socket_factory.cc

diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc
index e0f21fe..c144e4e 100644
--- a/p2p/base/basic_packet_socket_factory.cc
+++ b/p2p/base/basic_packet_socket_factory.cc
@@ -62,6 +62,10 @@
     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 @@
                       << 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));