X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;fp=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=3dd8a85441850515e3d87fc2140c2d9a74e81168;hb=3a3ff949670c61a4a8856e1391222e156eb1cd17;hp=b21091d3fddc6f2b6c5ca53bdd26ebd3a0b95c70;hpb=c99a43968f6a04c7d5d3038b4e39d14c22aa6e89;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 b21091d3f..3dd8a8544 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -21,604 +21,572 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
- /* HACK: This prevents OpenSSL on OS X 10.7 and later from spewing deprecation
-  * warnings for every single function call. As far as I (SaberUK) know, Apple
-  * have no plans to remove OpenSSL so this warning just causes needless spam.
-  */
-#ifdef __APPLE__
-# define __AVAILABILITYMACROS__
-# define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
-#endif
- 
+
 #include "inspircd.h"
+#include "iohook.h"
+#include "modules/ssl.h"
+
+// Ignore OpenSSL deprecation warnings on OS X Lion and newer.
+#if defined __APPLE__
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "ssl.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "ssleay32.lib")
 # pragma comment(lib, "libeay32.lib")
-# undef MAX_DESCRIPTORS
-# define MAX_DESCRIPTORS 10000
 #endif
 
-/* $ModDesc: Provides SSL support for clients */
-
-/* $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") */
-
-/* $NoPedantic */
-
-
-class ModuleSSLOpenSSL;
+/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
+/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
 
 static bool SelfSigned = false;
-
-#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-static ModuleSSLOpenSSL* opensslmod = NULL;
-#endif
+static int exdataindex;
 
 char* get_error()
 {
 	return ERR_error_string(ERR_get_error(), NULL);
 }
 
-static int error_callback(const char *str, size_t len, void *u);
+static int OnVerify(int preverify_ok, X509_STORE_CTX* ctx);
+static void StaticSSLInfoCallback(const SSL* ssl, int where, int rc);
 
-/** Represents an SSL user's extra data
- */
-class issl_session
+namespace OpenSSL
 {
-public:
-	SSL* sess;
-	issl_status status;
-	reference<ssl_cert> cert;
-
-	bool outbound;
-	bool data_to_write;
-
-	issl_session()
-		: sess(NULL)
-		, status(ISSL_NONE)
+	class Exception : public ModuleException
 	{
-		outbound = false;
-		data_to_write = false;
-	}
-};
+	 public:
+		Exception(const std::string& reason)
+			: ModuleException(reason) { }
+	};
 
-static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
-{
-	/* XXX: This will allow self signed certificates.
-	 * In the future if we want an option to not allow this,
-	 * we can just return preverify_ok here, and openssl
-	 * will boot off self-signed and invalid peer certs.
-	 */
-	int ve = X509_STORE_CTX_get_error(ctx);
-
-	SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
-
-	return 1;
-}
+	class DHParams
+	{
+		DH* dh;
 
-class ModuleSSLOpenSSL : public Module
-{
-	issl_session* sessions;
+	 public:
+		DHParams(const std::string& filename)
+		{
+			BIO* dhpfile = BIO_new_file(filename.c_str(), "r");
+			if (dhpfile == NULL)
+				throw Exception("Couldn't open DH file " + filename);
 
-	SSL_CTX* ctx;
-	SSL_CTX* clictx;
+			dh = PEM_read_bio_DHparams(dhpfile, NULL, NULL, NULL);
+			BIO_free(dhpfile);
 
-	long ctx_options;
-	long clictx_options;
+			if (!dh)
+				throw Exception("Couldn't read DH params from file " + filename);
+		}
 
-	std::string sslports;
-	bool use_sha;
+		~DHParams()
+		{
+			DH_free(dh);
+		}
 
-	ServiceProvider iohook;
+		DH* get()
+		{
+			return dh;
+		}
+	};
 
-	static void SetContextOptions(SSL_CTX* ctx, long defoptions, const std::string& ctxname, ConfigTag* tag)
+	class Context
 	{
-		long setoptions = tag->getInt(ctxname + "setoptions");
-		// User-friendly config options for setting context options
-#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
-		if (tag->getBool("cipherserverpref"))
-			setoptions |= SSL_OP_CIPHER_SERVER_PREFERENCE;
+		SSL_CTX* const ctx;
+		long ctx_options;
+
+	 public:
+		Context(SSL_CTX* context)
+			: ctx(context)
+		{
+			// Sane default options for OpenSSL see https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html
+			// and when choosing a cipher, use the server's preferences instead of the client preferences.
+			long opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | SSL_OP_CIPHER_SERVER_PREFERENCE | SSL_OP_SINGLE_DH_USE;
+			// Only turn options on if they exist
+#ifdef SSL_OP_SINGLE_ECDH_USE
+			opts |= SSL_OP_SINGLE_ECDH_USE;
 #endif
-#ifdef SSL_OP_NO_COMPRESSION
-		if (!tag->getBool("compression", true))
-			setoptions |= SSL_OP_NO_COMPRESSION;
+#ifdef SSL_OP_NO_TICKET
+			opts |= SSL_OP_NO_TICKET;
 #endif
-		if (!tag->getBool("sslv3", true))
-			setoptions |= SSL_OP_NO_SSLv3;
-		if (!tag->getBool("tlsv1", true))
-			setoptions |= SSL_OP_NO_TLSv1;
 
-		long clearoptions = tag->getInt(ctxname + "clearoptions");
-		ServerInstance->Logs->Log("m_ssl_openssl", DEBUG, "Setting OpenSSL %s context options, default: %ld set: %ld clear: %ld", ctxname.c_str(), defoptions, setoptions, clearoptions);
+			ctx_options = SSL_CTX_set_options(ctx, opts);
+			SSL_CTX_set_mode(ctx, 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_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
+			SSL_CTX_set_info_callback(ctx, StaticSSLInfoCallback);
+		}
 
-		// Clear everything
-		SSL_CTX_clear_options(ctx, SSL_CTX_get_options(ctx));
+		~Context()
+		{
+			SSL_CTX_free(ctx);
+		}
 
-		// Set the default options and what is in the conf
-		SSL_CTX_set_options(ctx, defoptions | setoptions);
-		long final = SSL_CTX_clear_options(ctx, clearoptions);
-		ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "OpenSSL %s context options: %ld", ctxname.c_str(), final);
-	}
+		bool SetDH(DHParams& dh)
+		{
+			ERR_clear_error();
+			return (SSL_CTX_set_tmp_dh(ctx, dh.get()) >= 0);
+		}
 
 #ifdef INSPIRCD_OPENSSL_ENABLE_ECDH
-	void SetupECDH(ConfigTag* tag)
-	{
-		std::string curvename = tag->getString("ecdhcurve", "prime256v1");
-		if (curvename.empty())
-			return;
-
-		int nid = OBJ_sn2nid(curvename.c_str());
-		if (nid == 0)
+		void SetECDH(const std::string& curvename)
 		{
-			ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Unknown curve: \"%s\"", curvename.c_str());
-			return;
+			int nid = OBJ_sn2nid(curvename.c_str());
+			if (nid == 0)
+				throw Exception("Unknown curve: " + curvename);
+
+			EC_KEY* eckey = EC_KEY_new_by_curve_name(nid);
+			if (!eckey)
+				throw Exception("Unable to create EC key object");
+
+			ERR_clear_error();
+			bool ret = (SSL_CTX_set_tmp_ecdh(ctx, eckey) >= 0);
+			EC_KEY_free(eckey);
+			if (!ret)
+				throw Exception("Couldn't set ECDH parameters");
 		}
+#endif
 
-		EC_KEY* eckey = EC_KEY_new_by_curve_name(nid);
-		if (!eckey)
+		bool SetCiphers(const std::string& ciphers)
 		{
-			ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Unable to create EC key object");
-			return;
+			ERR_clear_error();
+			return SSL_CTX_set_cipher_list(ctx, ciphers.c_str());
 		}
 
-		ERR_clear_error();
-		if (SSL_CTX_set_tmp_ecdh(ctx, eckey) < 0)
+		bool SetCerts(const std::string& filename)
 		{
-			ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Couldn't set ECDH parameters");
-			ERR_print_errors_cb(error_callback, this);
+			ERR_clear_error();
+			return SSL_CTX_use_certificate_chain_file(ctx, filename.c_str());
 		}
 
-		EC_KEY_free(eckey);
-	}
-#endif
+		bool SetPrivateKey(const std::string& filename)
+		{
+			ERR_clear_error();
+			return SSL_CTX_use_PrivateKey_file(ctx, filename.c_str(), SSL_FILETYPE_PEM);
+		}
 
-#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-	static void SSLInfoCallback(const SSL* ssl, int where, int rc)
-	{
-		int fd = SSL_get_fd(const_cast<SSL*>(ssl));
-		issl_session& session = opensslmod->sessions[fd];
+		bool SetCA(const std::string& filename)
+		{
+			ERR_clear_error();
+			return SSL_CTX_load_verify_locations(ctx, filename.c_str(), 0);
+		}
 
-		if ((where & SSL_CB_HANDSHAKE_START) && (session.status == ISSL_OPEN))
+		long GetDefaultContextOptions() const
 		{
-			// The other side is trying to renegotiate, kill the connection and change status
-			// to ISSL_NONE so CheckRenego() closes the session
-			session.status = ISSL_NONE;
-			ServerInstance->SE->Shutdown(fd, 2);
+			return ctx_options;
 		}
-	}
 
-	bool CheckRenego(StreamSocket* sock, issl_session* session)
-	{
-		if (session->status != ISSL_NONE)
-			return true;
+		long SetRawContextOptions(long setoptions, long clearoptions)
+		{
+			// Clear everything
+			SSL_CTX_clear_options(ctx, SSL_CTX_get_options(ctx));
 
-		ServerInstance->Logs->Log("m_ssl_openssl", DEBUG, "Session %p killed, attempted to renegotiate", (void*)session->sess);
-		CloseSession(session);
-		sock->SetError("Renegotiation is not allowed");
-		return false;
-	}
-#endif
+			// Set the default options and what is in the conf
+			SSL_CTX_set_options(ctx, ctx_options | setoptions);
+			return SSL_CTX_clear_options(ctx, clearoptions);
+		}
 
- public:
+		SSL* CreateSession()
+		{
+			return SSL_new(ctx);
+		}
+	};
 
-	ModuleSSLOpenSSL() : iohook(this, "ssl/openssl", SERVICE_IOHOOK)
+	class Profile : public refcountbase
 	{
-#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-		opensslmod = this;
-#endif
-		sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
-
-		/* Global SSL library initialization*/
-		SSL_library_init();
-		SSL_load_error_strings();
-
-		/* Build our SSL contexts:
-		 * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK.
+		/** Name of this profile
 		 */
-		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);
+		const std::string name;
 
-		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);
+		/** DH parameters in use
+		 */
+		DHParams dh;
 
-		SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
-		SSL_CTX_set_session_cache_mode(clictx, SSL_SESS_CACHE_OFF);
+		/** OpenSSL makes us have two contexts, one for servers and one for clients
+		 */
+		Context ctx;
+		Context clictx;
 
-		long opts = SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE;
-		// Only turn options on if they exist
-#ifdef SSL_OP_SINGLE_ECDH_USE
-		opts |= SSL_OP_SINGLE_ECDH_USE;
-#endif
-#ifdef SSL_OP_NO_TICKET
-		opts |= SSL_OP_NO_TICKET;
-#endif
+		/** Digest to use when generating fingerprints
+		 */
+		const EVP_MD* digest;
 
-		ctx_options = SSL_CTX_set_options(ctx, opts);
-		clictx_options = SSL_CTX_set_options(clictx, opts);
-	}
+		/** Last error, set by error_callback()
+		 */
+		std::string lasterr;
 
-	void init()
-	{
-		// Needs the flag as it ignores a plain /rehash
-		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);
-	}
+		/** True if renegotiations are allowed, false if not
+		 */
+		const bool allowrenego;
 
-	void OnHookIO(StreamSocket* user, ListenSocket* lsb)
-	{
-		if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "openssl")
+		static int error_callback(const char* str, size_t len, void* u)
 		{
-			/* Hook the user with our module */
-			user->AddIOHook(this);
+			Profile* profile = reinterpret_cast<Profile*>(u);
+			profile->lasterr = std::string(str, len - 1);
+			return 0;
 		}
-	}
 
-	void OnRehash(User* user)
-	{
-		sslports.clear();
+		/** Set raw OpenSSL context (SSL_CTX) options from a config tag
+		 * @param ctxname Name of the context, client or server
+		 * @param tag Config tag defining this profile
+		 * @param context Context object to manipulate
+		 */
+		void SetContextOptions(const std::string& ctxname, ConfigTag* tag, Context& context)
+		{
+			long setoptions = tag->getInt(ctxname + "setoptions");
+			long clearoptions = tag->getInt(ctxname + "clearoptions");
+#ifdef SSL_OP_NO_COMPRESSION
+			if (!tag->getBool("compression", true))
+				setoptions |= SSL_OP_NO_COMPRESSION;
+#endif
+			if (!tag->getBool("sslv3", true))
+				setoptions |= SSL_OP_NO_SSLv3;
+			if (!tag->getBool("tlsv1", true))
+				setoptions |= SSL_OP_NO_TLSv1;
 
-		ConfigTag* Conf = ServerInstance->Config->ConfValue("openssl");
+			if (!setoptions && !clearoptions)
+				return; // Nothing to do
 
-#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-		// Set the callback if we are not allowing renegotiations, unset it if we do
-		if (Conf->getBool("renegotiation", true))
-		{
-			SSL_CTX_set_info_callback(ctx, NULL);
-			SSL_CTX_set_info_callback(clictx, NULL);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Setting %s %s context options, default: %ld set: %ld clear: %ld", name.c_str(), ctxname.c_str(), ctx.GetDefaultContextOptions(), setoptions, clearoptions);
+			long final = context.SetRawContextOptions(setoptions, clearoptions);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "%s %s context options: %ld", name.c_str(), ctxname.c_str(), final);
 		}
-		else
-		{
-			SSL_CTX_set_info_callback(ctx, SSLInfoCallback);
-			SSL_CTX_set_info_callback(clictx, SSLInfoCallback);
-		}
-#endif
 
-		if (Conf->getBool("showports", true))
+	 public:
+		Profile(const std::string& profilename, ConfigTag* tag)
+			: name(profilename)
+			, dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dh.pem")))
+			, ctx(SSL_CTX_new(SSLv23_server_method()))
+			, clictx(SSL_CTX_new(SSLv23_client_method()))
+			, allowrenego(tag->getBool("renegotiation", true))
 		{
-			sslports = Conf->getString("advertisedports");
-			if (!sslports.empty())
-				return;
-
-			for (size_t i = 0; i < ServerInstance->ports.size(); i++)
-			{
-				ListenSocket* port = ServerInstance->ports[i];
-				if (port->bind_tag->getString("ssl") != "openssl")
-					continue;
+			if ((!ctx.SetDH(dh)) || (!clictx.SetDH(dh)))
+				throw Exception("Couldn't set DH parameters");
 
-				const 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());
+			std::string hash = tag->getString("hash", "md5");
+			digest = EVP_get_digestbyname(hash.c_str());
+			if (digest == NULL)
+				throw Exception("Unknown hash type " + hash);
 
-				if (port->bind_tag->getString("type", "clients") == "clients" && port->bind_addr != "127.0.0.1")
+			std::string ciphers = tag->getString("ciphers");
+			if (!ciphers.empty())
+			{
+				if ((!ctx.SetCiphers(ciphers)) || (!clictx.SetCiphers(ciphers)))
 				{
-					/*
-					 * Found an SSL port for clients that is not bound to 127.0.0.1 and handled by us, display
-					 * the IP:port in ISUPPORT.
-					 *
-					 * We used to advertise all ports seperated by a ';' char that matched the above criteria,
-					 * but this resulted in too long ISUPPORT lines if there were lots of ports to be displayed.
-					 * To solve this by default we now only display the first IP:port found and let the user
-					 * configure the exact value for the 005 token, if necessary.
-					 */
-					sslports = portid;
-					break;
+					ERR_print_errors_cb(error_callback, this);
+					throw Exception("Can't set cipher list to \"" + ciphers + "\" " + lasterr);
 				}
 			}
-		}
-	}
 
-	void OnModuleRehash(User* user, const std::string &param)
-	{
-		if (param != "ssl")
-			return;
-
-		std::string keyfile;
-		std::string certfile;
-		std::string cafile;
-		std::string dhfile;
-		OnRehash(user);
-
-		ConfigTag* conf = ServerInstance->Config->ConfValue("openssl");
+#ifdef INSPIRCD_OPENSSL_ENABLE_ECDH
+			std::string curvename = tag->getString("ecdhcurve", "prime256v1");
+			if (!curvename.empty())
+				ctx.SetECDH(curvename);
+#endif
 
-		cafile	 = conf->getString("cafile", CONFIG_PATH "/ca.pem");
-		certfile = conf->getString("certfile", CONFIG_PATH "/cert.pem");
-		keyfile	 = conf->getString("keyfile", CONFIG_PATH "/key.pem");
-		dhfile	 = conf->getString("dhfile", CONFIG_PATH "/dhparams.pem");
-		std::string hash = conf->getString("hash", "md5");
-		if (hash != "sha1" && hash != "md5")
-			throw ModuleException("Unknown hash type " + hash);
-		use_sha = (hash == "sha1");
+			SetContextOptions("server", tag, ctx);
+			SetContextOptions("client", tag, clictx);
 
-		if (conf->getBool("customcontextoptions"))
-		{
-			SetContextOptions(ctx, ctx_options, "server", conf);
-			SetContextOptions(clictx, clictx_options, "client", conf);
-		}
+			/* Load our keys and certificates
+			 * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
+			 */
+			std::string filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("certfile", "cert.pem"));
+			if ((!ctx.SetCerts(filename)) || (!clictx.SetCerts(filename)))
+			{
+				ERR_print_errors_cb(error_callback, this);
+				throw Exception("Can't read certificate file: " + lasterr);
+			}
 
-		std::string ciphers = conf->getString("ciphers", "");
+			filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("keyfile", "key.pem"));
+			if ((!ctx.SetPrivateKey(filename)) || (!clictx.SetPrivateKey(filename)))
+			{
+				ERR_print_errors_cb(error_callback, this);
+				throw Exception("Can't read key file: " + lasterr);
+			}
 
-		if (!ciphers.empty())
-		{
-			ERR_clear_error();
-			if ((!SSL_CTX_set_cipher_list(ctx, ciphers.c_str())) || (!SSL_CTX_set_cipher_list(clictx, ciphers.c_str())))
+			// Load the CAs we trust
+			filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("cafile", "ca.pem"));
+			if ((!ctx.SetCA(filename)) || (!clictx.SetCA(filename)))
 			{
-				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);
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't read CA list from %s. This is only a problem if you want to verify client certificates, otherwise it's safe to ignore this message. Error: %s", filename.c_str(), lasterr.c_str());
 			}
 		}
 
-		/* Load our keys and certificates
-		 * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
-		 */
-		ERR_clear_error();
-		if ((!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str())) || (!SSL_CTX_use_certificate_chain_file(clictx, certfile.c_str())))
-		{
-			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);
-		}
+		const std::string& GetName() const { return name; }
+		SSL* CreateServerSession() { return ctx.CreateSession(); }
+		SSL* CreateClientSession() { return clictx.CreateSession(); }
+		const EVP_MD* GetDigest() { return digest; }
+		bool AllowRenegotiation() const { return allowrenego; }
+	};
+}
 
-		ERR_clear_error();
-		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->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);
-		}
+static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
+{
+	/* XXX: This will allow self signed certificates.
+	 * In the future if we want an option to not allow this,
+	 * we can just return preverify_ok here, and openssl
+	 * will boot off self-signed and invalid peer certs.
+	 */
+	int ve = X509_STORE_CTX_get_error(ctx);
 
-		/* Load the CAs we trust*/
-		ERR_clear_error();
-		if (((!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))) || (!SSL_CTX_load_verify_locations(clictx, cafile.c_str(), 0)))
-		{
-			ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read CA list from %s. This is only a problem if you want to verify client certificates, otherwise it's safe to ignore this message. Error: %s", cafile.c_str(), strerror(errno));
-			ERR_print_errors_cb(error_callback, this);
-		}
+	SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
 
-#ifdef _WIN32
-		BIO* dhpfile = BIO_new_file(dhfile.c_str(), "r");
-#else
-		FILE* dhpfile = fopen(dhfile.c_str(), "r");
-#endif
-		DH* ret;
+	return 1;
+}
 
-		if (dhpfile == NULL)
-		{
-			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));
-		}
+class OpenSSLIOHook : public SSLIOHook
+{
+ private:
+	SSL* sess;
+	issl_status status;
+	const bool outbound;
+	bool data_to_write;
+	reference<OpenSSL::Profile> profile;
+
+	bool Handshake(StreamSocket* user)
+	{
+		int ret;
+
+		ERR_clear_error();
+		if (outbound)
+			ret = SSL_connect(sess);
 		else
+			ret = SSL_accept(sess);
+
+		if (ret < 0)
 		{
-#ifdef _WIN32
-			ret = PEM_read_bio_DHparams(dhpfile, NULL, NULL, NULL);
-			BIO_free(dhpfile);
-#else
-			ret = PEM_read_DHparams(dhpfile, NULL, NULL, NULL);
-#endif
+			int err = SSL_get_error(sess, ret);
 
-			ERR_clear_error();
-			if ((SSL_CTX_set_tmp_dh(ctx, ret) < 0) || (SSL_CTX_set_tmp_dh(clictx, ret) < 0))
+			if (err == SSL_ERROR_WANT_READ)
 			{
-				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);
+				SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+				this->status = ISSL_HANDSHAKING;
+				return true;
+			}
+			else if (err == SSL_ERROR_WANT_WRITE)
+			{
+				SocketEngine::ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
+				this->status = ISSL_HANDSHAKING;
+				return true;
+			}
+			else
+			{
+				CloseSession();
 			}
-			DH_free(ret);
-		}
-
-#ifndef _WIN32
-		fclose(dhpfile);
-#endif
 
-#ifdef INSPIRCD_OPENSSL_ENABLE_ECDH
-		SetupECDH(conf);
-#endif
-	}
+			return false;
+		}
+		else if (ret > 0)
+		{
+			// Handshake complete.
+			VerifyCertificate();
 
-	void On005Numeric(std::string &output)
-	{
-		if (!sslports.empty())
-			output.append(" SSL=" + sslports);
-	}
+			status = ISSL_OPEN;
 
-	~ModuleSSLOpenSSL()
-	{
-		SSL_CTX_free(ctx);
-		SSL_CTX_free(clictx);
-		delete[] sessions;
-	}
+			SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
 
-	void OnUserConnect(LocalUser* user)
-	{
-		if (user->eh.GetIOHook() == this)
+			return true;
+		}
+		else if (ret == 0)
 		{
-			if (sessions[user->eh.GetFd()].sess)
-			{
-				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));
-			}
+			CloseSession();
 		}
+		return false;
 	}
 
-	void OnCleanup(int target_type, void* item)
+	void CloseSession()
 	{
-		if (target_type == TYPE_USER)
+		if (sess)
 		{
-			LocalUser* user = IS_LOCAL((User*)item);
-
-			if (user && user->eh.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");
-			}
+			SSL_shutdown(sess);
+			SSL_free(sess);
 		}
+		sess = NULL;
+		certificate = NULL;
+		status = ISSL_NONE;
 	}
 
-	Version GetVersion()
+	void VerifyCertificate()
 	{
-		return Version("Provides SSL support for clients", VF_VENDOR);
-	}
+		X509* cert;
+		ssl_cert* certinfo = new ssl_cert;
+		this->certificate = certinfo;
+		unsigned int n;
+		unsigned char md[EVP_MAX_MD_SIZE];
 
-	void OnRequest(Request& request)
-	{
-		if (strcmp("GET_SSL_CERT", request.id) == 0)
+		cert = SSL_get_peer_certificate(sess);
+
+		if (!cert)
 		{
-			SocketCertificateRequest& req = static_cast<SocketCertificateRequest&>(request);
-			int fd = req.sock->GetFd();
-			issl_session* session = &sessions[fd];
+			certinfo->error = "Could not get peer certificate: "+std::string(get_error());
+			return;
+		}
+
+		certinfo->invalid = (SSL_get_verify_result(sess) != X509_V_OK);
 
-			req.cert = session->cert;
+		if (!SelfSigned)
+		{
+			certinfo->unknownsigner = false;
+			certinfo->trusted = true;
 		}
-		else if (!strcmp("GET_RAW_SSL_SESSION", request.id))
+		else
 		{
-			SSLRawSessionRequest& req = static_cast<SSLRawSessionRequest&>(request);
-			if ((req.fd >= 0) && (req.fd < ServerInstance->SE->GetMaxFds()))
-				req.data = reinterpret_cast<void*>(sessions[req.fd].sess);
+			certinfo->unknownsigner = true;
+			certinfo->trusted = false;
 		}
-	}
-
-	void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
-	{
-		int fd = user->GetFd();
 
-		issl_session* session = &sessions[fd];
+		char buf[512];
+		X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
+		certinfo->dn = buf;
+		// Make sure there are no chars in the string that we consider invalid
+		if (certinfo->dn.find_first_of("\r\n") != std::string::npos)
+			certinfo->dn.clear();
 
-		session->sess = SSL_new(ctx);
-		session->status = ISSL_NONE;
-		session->outbound = false;
-		session->data_to_write = false;
+		X509_NAME_oneline(X509_get_issuer_name(cert), buf, sizeof(buf));
+		certinfo->issuer = buf;
+		if (certinfo->issuer.find_first_of("\r\n") != std::string::npos)
+			certinfo->issuer.clear();
 
-		if (session->sess == NULL)
-			return;
+		if (!X509_digest(cert, profile->GetDigest(), md, &n))
+		{
+			certinfo->error = "Out of memory generating fingerprint";
+		}
+		else
+		{
+			certinfo->fingerprint = BinToHex(md, n);
+		}
 
-		if (SSL_set_fd(session->sess, fd) == 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))
 		{
-			ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
-			return;
+			certinfo->error = "Not activated, or expired certificate";
 		}
 
- 		Handshake(user, session);
+		X509_free(cert);
 	}
 
-	void OnStreamSocketConnect(StreamSocket* user)
+#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
+	void SSLInfoCallback(int where, int rc)
 	{
-		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->sess = SSL_new(clictx);
-		session->status = ISSL_NONE;
-		session->outbound = true;
-		session->data_to_write = false;
-
-		if (session->sess == NULL)
-			return;
-
-		if (SSL_set_fd(session->sess, fd) == 0)
+		if ((where & SSL_CB_HANDSHAKE_START) && (status == ISSL_OPEN))
 		{
-			ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
-			return;
+			if (profile->AllowRenegotiation())
+				return;
+
+			// The other side is trying to renegotiate, kill the connection and change status
+			// to ISSL_NONE so CheckRenego() closes the session
+			status = ISSL_NONE;
+			SocketEngine::Shutdown(SSL_get_fd(sess), 2);
 		}
+	}
+
+	bool CheckRenego(StreamSocket* sock)
+	{
+		if (status != ISSL_NONE)
+			return true;
 
-		Handshake(user, session);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Session %p killed, attempted to renegotiate", (void*)sess);
+		CloseSession();
+		sock->SetError("Renegotiation is not allowed");
+		return false;
 	}
+#endif
+
+	// Calls our private SSLInfoCallback()
+	friend void StaticSSLInfoCallback(const SSL* ssl, int where, int rc);
 
-	void OnStreamSocketClose(StreamSocket* user)
+ public:
+	OpenSSLIOHook(IOHookProvider* hookprov, StreamSocket* sock, bool is_outbound, SSL* session, const reference<OpenSSL::Profile>& sslprofile)
+		: SSLIOHook(hookprov)
+		, sess(session)
+		, status(ISSL_NONE)
+		, outbound(is_outbound)
+		, data_to_write(false)
+		, profile(sslprofile)
 	{
-		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))
+		if (sess == NULL)
 			return;
+		if (SSL_set_fd(sess, sock->GetFd()) == 0)
+			throw ModuleException("Can't set fd with SSL_set_fd: " + ConvToStr(sock->GetFd()));
 
-		CloseSession(&sessions[fd]);
+		SSL_set_ex_data(sess, exdataindex, this);
+		sock->AddIOHook(this);
+		Handshake(sock);
 	}
 
-	int OnStreamSocketRead(StreamSocket* user, std::string& recvq)
+	void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE
 	{
-		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];
+		CloseSession();
+	}
 
-		if (!session->sess)
+	int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE
+	{
+		if (!sess)
 		{
-			CloseSession(session);
+			CloseSession();
 			return -1;
 		}
 
-		if (session->status == ISSL_HANDSHAKING)
+		if (status == ISSL_HANDSHAKING)
 		{
 			// The handshake isn't finished and it wants to read, try to finish it.
-			if (!Handshake(user, session))
+			if (!Handshake(user))
 			{
 				// Couldn't resume handshake.
-				if (session->status == ISSL_NONE)
+				if (status == ISSL_NONE)
 					return -1;
 				return 0;
 			}
 		}
 
-		// If we resumed the handshake then session->status will be ISSL_OPEN
+		// If we resumed the handshake then this->status will be ISSL_OPEN
 
-		if (session->status == ISSL_OPEN)
+		if (status == ISSL_OPEN)
 		{
 			ERR_clear_error();
 			char* buffer = ServerInstance->GetReadBuffer();
 			size_t bufsiz = ServerInstance->Config->NetBufferSize;
-			int ret = SSL_read(session->sess, buffer, bufsiz);
+			int ret = SSL_read(sess, buffer, bufsiz);
 
 #ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-			if (!CheckRenego(user, session))
+			if (!CheckRenego(user))
 				return -1;
 #endif
 
 			if (ret > 0)
 			{
 				recvq.append(buffer, ret);
-				if (session->data_to_write)
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_SINGLE_WRITE);
+				if (data_to_write)
+					SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_SINGLE_WRITE);
 				return 1;
 			}
 			else if (ret == 0)
 			{
 				// Client closed connection.
-				CloseSession(session);
+				CloseSession();
 				user->SetError("Connection closed");
 				return -1;
 			}
 			else if (ret < 0)
 			{
-				int err = SSL_get_error(session->sess, ret);
+				int err = SSL_get_error(sess, ret);
 
 				if (err == SSL_ERROR_WANT_READ)
 				{
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ);
+					SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ);
 					return 0;
 				}
 				else if (err == SSL_ERROR_WANT_WRITE)
 				{
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
+					SocketEngine::ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
 					return 0;
 				}
 				else
 				{
-					CloseSession(session);
+					CloseSession();
 					return -1;
 				}
 			}
@@ -627,75 +595,71 @@ class ModuleSSLOpenSSL : public Module
 		return 0;
 	}
 
-	int OnStreamSocketWrite(StreamSocket* user, std::string& buffer)
+	int OnStreamSocketWrite(StreamSocket* user, std::string& buffer) CXX11_OVERRIDE
 	{
-		int fd = user->GetFd();
-
-		issl_session* session = &sessions[fd];
-
-		if (!session->sess)
+		if (!sess)
 		{
-			CloseSession(session);
+			CloseSession();
 			return -1;
 		}
 
-		session->data_to_write = true;
+		data_to_write = true;
 
-		if (session->status == ISSL_HANDSHAKING)
+		if (status == ISSL_HANDSHAKING)
 		{
-			if (!Handshake(user, session))
+			if (!Handshake(user))
 			{
 				// Couldn't resume handshake.
-				if (session->status == ISSL_NONE)
+				if (status == ISSL_NONE)
 					return -1;
 				return 0;
 			}
 		}
 
-		if (session->status == ISSL_OPEN)
+		if (status == ISSL_OPEN)
 		{
 			ERR_clear_error();
-			int ret = SSL_write(session->sess, buffer.data(), buffer.size());
+			int ret = SSL_write(sess, buffer.data(), buffer.size());
 
 #ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
-			if (!CheckRenego(user, session))
+			if (!CheckRenego(user))
 				return -1;
 #endif
 
 			if (ret == (int)buffer.length())
 			{
-				session->data_to_write = false;
-				ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+				data_to_write = false;
+				SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 				return 1;
 			}
 			else if (ret > 0)
 			{
 				buffer = buffer.substr(ret);
-				ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
+				SocketEngine::ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
 				return 0;
 			}
 			else if (ret == 0)
 			{
-				CloseSession(session);
+				CloseSession();
 				return -1;
 			}
 			else if (ret < 0)
 			{
-				int err = SSL_get_error(session->sess, ret);
+				int err = SSL_get_error(sess, ret);
 
 				if (err == SSL_ERROR_WANT_WRITE)
 				{
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
+					SocketEngine::ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
 					return 0;
 				}
 				else if (err == SSL_ERROR_WANT_READ)
 				{
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ);
+					SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ);
 					return 0;
 				}
 				else
 				{
-					CloseSession(session);
+					CloseSession();
 					return -1;
 				}
 			}
@@ -703,147 +667,173 @@ class ModuleSSLOpenSSL : public Module
 		return 0;
 	}
 
-	bool Handshake(StreamSocket* user, issl_session* session)
+	void TellCiphersAndFingerprint(LocalUser* user)
 	{
-		int ret;
+		if (sess)
+		{
+			std::string text = "*** You are connected using SSL cipher '" + std::string(SSL_get_cipher(sess)) + "'";
+			const std::string& fingerprint = certificate->fingerprint;
+			if (!fingerprint.empty())
+				text += " and your SSL certificate fingerprint is " + fingerprint;
 
-		ERR_clear_error();
-		if (session->outbound)
-			ret = SSL_connect(session->sess);
-		else
-			ret = SSL_accept(session->sess);
+			user->WriteNotice(text);
+		}
+	}
+};
 
-		if (ret < 0)
+static void StaticSSLInfoCallback(const SSL* ssl, int where, int rc)
+{
+#ifdef INSPIRCD_OPENSSL_ENABLE_RENEGO_DETECTION
+	OpenSSLIOHook* hook = static_cast<OpenSSLIOHook*>(SSL_get_ex_data(ssl, exdataindex));
+	hook->SSLInfoCallback(where, rc);
+#endif
+}
+
+class OpenSSLIOHookProvider : public refcountbase, public IOHookProvider
+{
+	reference<OpenSSL::Profile> profile;
+
+ public:
+	OpenSSLIOHookProvider(Module* mod, reference<OpenSSL::Profile>& prof)
+		: IOHookProvider(mod, "ssl/" + prof->GetName(), IOHookProvider::IOH_SSL)
+		, profile(prof)
+	{
+		ServerInstance->Modules->AddService(*this);
+	}
+
+	~OpenSSLIOHookProvider()
+	{
+		ServerInstance->Modules->DelService(*this);
+	}
+
+	void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
+	{
+		new OpenSSLIOHook(this, sock, false, profile->CreateServerSession(), profile);
+	}
+
+	void OnConnect(StreamSocket* sock) CXX11_OVERRIDE
+	{
+		new OpenSSLIOHook(this, sock, true, profile->CreateClientSession(), profile);
+	}
+};
+
+class ModuleSSLOpenSSL : public Module
+{
+	typedef std::vector<reference<OpenSSLIOHookProvider> > ProfileList;
+
+	ProfileList profiles;
+
+	void ReadProfiles()
+	{
+		ProfileList newprofiles;
+		ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile");
+		if (tags.first == tags.second)
 		{
-			int err = SSL_get_error(session->sess, ret);
+			// Create a default profile named "openssl"
+			const std::string defname = "openssl";
+			ConfigTag* tag = ServerInstance->Config->ConfValue(defname);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found, using settings from the <openssl> tag");
 
-			if (err == SSL_ERROR_WANT_READ)
+			try
 			{
-				ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
-				session->status = ISSL_HANDSHAKING;
-				return true;
+				reference<OpenSSL::Profile> profile(new OpenSSL::Profile(defname, tag));
+				newprofiles.push_back(new OpenSSLIOHookProvider(this, profile));
 			}
-			else if (err == SSL_ERROR_WANT_WRITE)
+			catch (OpenSSL::Exception& ex)
 			{
-				ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
-				session->status = ISSL_HANDSHAKING;
-				return true;
-			}
-			else
-			{
-				CloseSession(session);
+				throw ModuleException("Error while initializing the default SSL profile - " + ex.GetReason());
 			}
-
-			return false;
 		}
-		else if (ret > 0)
+
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			// Handshake complete.
-			VerifyCertificate(session, user);
+			ConfigTag* tag = i->second;
+			if (tag->getString("provider") != "openssl")
+				continue;
 
-			session->status = ISSL_OPEN;
+			std::string name = tag->getString("name");
+			if (name.empty())
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring <sslprofile> tag without name at " + tag->getTagLocation());
+				continue;
+			}
 
-			ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
+			reference<OpenSSL::Profile> profile;
+			try
+			{
+				profile = new OpenSSL::Profile(name, tag);
+			}
+			catch (CoreException& ex)
+			{
+				throw ModuleException("Error while initializing SSL profile \"" + name + "\" at " + tag->getTagLocation() + " - " + ex.GetReason());
+			}
 
-			return true;
-		}
-		else if (ret == 0)
-		{
-			CloseSession(session);
+			newprofiles.push_back(new OpenSSLIOHookProvider(this, profile));
 		}
-		return false;
+
+		profiles.swap(newprofiles);
 	}
 
-	void CloseSession(issl_session* session)
+ public:
+	ModuleSSLOpenSSL()
 	{
-		if (session->sess)
-		{
-			SSL_shutdown(session->sess);
-			SSL_free(session->sess);
-		}
-
-		session->sess = NULL;
-		session->status = ISSL_NONE;
-		session->cert = NULL;
+		// Initialize OpenSSL
+		SSL_library_init();
+		SSL_load_error_strings();
 	}
 
-	void VerifyCertificate(issl_session* session, StreamSocket* user)
+	void init() CXX11_OVERRIDE
 	{
-		if (!session->sess || !user)
-			return;
+		// Register application specific data
+		char exdatastr[] = "inspircd";
+		exdataindex = SSL_get_ex_new_index(0, exdatastr, NULL, NULL, NULL);
+		if (exdataindex < 0)
+			throw ModuleException("Failed to register application specific data");
 
-		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 = use_sha ? EVP_sha1() : EVP_md5();
-
-		cert = SSL_get_peer_certificate((SSL*)session->sess);
+		ReadProfiles();
+	}
 
-		if (!cert)
-		{
-			certinfo->error = "Could not get peer certificate: "+std::string(get_error());
+	void OnModuleRehash(User* user, const std::string &param) CXX11_OVERRIDE
+	{
+		if (param != "ssl")
 			return;
-		}
-
-		certinfo->invalid = (SSL_get_verify_result(session->sess) != X509_V_OK);
 
-		if (!SelfSigned)
+		try
 		{
-			certinfo->unknownsigner = false;
-			certinfo->trusted = true;
+			ReadProfiles();
 		}
-		else
+		catch (ModuleException& ex)
 		{
-			certinfo->unknownsigner = true;
-			certinfo->trusted = false;
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, ex.GetReason() + " Not applying settings.");
 		}
+	}
 
-		char buf[512];
-		X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
-		certinfo->dn = buf;
-		// Make sure there are no chars in the string that we consider invalid
-		if (certinfo->dn.find_first_of("\r\n") != std::string::npos)
-			certinfo->dn.clear();
-
-		X509_NAME_oneline(X509_get_issuer_name(cert), buf, sizeof(buf));
-		certinfo->issuer = buf;
-		if (certinfo->issuer.find_first_of("\r\n") != std::string::npos)
-			certinfo->issuer.clear();
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
+	{
+		IOHook* hook = user->eh.GetIOHook();
+		if (hook && hook->prov->creator == this)
+			static_cast<OpenSSLIOHook*>(hook)->TellCiphersAndFingerprint(user);
+	}
 
-		if (!X509_digest(cert, digest, md, &n))
-		{
-			certinfo->error = "Out of memory generating fingerprint";
-		}
-		else
+	void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
+	{
+		if (target_type == TYPE_USER)
 		{
-			certinfo->fingerprint = irc::hex(md, n);
-		}
+			LocalUser* user = IS_LOCAL((User*)item);
 
-		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->error = "Not activated, or expired certificate";
+			if (user && user->eh.GetIOHook() && user->eh.GetIOHook()->prov->creator == 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");
+			}
 		}
+	}
 
-		X509_free(cert);
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 };
 
-static int error_callback(const char *str, size_t len, void *u)
-{
-	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)