X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=f566b326b3a41d30cb852d180238435b73e58ac4;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=8e8b03b85014bc2d241e1858ab2622cc0928c532;hpb=56838d603daae6b196a4f58fe07f36c63164ba5a;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 8e8b03b85..f566b326b 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,22 +12,8 @@
  */
 
 #include "inspircd.h"
-
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-
-#ifdef WINDOWS
-#include <openssl/applink.c>
-#endif
-
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-#include "socket.h"
-#include "hashcomp.h"
-
 #include "transport.h"
 
 #ifdef WINDOWS
@@ -38,24 +24,21 @@
 #endif
 
 /* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
-/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
+
+/* $LinkerFlags: if("USE_FREEBSD_BASE_SSL") -lssl -lcrypto */
+/* $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(int port, const std::vector<int> &portlist)
-{
-	for(unsigned int i = 0; i < portlist.size(); i++)
-		if(portlist[i] == port)
-			return true;
-
-	return false;
-}
-
 char* get_error()
 {
 	return ERR_error_string(ERR_get_error(), NULL);
@@ -70,20 +53,15 @@ class issl_session : public classbase
 public:
 	SSL* sess;
 	issl_status status;
-	issl_io_status rstat;
-	issl_io_status wstat;
 
-	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;
 	}
 };
 
@@ -103,15 +81,14 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
 
 class ModuleSSLOpenSSL : public Module
 {
-	std::vector<int> listenports;
+	std::set<ListenSocketBase*> listenports;
 
 	int inbufsize;
-	issl_session sessions[MAX_DESCRIPTORS];
+	issl_session* sessions;
 
 	SSL_CTX* ctx;
 	SSL_CTX* clictx;
 
-	char* dummy;
 	char cipher[MAXBUF];
 
 	std::string keyfile;
@@ -121,16 +98,13 @@ class ModuleSSLOpenSSL : public Module
 	std::string dhfile;
 	std::string sslports;
 
-	int clientactive;
-
  public:
 
-	InspIRCd* PublicInstance;
-
-	ModuleSSLOpenSSL(InspIRCd* Me)
-	: Module(Me), PublicInstance(Me)
+	ModuleSSLOpenSSL()
 	{
-		ServerInstance->Modules->PublishInterface("InspSocketHook", this);
+		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.
 		inbufsize = ServerInstance->Config->NetBufferSize;
@@ -145,68 +119,63 @@ class ModuleSSLOpenSSL : public Module
 		ctx = SSL_CTX_new( SSLv23_server_method() );
 		clictx = SSL_CTX_new( SSLv23_client_method() );
 
+		SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+		SSL_CTX_set_mode(clictx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+
 		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);
 
 		// Needs the flag as it ignores a plain /rehash
-		OnRehash(NULL,"ssl");
+		OnModuleRehash(NULL,"ssl");
+		Implementation eventlist[] = {
+			I_On005Numeric, I_OnRequest, I_OnRehash, I_OnModuleRehash, I_OnPostConnect,
+			I_OnHookIO };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	void OnHookIO(StreamSocket* user, ListenSocketBase* lsb)
 	{
-		if (param != "ssl")
-			return;
-
-		ConfigReader Conf(ServerInstance);
-
-		for (unsigned int i = 0; i < listenports.size(); i++)
+		if (!user->GetIOHook() && listenports.find(lsb) != listenports.end())
 		{
-			ServerInstance->Config->DelIOHook(listenports[i]);
+			/* Hook the user with our module */
+			user->AddIOHook(this);
 		}
+	}
+
+	void OnRehash(User* user)
+	{
+		ConfigReader Conf;
 
 		listenports.clear();
-		clientactive = 0;
 		sslports.clear();
 
-		for (int i = 0; i < Conf.Enumerate("bind"); i++)
+		for (size_t i = 0; i < ServerInstance->ports.size(); i++)
 		{
-			// For each <bind> tag
-			std::string x = Conf.ReadValue("bind", "type", i);
-			if (((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", i) == "openssl"))
-			{
-				// Get the port we're meant to be listening on with SSL
-				std::string port = Conf.ReadValue("bind", "port", i);
-				irc::portparser portrange(port, false);
-				long portno = -1;
-				while ((portno = portrange.GetToken()))
-				{
-					clientactive++;
-					try
-					{
-						if (ServerInstance->Config->AddIOHook(portno, this))
-						{
-							listenports.push_back(portno);
-								for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
-								if (ServerInstance->Config->ports[i]->GetPort() == portno)
-									ServerInstance->Config->ports[i]->SetDescription("ssl");
-							ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno);
-							sslports.append("*:").append(ConvToStr(portno)).append(";");
-						}
-						else
-						{
-							ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?",	portno);
-						}
-					}
-					catch (ModuleException &e)
-					{
-						ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have another SSL or similar module loaded?", portno, e.GetReason());
-					}
-				}
-			}
+			ListenSocketBase* port = ServerInstance->ports[i];
+			std::string desc = port->GetDescription();
+			if (desc != "openssl")
+				continue;
+
+			listenports.insert(port);
+			std::string portid = port->GetBindDesc();
+
+			ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %s", portid.c_str());
+			if (port->GetIP() != "127.0.0.1")
+				sslports.append(portid).append(";");
 		}
 
 		if (!sslports.empty())
 			sslports.erase(sslports.end() - 1);
+	}
+
+	void OnModuleRehash(User* user, const std::string &param)
+	{
+		if (param != "ssl")
+			return;
+
+		OnRehash(user);
+
+		ConfigReader Conf;
 
 		std::string confdir(ServerInstance->ConfigFileName);
 		// +1 so we the path ends with a /
@@ -231,16 +200,16 @@ class ModuleSSLOpenSSL : public Module
 			dhfile = "dhparams.pem";
 
 		// Prepend relative paths with the path to the config directory.
-		if (cafile[0] != '/')
+		if ((cafile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(cafile)))
 			cafile = confdir + cafile;
 
-		if (certfile[0] != '/')
+		if ((certfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(certfile)))
 			certfile = confdir + certfile;
 
-		if (keyfile[0] != '/')
+		if ((keyfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(keyfile)))
 			keyfile = confdir + keyfile;
 
-		if (dhfile[0] != '/')
+		if ((dhfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(dhfile)))
 			dhfile = confdir + dhfile;
 
 		/* Load our keys and certificates
@@ -248,20 +217,20 @@ class ModuleSSLOpenSSL : public Module
 		 */
 		if ((!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str())) || (!SSL_CTX_use_certificate_chain_file(clictx, certfile.c_str())))
 		{
-			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s. %s", certfile.c_str(), strerror(errno));
+			ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s. %s", certfile.c_str(), strerror(errno));
 			ERR_print_errors_cb(error_callback, this);
 		}
 
 		if (((!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))) || (!SSL_CTX_use_PrivateKey_file(clictx, keyfile.c_str(), SSL_FILETYPE_PEM)))
 		{
-			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s. %s", keyfile.c_str(), strerror(errno));
+			ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read key file %s. %s", keyfile.c_str(), strerror(errno));
 			ERR_print_errors_cb(error_callback, this);
 		}
 
 		/* Load the CAs we trust*/
 		if (((!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))) || (!SSL_CTX_load_verify_locations(clictx, cafile.c_str(), 0)))
 		{
-			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from %s. %s", cafile.c_str(), strerror(errno));
+			ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read CA list from %s. %s", cafile.c_str(), strerror(errno));
 			ERR_print_errors_cb(error_callback, this);
 		}
 
@@ -270,7 +239,7 @@ class ModuleSSLOpenSSL : public Module
 
 		if (dhpfile == NULL)
 		{
-			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
+			ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
 			throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno));
 		}
 		else
@@ -278,7 +247,7 @@ class ModuleSSLOpenSSL : public Module
 			ret = PEM_read_DHparams(dhpfile, NULL, NULL, NULL);
 			if ((SSL_CTX_set_tmp_dh(ctx, ret) < 0) || (SSL_CTX_set_tmp_dh(clictx, ret) < 0))
 			{
-				ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str());
+				ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str());
 				ERR_print_errors_cb(error_callback, this);
 			}
 		}
@@ -286,65 +255,43 @@ 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 OnCleanup(int target_type, void* item)
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 
-			if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
+			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.
-				userrec::QuitUser(ServerInstance, user, "SSL module unloading");
-			}
-			if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
-			{
-				ssl_cert* tofree;
-				user->GetExt("ssl_cert", tofree);
-				delete tofree;
-				user->Shrink("ssl_cert");
-			}
-		}
-	}
-
-	virtual void OnUnloadModule(Module* mod, const std::string &name)
-	{
-		if (mod == this)
-		{
-			for(unsigned int i = 0; i < listenports.size(); i++)
-			{
-				ServerInstance->Config->DelIOHook(listenports[i]);
-				for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
-					if (ServerInstance->Config->ports[j]->GetPort() == listenports[i])
-						ServerInstance->Config->ports[j]->SetDescription("plaintext");
+				ServerInstance->Users->QuitUser(user, "SSL module unloading");
+				user->DelIOHook();
 			}
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = List[I_On005Numeric] = 1;
-		List[I_OnBufferFlushed] = List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
-	}
 
-	virtual char* OnRequest(Request* request)
+	const char* OnRequest(Request* request)
 	{
 		ISHRequest* ISR = (ISHRequest*)request;
 		if (strcmp("IS_NAME", request->GetId()) == 0)
@@ -353,51 +300,47 @@ class ModuleSSLOpenSSL : public Module
 		}
 		else if (strcmp("IS_HOOK", request->GetId()) == 0)
 		{
-			char* ret = "OK";
-			try
-			{
-				ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
-			}
-			catch (ModuleException &e)
-			{
-				return NULL;
-			}
-
-			return ret;
+			ISR->Sock->AddIOHook(this);
+			return "OK";
 		}
 		else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
 		{
-			return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+			ISR->Sock->DelIOHook();
+			return "OK";
 		}
 		else if (strcmp("IS_HSDONE", request->GetId()) == 0)
 		{
-			ServerInstance->Log(DEBUG,"Module checking if handshake is done");
 			if (ISR->Sock->GetFd() < 0)
-				return (char*)"OK";
+				return "OK";
 
 			issl_session* session = &sessions[ISR->Sock->GetFd()];
-			return (session->status == ISSL_HANDSHAKING) ? NULL : (char*)"OK";
+			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, (InspSocket*)ISR->Sock);
 				return "OK";
 			}
 		}
+		else if (strcmp("GET_CERT", request->GetId()) == 0)
+		{
+			Module* sslinfo = ServerInstance->Modules->Find("m_sslinfo.so");
+			if (sslinfo)
+				return sslinfo->OnRequest(request);
+		}
 		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)
 	{
+		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;
@@ -407,20 +350,23 @@ class ModuleSSLOpenSSL : public Module
 
 		if (SSL_set_fd(session->sess, fd) == 0)
 		{
-			ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
+			ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
 			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;
+
 		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;
@@ -430,54 +376,47 @@ class ModuleSSLOpenSSL : public Module
 
 		if (SSL_set_fd(session->sess, fd) == 0)
 		{
-			ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
+			ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
 			return;
 		}
 
-		Handshake(session);
+		Handshake(user, session);
 	}
 
-	virtual void OnRawSocketClose(int fd)
+	void OnStreamSocketClose(StreamSocket* user)
 	{
-		CloseSession(&sessions[fd]);
-
-		EventHandler* user = ServerInstance->SE->GetRef(fd);
+		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;
 
-		if ((user) && (user->GetExt("ssl_cert", dummy)))
-		{
-			ssl_cert* tofree;
-			user->GetExt("ssl_cert", tofree);
-			delete tofree;
-			user->Shrink("ssl_cert");
-		}
+		CloseSession(&sessions[fd]);
 	}
 
-	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 -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;
 			}
 		}
 
@@ -485,56 +424,50 @@ 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);
+				return 1;
 			}
-
-			if (session->rstat == ISSL_READ)
+			else if (ret == 0)
 			{
-				int ret = DoRead(session);
-
-				ServerInstance->Log(DEBUG, "<***> DoRead count: " + ConvToStr(count));
-				ServerInstance->Log(DEBUG, "<***> DoRead ret: " + ConvToStr(ret));
-				ServerInstance->Log(DEBUG, "<***> DoRead session->inbufoffset: " + ConvToStr(session->inbufoffset));
+				// 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
-						memcpy(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
 				{
-					return ret;
+					CloseSession(session);
+					return -1;
 				}
 			}
 		}
 
-		return -1;
+		return 0;
 	}
 
-	virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
+	int OnStreamSocketWrite(StreamSocket* user, std::string& buffer)
 	{
+		int fd = user->GetFd();
+
 		issl_session* session = &sessions[fd];
 
 		if (!session->sess)
@@ -543,169 +476,69 @@ 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)
-			{
-				DoRead(session);
-			}
-
-			if (session->wstat == ISSL_WRITE)
-			{
-				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)
+			int ret = SSL_write(session->sess, buffer.data(), buffer.size());
+			if (ret == (int)buffer.length())
 			{
-				session->wstat = ISSL_READ;
-				return -1;
+				session->data_to_write = false;
+				ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+				return 1;
 			}
-			else
+			else if (ret > 0)
 			{
-				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(userrec* source, userrec* dest)
-	{
-		if (!clientactive)
-			return;
-
-		// Bugfix, only send this numeric for *our* SSL users
-		if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) &&  isin(dest->GetPort(), listenports)))
-		{
-			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick, dest->nick);
-		}
-	}
-
-	virtual void OnSyncUserMetaData(userrec* 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"))
-		{
-			userrec* dest = (userrec*)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 | FD_WANT_NO_WRITE);
+					return 0;
+				}
+				else
+				{
+					CloseSession(session);
+					return -1;
+				}
 			}
 		}
+		return 0;
 	}
 
-	bool Handshake(issl_session* session)
+	bool Handshake(EventHandler* user, issl_session* session)
 	{
 		int ret;
 
 		if (session->outbound)
-		{
 			ret = SSL_connect(session->sess);
-		}
 		else
 			ret = SSL_accept(session->sess);
 
@@ -715,15 +548,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
@@ -736,26 +568,16 @@ 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.
-			userrec* 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;
 		}
 		else if (ret == 0)
 		{
-			int ssl_err = SSL_get_error(session->sess, ret);
-			char buf[1024];
-			ERR_print_errors_fp(stderr);
-			ServerInstance->Log(DEBUG,"Handshake fail 2: %d: %s", ssl_err, ERR_error_string(ssl_err,buf));
 			CloseSession(session);
 			return true;
 		}
@@ -763,47 +585,6 @@ class ModuleSSLOpenSSL : public Module
 		return true;
 	}
 
-	virtual void OnPostConnect(userrec* user)
-	{
-		// This occurs AFTER OnUserConnect so we can be sure the
-		// protocol module has propogated the NICK message.
-		if ((user->GetExt("ssl", dummy)) && (IS_LOCAL(user)))
-		{
-			// Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
-			std::deque<std::string>* metadata = new std::deque<std::string>;
-			metadata->push_back(user->nick);
-			metadata->push_back("ssl");		// The metadata id
-			metadata->push_back("ON");		// The value to send
-			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
-			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
-			DELETE(event);
-			DELETE(metadata);
-
-			VerifyCertificate(&sessions[user->GetFd()], user);
-			if (sessions[user->GetFd()].sess)
-				user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick, 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(userrec* user)
-	{
-		if (user->GetExt("ssl"))
-		{
-			ServerInstance->Log(DEBUG,"OnBufferFlushed for ssl user");
-			issl_session* session = &sessions[user->GetFd()];
-			if (session && session->outbuf.size())
-				OnRawSocketWrite(user->GetFd(), NULL, 0);
-		}
-	}
-
 	void CloseSession(issl_session* session)
 	{
 		if (session->sess)
@@ -812,15 +593,9 @@ 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)
@@ -828,61 +603,81 @@ class ModuleSSLOpenSSL : public Module
 		if (!session->sess || !user)
 			return;
 
+		Module* sslinfo = ServerInstance->Modules->Find("m_sslinfo.so");
+		if (!sslinfo)
+			return;
+
 		X509* cert;
 		ssl_cert* certinfo = new ssl_cert;
 		unsigned int n;
 		unsigned char md[EVP_MAX_MD_SIZE];
 		const EVP_MD *digest = EVP_md5();
 
-		user->Extend("ssl_cert",certinfo);
-
 		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());
+			BufferedSocketFingerprintSubmission(user, this, sslinfo, certinfo).Send();
 			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), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0))
+		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);
+		BufferedSocketFingerprintSubmission(user, this, sslinfo, certinfo).Send();
 	}
+
+	void Prioritize()
+	{
+		Module* server = ServerInstance->Modules->Find("m_spanningtree.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_AFTER, &server);
+	}
+
 };
 
 static int error_callback(const char *str, size_t len, void *u)
 {
-	ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u;
-	mssl->PublicInstance->Log(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...
+	//
+	// MD_update(&m, buf, j);
+	//
+	//
+	// ... ONLY JOKING! :-)
+	//
+
 	return 0;
 }
 
-MODULE_INIT(ModuleSSLOpenSSL);
+MODULE_INIT(ModuleSSLOpenSSL)