Userland: Convert TLS::TLSv12 to a Core::Stream::Socket

This commit converts TLS::TLSv12 to a Core::Stream object, and in the
process allows TLS to now wrap other Core::Stream::Socket objects.
As a large part of LibHTTP and LibGemini depend on LibTLS's interface,
this also converts those to support Core::Stream, which leads to a
simplification of LibHTTP (as there's no need to care about the
underlying socket type anymore).
Note that RequestServer now controls the TLS socket options, which is a
better place anyway, as RS is the first receiver of the user-requested
options (though this is currently not particularly useful).

1 files changed, 1 insertions, 6 deletions

diff --git a/Userland/Libraries/LibIMAP/Client.h b/Userland/Libraries/LibIMAP/Client.h
index 9796dab86e..2e4096ad56 100644
--- a/Userland/Libraries/LibIMAP/Client.h
+++ b/Userland/Libraries/LibIMAP/Client.h
@@ -60,7 +60,6 @@ public:
     Function<void(ResponseData&&)> unrequested_response_callback;
 
 private:
-    Client(StringView host, u16 port, NonnullRefPtr<TLS::TLSv12>);
     Client(StringView host, u16 port, NonnullOwnPtr<Core::Stream::Socket>);
     void setup_callbacks();
 
@@ -73,11 +72,7 @@ private:
     StringView m_host;
     u16 m_port;
 
-    bool m_tls;
-    // FIXME: Convert this to a single `NonnullOwnPtr<Core::Stream::Socket>`
-    //        once `TLS::TLSv12` is converted to a `Socket` as well.
-    OwnPtr<Core::Stream::Socket> m_socket;
-    RefPtr<TLS::TLSv12> m_tls_socket;
+    NonnullOwnPtr<Core::Stream::Socket> m_socket;
     RefPtr<Promise<Empty>> m_connect_pending {};
 
     int m_current_command = 1;