X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=649b425c2335a8eb22e90ac30a5b69c3c71823dd;hb=73a4a37376fdf42c70c73ae5d8f8e933c3f28a61;hp=8243b4f0a8ef854359f9c8078323cf5704426dcc;hpb=563ad5acb0fb3d1aee5094989377d8b284d33d92;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 8243b4f0a..649b425c2 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -1,26 +1,42 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "transport.h"
+#include "ssl.h"
 
 #ifdef WINDOWS
-#pragma comment(lib, "libeay32MTd")
-#pragma comment(lib, "ssleay32MTd")
-#undef MAX_DESCRIPTORS
-#define MAX_DESCRIPTORS 10000
+# pragma comment(lib, "libcrypto.lib")
+# pragma comment(lib, "libssl.lib")
+# pragma comment(lib, "user32.lib")
+# pragma comment(lib, "advapi32.lib")
+# pragma comment(lib, "libgcc.lib")
+# pragma comment(lib, "libmingwex.lib")
+# pragma comment(lib, "gdi32.lib")
+# undef MAX_DESCRIPTORS
+# define MAX_DESCRIPTORS 10000
 #endif
 
 /* $ModDesc: Provides SSL support for clients */
@@ -29,28 +45,13 @@
 /* $CompileFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
 /* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
 
-/* $ModDep: transport.h */
 /* $NoPedantic */
-/* $CopyInstall: conf/key.pem $(CONPATH) */
-/* $CopyInstall: conf/cert.pem $(CONPATH) */
 
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
-enum issl_io_status { ISSL_WRITE, ISSL_READ };
 
 static bool SelfSigned = false;
 
-bool isin(const std::string &host, int port, const std::vector<std::string> &portlist)
-{
-	if (std::find(portlist.begin(), portlist.end(), "*:" + ConvToStr(port)) != portlist.end())
-		return true;
-
-	if (std::find(portlist.begin(), portlist.end(), ":" + ConvToStr(port)) != portlist.end())
-		return true;
-
-	return std::find(portlist.begin(), portlist.end(), host + ":" + ConvToStr(port)) != portlist.end();
-}
-
 char* get_error()
 {
 	return ERR_error_string(ERR_get_error(), NULL);
@@ -60,25 +61,21 @@ static int error_callback(const char *str, size_t len, void *u);
 
 /** Represents an SSL user's extra data
  */
-class issl_session : public classbase
+class issl_session
 {
 public:
 	SSL* sess;
 	issl_status status;
-	issl_io_status rstat;
-	issl_io_status wstat;
+	reference<ssl_cert> cert;
 
-	unsigned int inbufoffset;
-	char* inbuf;			// Buffer OpenSSL reads into.
-	std::string outbuf;	// Buffer for outgoing data that OpenSSL will not take.
 	int fd;
 	bool outbound;
+	bool data_to_write;
 
 	issl_session()
 	{
 		outbound = false;
-		rstat = ISSL_READ;
-		wstat = ISSL_WRITE;
+		data_to_write = false;
 	}
 };
 
@@ -98,35 +95,22 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
 
 class ModuleSSLOpenSSL : public Module
 {
-	std::vector<std::string> listenports;
-
 	int inbufsize;
 	issl_session* sessions;
 
 	SSL_CTX* ctx;
 	SSL_CTX* clictx;
 
-	char* dummy;
 	char cipher[MAXBUF];
 
-	std::string keyfile;
-	std::string certfile;
-	std::string cafile;
-	// std::string crlfile;
-	std::string dhfile;
 	std::string sslports;
+	bool use_sha;
 
-	int clientactive;
-
+	ServiceProvider iohook;
  public:
 
-	InspIRCd* PublicInstance;
-
-	ModuleSSLOpenSSL(InspIRCd* Me)
-	: Module(Me), PublicInstance(Me)
+	ModuleSSLOpenSSL() : iohook(this, "ssl/openssl", SERVICE_IOHOOK)
 	{
-		ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
-
 		sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
 
 		// Not rehashable...because I cba to reduce all the sizes of existing buffers.
@@ -147,107 +131,83 @@ class ModuleSSLOpenSSL : public Module
 
 		SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
 		SSL_CTX_set_verify(clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+	}
 
+	void init()
+	{
 		// Needs the flag as it ignores a plain /rehash
-		OnRehash(NULL,"ssl");
-		Implementation eventlist[] = { I_OnRawSocketConnect, I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnCleanup, I_On005Numeric,
-			I_OnBufferFlushed, I_OnRequest, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUnloadModule, I_OnRehash, I_OnWhois, I_OnPostConnect, I_OnHookUserIO };
-		ServerInstance->Modules->Attach(eventlist, this, 16);
+		OnModuleRehash(NULL,"ssl");
+		Implementation eventlist[] = { I_On005Numeric, I_OnRehash, I_OnModuleRehash, I_OnHookIO, I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		ServerInstance->Modules->AddService(iohook);
 	}
 
-	virtual void OnHookUserIO(User* user, const std::string &targetip)
+	void OnHookIO(StreamSocket* user, ListenSocket* lsb)
 	{
-		if (!user->GetIOHook() && isin(targetip,user->GetPort(), listenports))
+		if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "openssl")
 		{
 			/* Hook the user with our module */
 			user->AddIOHook(this);
 		}
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
+	void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
-
-		listenports.clear();
-		clientactive = 0;
 		sslports.clear();
 
-		for(int index = 0; index < Conf.Enumerate("bind"); index++)
+		ConfigTag* Conf = ServerInstance->Config->ConfValue("openssl");
+		
+		if (Conf->getBool("showports", true))
 		{
-			// For each <bind> tag
-			std::string x = Conf.ReadValue("bind", "type", index);
-			if(((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", index) == "openssl"))
+			for (size_t i = 0; i < ServerInstance->ports.size(); i++)
 			{
-				// Get the port we're meant to be listening on with SSL
-				std::string port = Conf.ReadValue("bind", "port", index);
-				std::string addr = Conf.ReadValue("bind", "address", index);
-
-				irc::portparser portrange(port, false);
-				long portno = -1;
-				while ((portno = portrange.GetToken()))
-				{
-					clientactive++;
-					try
-					{
-						listenports.push_back(addr + ":" + ConvToStr(portno));
-
-						for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
-							if ((ServerInstance->Config->ports[i]->GetPort() == portno) && (ServerInstance->Config->ports[i]->GetIP() == addr))
-								ServerInstance->Config->ports[i]->SetDescription("ssl");
-						ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %ld", portno);
-
-						sslports.append((addr.empty() ? "*" : addr)).append(":").append(ConvToStr(portno)).append(";");
-					}
-					catch (ModuleException &e)
-					{
-						ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %ld: %s. Maybe it's already hooked by the same port on a different IP, or you have an other SSL or similar module loaded?", portno, e.GetReason());
-					}
-				}
+				ListenSocket* port = ServerInstance->ports[i];
+				if (port->bind_tag->getString("ssl") != "openssl")
+					continue;
+
+				std::string portid = port->bind_desc;
+				ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %s", portid.c_str());
+				if (port->bind_tag->getString("type", "clients") == "clients" && port->bind_addr != "127.0.0.1")
+					sslports.append(portid).append(";");
 			}
-		}
 
-		if (!sslports.empty())
-			sslports.erase(sslports.end() - 1);
+			if (!sslports.empty())
+				sslports.erase(sslports.end() - 1);
+		}
+	}
 
+	void OnModuleRehash(User* user, const std::string &param)
+	{
 		if (param != "ssl")
-		{
 			return;
-		}
-
-		std::string confdir(ServerInstance->ConfigFileName);
-		// +1 so we the path ends with a /
-		confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
 
-		cafile	 = Conf.ReadValue("openssl", "cafile", 0);
-		certfile = Conf.ReadValue("openssl", "certfile", 0);
-		keyfile	 = Conf.ReadValue("openssl", "keyfile", 0);
-		dhfile	 = Conf.ReadValue("openssl", "dhfile", 0);
+		std::string keyfile;
+		std::string certfile;
+		std::string cafile;
+		std::string dhfile;
+		OnRehash(user);
 
-		// Set all the default values needed.
-		if (cafile.empty())
-			cafile = "ca.pem";
+		ConfigTag* conf = ServerInstance->Config->ConfValue("openssl");
 
-		if (certfile.empty())
-			certfile = "cert.pem";
+		cafile	 = conf->getString("cafile", "conf/ca.pem");
+		certfile = conf->getString("certfile", "conf/cert.pem");
+		keyfile	 = conf->getString("keyfile", "conf/key.pem");
+		dhfile	 = conf->getString("dhfile", "conf/dhparams.pem");
+		std::string hash = conf->getString("hash", "md5");
+		if (hash != "sha1" && hash != "md5")
+			throw ModuleException("Unknown hash type " + hash);
+		use_sha = (hash == "sha1");
 
-		if (keyfile.empty())
-			keyfile = "key.pem";
+		std::string ciphers = conf->getString("ciphers", "");
 
-		if (dhfile.empty())
-			dhfile = "dhparams.pem";
-
-		// Prepend relative paths with the path to the config directory.
-		if ((cafile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(cafile)))
-			cafile = confdir + cafile;
-
-		if ((certfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(certfile)))
-			certfile = confdir + certfile;
-
-		if ((keyfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(keyfile)))
-			keyfile = confdir + keyfile;
-
-		if ((dhfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(dhfile)))
-			dhfile = confdir + dhfile;
+		if (!ciphers.empty())
+		{
+			if ((!SSL_CTX_set_cipher_list(ctx, ciphers.c_str())) || (!SSL_CTX_set_cipher_list(clictx, ciphers.c_str())))
+			{
+				ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't set cipher list to %s.", ciphers.c_str());
+				ERR_print_errors_cb(error_callback, this);
+			}
+		}
 
 		/* Load our keys and certificates
 		 * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
@@ -292,121 +252,77 @@ class ModuleSSLOpenSSL : public Module
 		fclose(dhpfile);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
-		output.append(" SSL=" + sslports);
+		if (!sslports.empty())
+			output.append(" SSL=" + sslports);
 	}
 
-	virtual ~ModuleSSLOpenSSL()
+	~ModuleSSLOpenSSL()
 	{
 		SSL_CTX_free(ctx);
 		SSL_CTX_free(clictx);
-		ServerInstance->Modules->UnpublishInterface("BufferedSocketHook", this);
 		delete[] sessions;
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	void OnUserConnect(LocalUser* user)
 	{
-		if (target_type == TYPE_USER)
+		if (user->eh.GetIOHook() == this)
 		{
-			User* user = (User*)item;
-
-			if (user->GetIOHook() == this)
-			{
-				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
-				// Potentially there could be multiple SSL modules loaded at once on different ports.
-				ServerInstance->Users->QuitUser(user, "SSL module unloading");
-				user->DelIOHook();
-			}
-			if (user->GetExt("ssl_cert", dummy))
+			if (sessions[user->eh.GetFd()].sess)
 			{
-				ssl_cert* tofree;
-				user->GetExt("ssl_cert", tofree);
-				delete tofree;
-				user->Shrink("ssl_cert");
+				if (!sessions[user->eh.GetFd()].cert->fingerprint.empty())
+					user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\""
+						" and your SSL fingerprint is %s", user->nick.c_str(), SSL_get_cipher(sessions[user->eh.GetFd()].sess), sessions[user->eh.GetFd()].cert->fingerprint.c_str());
+				else
+					user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), SSL_get_cipher(sessions[user->eh.GetFd()].sess));
 			}
 		}
 	}
 
-	virtual void OnUnloadModule(Module* mod, const std::string &name)
+	void OnCleanup(int target_type, void* item)
 	{
-		if (mod == this)
+		if (target_type == TYPE_USER)
 		{
-			for(unsigned int i = 0; i < listenports.size(); i++)
+			LocalUser* user = IS_LOCAL((User*)item);
+
+			if (user && user->eh.GetIOHook() == this)
 			{
-				for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
-					if (listenports[i] == (ServerInstance->Config->ports[j]->GetIP()+":"+ConvToStr(ServerInstance->Config->ports[j]->GetPort())))
-						ServerInstance->Config->ports[j]->SetDescription("plaintext");
+				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
+				// Potentially there could be multiple SSL modules loaded at once on different ports.
+				ServerInstance->Users->QuitUser(user, "SSL module unloading");
 			}
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 
-
-	virtual const char* OnRequest(Request* request)
+	void OnRequest(Request& request)
 	{
-		ISHRequest* ISR = (ISHRequest*)request;
-		if (strcmp("IS_NAME", request->GetId()) == 0)
+		if (strcmp("GET_SSL_CERT", request.id) == 0)
 		{
-			return "openssl";
-		}
-		else if (strcmp("IS_HOOK", request->GetId()) == 0)
-		{
-			const char* ret = "OK";
-			try
-			{
-				ret = ISR->Sock->AddIOHook((Module*)this) ? "OK" : NULL;
-			}
-			catch (ModuleException &e)
-			{
-				return NULL;
-			}
+			SocketCertificateRequest& req = static_cast<SocketCertificateRequest&>(request);
+			int fd = req.sock->GetFd();
+			issl_session* session = &sessions[fd];
 
-			return ret;
+			req.cert = session->cert;
 		}
-		else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
-		{
-			return ISR->Sock->DelIOHook() ? "OK" : NULL;
-		}
-		else if (strcmp("IS_HSDONE", request->GetId()) == 0)
-		{
-			if (ISR->Sock->GetFd() < 0)
-				return "OK";
-
-			issl_session* session = &sessions[ISR->Sock->GetFd()];
-			return (session->status == ISSL_HANDSHAKING) ? NULL : "OK";
-		}
-		else if (strcmp("IS_ATTACH", request->GetId()) == 0)
-		{
-			issl_session* session = &sessions[ISR->Sock->GetFd()];
-			if (session->sess)
-			{
-				VerifyCertificate(session, (BufferedSocket*)ISR->Sock);
-				return "OK";
-			}
-		}
-		return NULL;
 	}
 
-
-	virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
+	void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 	{
-		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
-		if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
-			return;
+		int fd = user->GetFd();
 
 		issl_session* session = &sessions[fd];
 
 		session->fd = fd;
-		session->inbuf = new char[inbufsize];
-		session->inbufoffset = 0;
 		session->sess = SSL_new(ctx);
 		session->status = ISSL_NONE;
 		session->outbound = false;
+		session->cert = NULL;
 
 		if (session->sess == NULL)
 			return;
@@ -417,11 +333,12 @@ class ModuleSSLOpenSSL : public Module
 			return;
 		}
 
- 		Handshake(session);
+ 		Handshake(user, session);
 	}
 
-	virtual void OnRawSocketConnect(int fd)
+	void OnStreamSocketConnect(StreamSocket* user)
 	{
+		int fd = user->GetFd();
 		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
 		if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() -1))
 			return;
@@ -429,8 +346,6 @@ class ModuleSSLOpenSSL : public Module
 		issl_session* session = &sessions[fd];
 
 		session->fd = fd;
-		session->inbuf = new char[inbufsize];
-		session->inbufoffset = 0;
 		session->sess = SSL_new(clictx);
 		session->status = ISSL_NONE;
 		session->outbound = true;
@@ -444,58 +359,43 @@ class ModuleSSLOpenSSL : public Module
 			return;
 		}
 
-		Handshake(session);
+		Handshake(user, session);
 	}
 
-	virtual void OnRawSocketClose(int fd)
+	void OnStreamSocketClose(StreamSocket* user)
 	{
+		int fd = user->GetFd();
 		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
 		if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
 			return;
 
 		CloseSession(&sessions[fd]);
-
-		EventHandler* user = ServerInstance->SE->GetRef(fd);
-
-		if ((user) && (user->GetExt("ssl_cert", dummy)))
-		{
-			ssl_cert* tofree;
-			user->GetExt("ssl_cert", tofree);
-			delete tofree;
-			user->Shrink("ssl_cert");
-		}
 	}
 
-	virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
+	int OnStreamSocketRead(StreamSocket* user, std::string& recvq)
 	{
+		int fd = user->GetFd();
 		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
 		if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
-			return 0;
+			return -1;
 
 		issl_session* session = &sessions[fd];
 
 		if (!session->sess)
 		{
-			readresult = 0;
 			CloseSession(session);
-			return 1;
+			return -1;
 		}
 
 		if (session->status == ISSL_HANDSHAKING)
 		{
-			if (session->rstat == ISSL_READ || session->wstat == ISSL_READ)
+			// The handshake isn't finished and it wants to read, try to finish it.
+			if (!Handshake(user, session))
 			{
-				// The handshake isn't finished and it wants to read, try to finish it.
-				if (!Handshake(session))
-				{
-					// Couldn't resume handshake.
+				// Couldn't resume handshake.
+				if (session->status == ISSL_NONE)
 					return -1;
-				}
-			}
-			else
-			{
-				errno = EAGAIN;
-				return -1;
+				return 0;
 			}
 		}
 
@@ -503,51 +403,51 @@ class ModuleSSLOpenSSL : public Module
 
 		if (session->status == ISSL_OPEN)
 		{
-			if (session->wstat == ISSL_READ)
+			char* buffer = ServerInstance->GetReadBuffer();
+			size_t bufsiz = ServerInstance->Config->NetBufferSize;
+			int ret = SSL_read(session->sess, buffer, bufsiz);
+
+			if (ret > 0)
 			{
-				if(DoWrite(session) == 0)
-					return 0;
+				recvq.append(buffer, ret);
+				if (session->data_to_write)
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_SINGLE_WRITE);
+				return 1;
 			}
-
-			if (session->rstat == ISSL_READ)
+			else if (ret == 0)
 			{
-				int ret = DoRead(session);
+				// Client closed connection.
+				CloseSession(session);
+				return -1;
+			}
+			else if (ret < 0)
+			{
+				int err = SSL_get_error(session->sess, ret);
 
-				if (ret > 0)
+				if (err == SSL_ERROR_WANT_READ)
+				{
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ);
+					return 0;
+				}
+				else if (err == SSL_ERROR_WANT_WRITE)
 				{
-					if (count <= session->inbufoffset)
-					{
-						memcpy(buffer, session->inbuf, count);
-						// Move the stuff left in inbuf to the beginning of it
-						memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count));
-						// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.
-						session->inbufoffset -= count;
-						// Insp uses readresult as the count of how much data there is in buffer, so:
-						readresult = count;
-					}
-					else
-					{
-						// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
-						memcpy(buffer, session->inbuf, session->inbufoffset);
-
-						readresult = session->inbufoffset;
-						// Zero the offset, as there's nothing there..
-						session->inbufoffset = 0;
-					}
-					return 1;
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
+					return 0;
+				}
+				else
+				{
+					CloseSession(session);
+					return -1;
 				}
-				return ret;
 			}
 		}
 
-		return -1;
+		return 0;
 	}
 
-	virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
+	int OnStreamSocketWrite(StreamSocket* user, std::string& buffer)
 	{
-		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
-		if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
-			return 0;
+		int fd = user->GetFd();
 
 		issl_session* session = &sessions[fd];
 
@@ -557,162 +457,64 @@ class ModuleSSLOpenSSL : public Module
 			return -1;
 		}
 
-		session->outbuf.append(buffer, count);
-		MakePollWrite(session);
+		session->data_to_write = true;
 
 		if (session->status == ISSL_HANDSHAKING)
 		{
-			// The handshake isn't finished, try to finish it.
-			if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
+			if (!Handshake(user, session))
 			{
-				Handshake(session);
+				// Couldn't resume handshake.
+				if (session->status == ISSL_NONE)
+					return -1;
+				return 0;
 			}
 		}
 
 		if (session->status == ISSL_OPEN)
 		{
-			if (session->rstat == ISSL_WRITE)
+			int ret = SSL_write(session->sess, buffer.data(), buffer.size());
+			if (ret == (int)buffer.length())
 			{
-				DoRead(session);
+				session->data_to_write = false;
+				ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+				return 1;
 			}
-
-			if (session->wstat == ISSL_WRITE)
+			else if (ret > 0)
 			{
-				return DoWrite(session);
-			}
-		}
-
-		return 1;
-	}
-
-	int DoWrite(issl_session* session)
-	{
-		if (!session->outbuf.size())
-			return -1;
-
-		int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
-
-		if (ret == 0)
-		{
-			CloseSession(session);
-			return 0;
-		}
-		else if (ret < 0)
-		{
-			int err = SSL_get_error(session->sess, ret);
-
-			if (err == SSL_ERROR_WANT_WRITE)
-			{
-				session->wstat = ISSL_WRITE;
-				return -1;
-			}
-			else if (err == SSL_ERROR_WANT_READ)
-			{
-				session->wstat = ISSL_READ;
-				return -1;
-			}
-			else
-			{
-				CloseSession(session);
+				buffer = buffer.substr(ret);
+				ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
 				return 0;
 			}
-		}
-		else
-		{
-			session->outbuf = session->outbuf.substr(ret);
-			return ret;
-		}
-	}
-
-	int DoRead(issl_session* session)
-	{
-		// Is this right? Not sure if the unencrypted data is garaunteed to be the same length.
-		// Read into the inbuffer, offset from the beginning by the amount of data we have that insp hasn't taken yet.
-
-		int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset);
-
-		if (ret == 0)
-		{
-			// Client closed connection.
-			CloseSession(session);
-			return 0;
-		}
-		else if (ret < 0)
-		{
-			int err = SSL_get_error(session->sess, ret);
-
-			if (err == SSL_ERROR_WANT_READ)
-			{
-				session->rstat = ISSL_READ;
-				return -1;
-			}
-			else if (err == SSL_ERROR_WANT_WRITE)
-			{
-				session->rstat = ISSL_WRITE;
-				MakePollWrite(session);
-				return -1;
-			}
-			else
+			else if (ret == 0)
 			{
 				CloseSession(session);
-				return 0;
+				return -1;
 			}
-		}
-		else
-		{
-			// Read successfully 'ret' bytes into inbuf + inbufoffset
-			// There are 'ret' + 'inbufoffset' bytes of data in 'inbuf'
-			// 'buffer' is 'count' long
-
-			session->inbufoffset += ret;
-
-			return ret;
-		}
-	}
-
-	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(User* source, User* dest)
-	{
-		if (!clientactive)
-			return;
-
-		// Bugfix, only send this numeric for *our* SSL users
-		if (dest->GetExt("ssl", dummy) || ((IS_LOCAL(dest) && dest->GetIOHook() == this)))
-		{
-			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
-		}
-	}
-
-	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
-	{
-		// check if the linking module wants to know about OUR metadata
-		if (extname == "ssl")
-		{
-			// check if this user has an swhois field to send
-			if(user->GetExt(extname, dummy))
+			else if (ret < 0)
 			{
-				// call this function in the linking module, let it format the data how it
-				// sees fit, and send it on its way. We dont need or want to know how.
-				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
-			}
-		}
-	}
+				int err = SSL_get_error(session->sess, ret);
 
-	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
-	{
-		// check if its our metadata key, and its associated with a user
-		if ((target_type == TYPE_USER) && (extname == "ssl"))
-		{
-			User* dest = (User*)target;
-			// if they dont already have an ssl flag, accept the remote server's
-			if (!dest->GetExt(extname, dummy))
-			{
-				dest->Extend(extname, "ON");
+				if (err == SSL_ERROR_WANT_WRITE)
+				{
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
+					return 0;
+				}
+				else if (err == SSL_ERROR_WANT_READ)
+				{
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ);
+					return 0;
+				}
+				else
+				{
+					CloseSession(session);
+					return -1;
+				}
 			}
 		}
+		return 0;
 	}
 
-	bool Handshake(issl_session* session)
+	bool Handshake(StreamSocket* user, issl_session* session)
 	{
 		int ret;
 
@@ -727,15 +529,14 @@ class ModuleSSLOpenSSL : public Module
 
 			if (err == SSL_ERROR_WANT_READ)
 			{
-				session->rstat = ISSL_READ;
+				ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 				session->status = ISSL_HANDSHAKING;
 				return true;
 			}
 			else if (err == SSL_ERROR_WANT_WRITE)
 			{
-				session->wstat = ISSL_WRITE;
+				ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
 				session->status = ISSL_HANDSHAKING;
-				MakePollWrite(session);
 				return true;
 			}
 			else
@@ -748,17 +549,11 @@ class ModuleSSLOpenSSL : public Module
 		else if (ret > 0)
 		{
 			// Handshake complete.
-			// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-			User* u = ServerInstance->FindDescriptor(session->fd);
-			if (u)
-			{
-				if (!u->GetExt("ssl", dummy))
-					u->Extend("ssl", "ON");
-			}
+			VerifyCertificate(session, user);
 
 			session->status = ISSL_OPEN;
 
-			MakePollWrite(session);
+			ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
 
 			return true;
 		}
@@ -771,41 +566,6 @@ class ModuleSSLOpenSSL : public Module
 		return true;
 	}
 
-	virtual void OnPostConnect(User* user)
-	{
-		// This occurs AFTER OnUserConnect so we can be sure the
-		// protocol module has propagated the NICK message.
-		if ((user->GetIOHook() == this) && (IS_LOCAL(user)))
-		{
-			// Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
-			ServerInstance->PI->SendMetaData(user, TYPE_USER, "SSL", "on");
-
-			VerifyCertificate(&sessions[user->GetFd()], user);
-			if (sessions[user->GetFd()].sess)
-				user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), SSL_get_cipher(sessions[user->GetFd()].sess));
-		}
-	}
-
-	void MakePollWrite(issl_session* session)
-	{
-		//OnRawSocketWrite(session->fd, NULL, 0);
-		EventHandler* eh = ServerInstance->FindDescriptor(session->fd);
-		if (eh)
-		{
-			ServerInstance->SE->WantWrite(eh);
-		}
-	}
-
-	virtual void OnBufferFlushed(User* user)
-	{
-		if (user->GetIOHook() == this && user->GetExt("ssl"))
-		{
-			issl_session* session = &sessions[user->GetFd()];
-			if (session && session->outbuf.size())
-				OnRawSocketWrite(user->GetFd(), NULL, 0);
-		}
-	}
-
 	void CloseSession(issl_session* session)
 	{
 		if (session->sess)
@@ -814,83 +574,68 @@ class ModuleSSLOpenSSL : public Module
 			SSL_free(session->sess);
 		}
 
-		if (session->inbuf)
-		{
-			delete[] session->inbuf;
-		}
-
-		session->outbuf.clear();
-		session->inbuf = NULL;
 		session->sess = NULL;
 		session->status = ISSL_NONE;
+		errno = EIO;
 	}
 
-	void VerifyCertificate(issl_session* session, Extensible* user)
+	void VerifyCertificate(issl_session* session, StreamSocket* user)
 	{
 		if (!session->sess || !user)
 			return;
 
 		X509* cert;
 		ssl_cert* certinfo = new ssl_cert;
+		session->cert = certinfo;
 		unsigned int n;
 		unsigned char md[EVP_MAX_MD_SIZE];
-		const EVP_MD *digest = EVP_md5();
-
-		user->Extend("ssl_cert",certinfo);
+		const EVP_MD *digest = use_sha ? EVP_sha1() : EVP_md5();
 
 		cert = SSL_get_peer_certificate((SSL*)session->sess);
 
 		if (!cert)
 		{
-			certinfo->data.insert(std::make_pair("error","Could not get peer certificate: "+std::string(get_error())));
+			certinfo->error = "Could not get peer certificate: "+std::string(get_error());
 			return;
 		}
 
-		certinfo->data.insert(std::make_pair("invalid", SSL_get_verify_result(session->sess) != X509_V_OK ? ConvToStr(1) : ConvToStr(0)));
+		certinfo->invalid = (SSL_get_verify_result(session->sess) != X509_V_OK);
 
 		if (SelfSigned)
 		{
-			certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(0)));
-			certinfo->data.insert(std::make_pair("trusted",ConvToStr(1)));
+			certinfo->unknownsigner = false;
+			certinfo->trusted = true;
 		}
 		else
 		{
-			certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(1)));
-			certinfo->data.insert(std::make_pair("trusted",ConvToStr(0)));
+			certinfo->unknownsigner = true;
+			certinfo->trusted = false;
 		}
 
-		certinfo->data.insert(std::make_pair("dn",std::string(X509_NAME_oneline(X509_get_subject_name(cert),0,0))));
-		certinfo->data.insert(std::make_pair("issuer",std::string(X509_NAME_oneline(X509_get_issuer_name(cert),0,0))));
+		certinfo->dn = X509_NAME_oneline(X509_get_subject_name(cert),0,0);
+		certinfo->issuer = X509_NAME_oneline(X509_get_issuer_name(cert),0,0);
 
 		if (!X509_digest(cert, digest, md, &n))
 		{
-			certinfo->data.insert(std::make_pair("error","Out of memory generating fingerprint"));
+			certinfo->error = "Out of memory generating fingerprint";
 		}
 		else
 		{
-			certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
+			certinfo->fingerprint = irc::hex(md, n);
 		}
 
 		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
 		{
-			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
+			certinfo->error = "Not activated, or expired certificate";
 		}
 
 		X509_free(cert);
 	}
-
-	void Prioritize()
-	{
-		Module* server = ServerInstance->Modules->Find("m_spanningtree.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_AFTER, &server);
-	}
-
 };
 
 static int error_callback(const char *str, size_t len, void *u)
 {
-	ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u;
-	mssl->PublicInstance->Logs->Log("m_ssl_openssl",DEFAULT, "SSL error: " + std::string(str, len - 1));
+	ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "SSL error: " + std::string(str, len - 1));
 
 	//
 	// XXX: Remove this line, it causes valgrind warnings...