X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=2add962fd05d1157e4a93ed2b6469a8c07f2f51f;hb=99f79a4e5c3abbe91a03216824e7659051872054;hp=c631642cee610e74f030117af62f35200df63f62;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index c631642ce..2add962fd 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -24,11 +24,22 @@
 #include "inspircd.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <gcrypt.h>
-#include "ssl.h"
-#include "m_cap.h"
+#include "modules/ssl.h"
+#include "modules/cap.h"
+#include <memory>
 
-#ifdef WINDOWS
+#if ((GNUTLS_VERSION_MAJOR > 2) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR > 9) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR == 9 && GNUTLS_VERSION_PATCH >= 8))
+#define GNUTLS_HAS_MAC_GET_ID
+#include <gnutls/crypto.h>
+#endif
+
+#if (GNUTLS_VERSION_MAJOR > 2 || GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR > 12)
+# define GNUTLS_HAS_RND
+#else
+# include <gcrypt.h>
+#endif
+
+#ifdef _WIN32
 # pragma comment(lib, "libgnutls.lib")
 # pragma comment(lib, "libgcrypt.lib")
 # pragma comment(lib, "libgpg-error.lib")
@@ -39,53 +50,33 @@
 # pragma comment(lib, "gdi32.lib")
 #endif
 
-/* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
-/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") -lgcrypt */
+/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") -Wno-pedantic */
+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
 
-enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
-
-static std::vector<gnutls_x509_crt_t> x509_certs;
-static gnutls_x509_privkey_t x509_key;
-static int cert_callback (gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs,
-	const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st) {
+#ifndef GNUTLS_VERSION_MAJOR
+#define GNUTLS_VERSION_MAJOR LIBGNUTLS_VERSION_MAJOR
+#define GNUTLS_VERSION_MINOR LIBGNUTLS_VERSION_MINOR
+#define GNUTLS_VERSION_PATCH LIBGNUTLS_VERSION_PATCH
+#endif
 
-	st->type = GNUTLS_CRT_X509;
-	st->ncerts = x509_certs.size();
-	st->cert.x509 = &x509_certs[0];
-	st->key.x509 = x509_key;
-	st->deinit_all = 0;
+// These don't exist in older GnuTLS versions
+#if ((GNUTLS_VERSION_MAJOR > 2) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR > 1) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR == 1 && GNUTLS_VERSION_PATCH >= 7))
+#define GNUTLS_NEW_PRIO_API
+#endif
 
-	return 0;
-}
+#if(GNUTLS_VERSION_MAJOR < 2)
+typedef gnutls_certificate_credentials_t gnutls_certificate_credentials;
+typedef gnutls_dh_params_t gnutls_dh_params;
+#endif
 
-static ssize_t gnutls_pull_wrapper(gnutls_transport_ptr_t user_wrap, void* buffer, size_t size)
-{
-	StreamSocket* user = reinterpret_cast<StreamSocket*>(user_wrap);
-	if (user->GetEventMask() & FD_READ_WILL_BLOCK)
-	{
-		errno = EAGAIN;
-		return -1;
-	}
-	int rv = ServerInstance->SE->Recv(user, reinterpret_cast<char *>(buffer), size, 0);
-	if (rv < (int)size)
-		ServerInstance->SE->ChangeEventMask(user, FD_READ_WILL_BLOCK);
-	return rv;
-}
+enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
 
-static ssize_t gnutls_push_wrapper(gnutls_transport_ptr_t user_wrap, const void* buffer, size_t size)
-{
-	StreamSocket* user = reinterpret_cast<StreamSocket*>(user_wrap);
-	if (user->GetEventMask() & FD_WRITE_WILL_BLOCK)
-	{
-		errno = EAGAIN;
-		return -1;
-	}
-	int rv = ServerInstance->SE->Send(user, reinterpret_cast<const char *>(buffer), size, 0);
-	if (rv < (int)size)
-		ServerInstance->SE->ChangeEventMask(user, FD_WRITE_WILL_BLOCK);
-	return rv;
-}
+#if (GNUTLS_VERSION_MAJOR > 2 || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR >= 12))
+#define GNUTLS_NEW_CERT_CALLBACK_API
+typedef gnutls_retr2_st cert_cb_last_param_type;
+#else
+typedef gnutls_retr_st cert_cb_last_param_type;
+#endif
 
 class RandGen : public HandlerBase2<void, char*, size_t>
 {
@@ -93,398 +84,757 @@ class RandGen : public HandlerBase2<void, char*, size_t>
 	RandGen() {}
 	void Call(char* buffer, size_t len)
 	{
+#ifdef GNUTLS_HAS_RND
+		gnutls_rnd(GNUTLS_RND_RANDOM, buffer, len);
+#else
 		gcry_randomize(buffer, len, GCRY_STRONG_RANDOM);
+#endif
 	}
 };
 
-/** Represents an SSL user's extra data
- */
-class issl_session
+namespace GnuTLS
 {
-public:
-	gnutls_session_t sess;
-	issl_status status;
-	reference<ssl_cert> cert;
-	issl_session() : sess(NULL) {}
-};
+	class Init
+	{
+	 public:
+		Init() { gnutls_global_init(); }
+		~Init() { gnutls_global_deinit(); }
+	};
 
-class CommandStartTLS : public SplitCommand
-{
- public:
-	bool enabled;
-	CommandStartTLS (Module* mod) : SplitCommand(mod, "STARTTLS")
+	class Exception : public ModuleException
 	{
-		enabled = true;
-		works_before_reg = true;
-	}
+	 public:
+		Exception(const std::string& reason)
+			: ModuleException(reason) { }
+	};
 
-	CmdResult HandleLocal(const std::vector<std::string> &parameters, LocalUser *user)
+	void ThrowOnError(int errcode, const char* msg)
 	{
-		if (!enabled)
+		if (errcode < 0)
 		{
-			user->WriteNumeric(691, "%s :STARTTLS is not enabled", user->nick.c_str());
-			return CMD_FAILURE;
+			std::string reason = msg;
+			reason.append(" :").append(gnutls_strerror(errcode));
+			throw Exception(reason);
 		}
+	}
+
+	/** Used to create a gnutls_datum_t* from a std::string
+	 */
+	class Datum
+	{
+		gnutls_datum_t datum;
 
-		if (user->registered == REG_ALL)
+	 public:
+		Datum(const std::string& dat)
 		{
-			user->WriteNumeric(691, "%s :STARTTLS is not permitted after client registration is complete", user->nick.c_str());
+			datum.data = (unsigned char*)dat.data();
+			datum.size = static_cast<unsigned int>(dat.length());
 		}
-		else
+
+		const gnutls_datum_t* get() const { return &datum; }
+	};
+
+	class Hash
+	{
+		gnutls_digest_algorithm_t hash;
+
+	 public:
+		// Nothing to deallocate, constructor may throw freely
+		Hash(const std::string& hashname)
 		{
-			if (!user->eh.GetIOHook())
-			{
-				user->WriteNumeric(670, "%s :STARTTLS successful, go ahead with TLS handshake", user->nick.c_str());
-				/* We need to flush the write buffer prior to adding the IOHook,
-				 * otherwise we'll be sending this line inside the SSL session - which
-				 * won't start its handshake until the client gets this line. Currently,
-				 * we assume the write will not block here; this is usually safe, as
-				 * STARTTLS is sent very early on in the registration phase, where the
-				 * user hasn't built up much sendq. Handling a blocked write here would
-				 * be very annoying.
-				 */
-				user->eh.DoWrite();
-				user->eh.AddIOHook(creator);
-				creator->OnStreamSocketAccept(&user->eh, NULL, NULL);
-			}
+			// As older versions of gnutls can't do this, let's disable it where needed.
+#ifdef GNUTLS_HAS_MAC_GET_ID
+			// As gnutls_digest_algorithm_t and gnutls_mac_algorithm_t are mapped 1:1, we can do this
+			// There is no gnutls_dig_get_id() at the moment, but it may come later
+			hash = (gnutls_digest_algorithm_t)gnutls_mac_get_id(hashname.c_str());
+			if (hash == GNUTLS_DIG_UNKNOWN)
+				throw Exception("Unknown hash type " + hashname);
+
+			// Check if the user is giving us something that is a valid MAC but not digest
+			gnutls_hash_hd_t is_digest;
+			if (gnutls_hash_init(&is_digest, hash) < 0)
+				throw Exception("Unknown hash type " + hashname);
+			gnutls_hash_deinit(is_digest, NULL);
+#else
+			if (hashname == "md5")
+				hash = GNUTLS_DIG_MD5;
+			else if (hashname == "sha1")
+				hash = GNUTLS_DIG_SHA1;
 			else
-				user->WriteNumeric(691, "%s :STARTTLS failure", user->nick.c_str());
+				throw Exception("Unknown hash type " + hashname);
+#endif
 		}
 
-		return CMD_FAILURE;
-	}
-};
+		gnutls_digest_algorithm_t get() const { return hash; }
+	};
 
-class ModuleSSLGnuTLS : public Module
-{
-	issl_session* sessions;
+	class DHParams
+	{
+		gnutls_dh_params_t dh_params;
 
-	gnutls_certificate_credentials x509_cred;
-	gnutls_dh_params dh_params;
-	gnutls_digest_algorithm_t hash;
+		DHParams()
+		{
+			ThrowOnError(gnutls_dh_params_init(&dh_params), "gnutls_dh_params_init() failed");
+		}
 
-	std::string sslports;
-	int dh_bits;
+	 public:
+		/** Import */
+		static std::auto_ptr<DHParams> Import(const std::string& dhstr)
+		{
+			std::auto_ptr<DHParams> dh(new DHParams);
+			int ret = gnutls_dh_params_import_pkcs3(dh->dh_params, Datum(dhstr).get(), GNUTLS_X509_FMT_PEM);
+			ThrowOnError(ret, "Unable to import DH params");
+			return dh;
+		}
 
-	bool cred_alloc;
-	bool dh_alloc;
+		/** Generate */
+		static std::auto_ptr<DHParams> Generate(unsigned int bits)
+		{
+			std::auto_ptr<DHParams> dh(new DHParams);
+			ThrowOnError(gnutls_dh_params_generate2(dh->dh_params, bits), "Unable to generate DH params");
+			return dh;
+		}
 
-	RandGen randhandler;
-	CommandStartTLS starttls;
+		~DHParams()
+		{
+			gnutls_dh_params_deinit(dh_params);
+		}
 
-	GenericCap capHandler;
-	ServiceProvider iohook;
- public:
+		const gnutls_dh_params_t& get() const { return dh_params; }
+	};
 
-	ModuleSSLGnuTLS()
-		: starttls(this), capHandler(this, "tls"), iohook(this, "ssl/gnutls", SERVICE_IOHOOK)
+	class X509Key
 	{
-		sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
+		/** Ensure that the key is deinited in case the constructor of X509Key throws
+		 */
+		class RAIIKey
+		{
+		 public:
+			gnutls_x509_privkey_t key;
+
+			RAIIKey()
+			{
+				ThrowOnError(gnutls_x509_privkey_init(&key), "gnutls_x509_privkey_init() failed");
+			}
 
-		gnutls_global_init(); // This must be called once in the program
-		gnutls_x509_privkey_init(&x509_key);
+			~RAIIKey()
+			{
+				gnutls_x509_privkey_deinit(key);
+			}
+		} key;
 
-		cred_alloc = false;
-		dh_alloc = false;
-	}
+	 public:
+		/** Import */
+		X509Key(const std::string& keystr)
+		{
+			int ret = gnutls_x509_privkey_import(key.key, Datum(keystr).get(), GNUTLS_X509_FMT_PEM);
+			ThrowOnError(ret, "Unable to import private key");
+		}
 
-	void init()
+		gnutls_x509_privkey_t& get() { return key.key; }
+	};
+
+	class X509CertList
 	{
-		// Needs the flag as it ignores a plain /rehash
-		OnModuleRehash(NULL,"ssl");
+		std::vector<gnutls_x509_crt_t> certs;
 
-		ServerInstance->GenRandom = &randhandler;
+	 public:
+		/** Import */
+		X509CertList(const std::string& certstr)
+		{
+			unsigned int certcount = 3;
+			certs.resize(certcount);
+			Datum datum(certstr);
 
-		// Void return, guess we assume success
-		gnutls_certificate_set_dh_params(x509_cred, dh_params);
-		Implementation eventlist[] = { I_On005Numeric, I_OnRehash, I_OnModuleRehash, I_OnUserConnect,
-			I_OnEvent, I_OnHookIO };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+			int ret = gnutls_x509_crt_list_import(raw(), &certcount, datum.get(), GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
+			if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER)
+			{
+				// the buffer wasn't big enough to hold all certs but gnutls changed certcount to the number of available certs,
+				// try again with a bigger buffer
+				certs.resize(certcount);
+				ret = gnutls_x509_crt_list_import(raw(), &certcount, datum.get(), GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
+			}
 
-		ServerInstance->Modules->AddService(iohook);
-		ServerInstance->AddCommand(&starttls);
-	}
+			ThrowOnError(ret, "Unable to load certificates");
 
-	void OnRehash(User* user)
-	{
-		sslports.clear();
+			// Resize the vector to the actual number of certs because we rely on its size being correct
+			// when deallocating the certs
+			certs.resize(certcount);
+		}
 
-		ConfigTag* Conf = ServerInstance->Config->ConfValue("gnutls");
-		starttls.enabled = Conf->getBool("starttls", true);
+		~X509CertList()
+		{
+			for (std::vector<gnutls_x509_crt_t>::iterator i = certs.begin(); i != certs.end(); ++i)
+				gnutls_x509_crt_deinit(*i);
+		}
 
-		if (Conf->getBool("showports", true))
+		gnutls_x509_crt_t* raw() { return &certs[0]; }
+		unsigned int size() const { return certs.size(); }
+	};
+
+	class X509CRL : public refcountbase
+	{
+		class RAIICRL
 		{
-			for (size_t i = 0; i < ServerInstance->ports.size(); i++)
-			{
-				ListenSocket* port = ServerInstance->ports[i];
-				if (port->bind_tag->getString("ssl") != "gnutls")
-					continue;
+		 public:
+			gnutls_x509_crl_t crl;
 
-				const std::string& portid = port->bind_desc;
-				ServerInstance->Logs->Log("m_ssl_gnutls", DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %s", portid.c_str());
+			RAIICRL()
+			{
+				ThrowOnError(gnutls_x509_crl_init(&crl), "gnutls_x509_crl_init() failed");
+			}
 
-				if (port->bind_tag->getString("type", "clients") == "clients" && port->bind_addr != "127.0.0.1")
-					sslports.append(portid).append(";");
+			~RAIICRL()
+			{
+				gnutls_x509_crl_deinit(crl);
 			}
+		} crl;
 
-			if (!sslports.empty())
-				sslports.erase(sslports.end() - 1);
+	 public:
+		/** Import */
+		X509CRL(const std::string& crlstr)
+		{
+			int ret = gnutls_x509_crl_import(get(), Datum(crlstr).get(), GNUTLS_X509_FMT_PEM);
+			ThrowOnError(ret, "Unable to load certificate revocation list");
 		}
-	}
 
-	void OnModuleRehash(User* user, const std::string &param)
+		gnutls_x509_crl_t& get() { return crl.crl; }
+	};
+
+#ifdef GNUTLS_NEW_PRIO_API
+	class Priority
 	{
-		if(param != "ssl")
-			return;
+		gnutls_priority_t priority;
 
-		std::string keyfile;
-		std::string certfile;
-		std::string cafile;
-		std::string crlfile;
-		OnRehash(user);
+	 public:
+		Priority(const std::string& priorities)
+		{
+			// Try to set the priorities for ciphers, kex methods etc. to the user supplied string
+			// If the user did not supply anything then the string is already set to "NORMAL"
+			const char* priocstr = priorities.c_str();
+			const char* prioerror;
 
-		ConfigTag* Conf = ServerInstance->Config->ConfValue("gnutls");
+			int ret = gnutls_priority_init(&priority, priocstr, &prioerror);
+			if (ret < 0)
+			{
+				// gnutls did not understand the user supplied string
+				throw Exception("Unable to initialize priorities to \"" + priorities + "\": " + gnutls_strerror(ret) + " Syntax error at position " + ConvToStr((unsigned int) (prioerror - priocstr)));
+			}
+		}
 
-		cafile = Conf->getString("cafile", "conf/ca.pem");
-		crlfile	= Conf->getString("crlfile", "conf/crl.pem");
-		certfile = Conf->getString("certfile", "conf/cert.pem");
-		keyfile	= Conf->getString("keyfile", "conf/key.pem");
-		dh_bits	= Conf->getInt("dhbits");
-		std::string hashname = Conf->getString("hash", "md5");
+		~Priority()
+		{
+			gnutls_priority_deinit(priority);
+		}
 
-		if((dh_bits != 768) && (dh_bits != 1024) && (dh_bits != 2048) && (dh_bits != 3072) && (dh_bits != 4096))
-			dh_bits = 1024;
+		void SetupSession(gnutls_session_t sess)
+		{
+			gnutls_priority_set(sess, priority);
+		}
+	};
+#else
+	/** Dummy class, used when gnutls_priority_set() is not available
+	 */
+	class Priority
+	{
+	 public:
+		Priority(const std::string& priorities)
+		{
+			if (priorities != "NORMAL")
+				throw Exception("You've set a non-default priority string, but GnuTLS lacks support for it");
+		}
 
-		if (hashname == "md5")
-			hash = GNUTLS_DIG_MD5;
-		else if (hashname == "sha1")
-			hash = GNUTLS_DIG_SHA1;
-		else
-			throw ModuleException("Unknown hash type " + hashname);
+		static void SetupSession(gnutls_session_t sess)
+		{
+			// Always set the default priorities
+			gnutls_set_default_priority(sess);
+		}
+	};
+#endif
 
+	class CertCredentials
+	{
+		/** DH parameters associated with these credentials
+		 */
+		std::auto_ptr<DHParams> dh;
 
-		int ret;
+	 protected:
+		gnutls_certificate_credentials_t cred;
 
-		if (dh_alloc)
+	 public:
+		CertCredentials()
 		{
-			gnutls_dh_params_deinit(dh_params);
-			dh_alloc = false;
+			ThrowOnError(gnutls_certificate_allocate_credentials(&cred), "Cannot allocate certificate credentials");
 		}
 
-		if (cred_alloc)
+		~CertCredentials()
 		{
-			// Deallocate the old credentials
-			gnutls_certificate_free_credentials(x509_cred);
+			gnutls_certificate_free_credentials(cred);
+		}
 
-			for(unsigned int i=0; i < x509_certs.size(); i++)
-				gnutls_x509_crt_deinit(x509_certs[i]);
-			x509_certs.clear();
+		/** Associates these credentials with the session
+		 */
+		void SetupSession(gnutls_session_t sess)
+		{
+			gnutls_credentials_set(sess, GNUTLS_CRD_CERTIFICATE, cred);
 		}
 
-		ret = gnutls_certificate_allocate_credentials(&x509_cred);
-		cred_alloc = (ret >= 0);
-		if (!cred_alloc)
-			ServerInstance->Logs->Log("m_ssl_gnutls",DEBUG, "m_ssl_gnutls.so: Failed to allocate certificate credentials: %s", gnutls_strerror(ret));
+		/** Set the given DH parameters to be used with these credentials
+		 */
+		void SetDH(std::auto_ptr<DHParams>& DH)
+		{
+			dh = DH;
+			gnutls_certificate_set_dh_params(cred, dh->get());
+		}
+	};
 
-		if((ret =gnutls_certificate_set_x509_trust_file(x509_cred, cafile.c_str(), GNUTLS_X509_FMT_PEM)) < 0)
-			ServerInstance->Logs->Log("m_ssl_gnutls",DEBUG, "m_ssl_gnutls.so: Failed to set X.509 trust file '%s': %s", cafile.c_str(), gnutls_strerror(ret));
+	class X509Credentials : public CertCredentials
+	{
+		/** Private key
+		 */
+		X509Key key;
 
-		if((ret = gnutls_certificate_set_x509_crl_file (x509_cred, crlfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0)
-			ServerInstance->Logs->Log("m_ssl_gnutls",DEBUG, "m_ssl_gnutls.so: Failed to set X.509 CRL file '%s': %s", crlfile.c_str(), gnutls_strerror(ret));
+		/** Certificate list, presented to the peer
+		 */
+		X509CertList certs;
 
-		FileReader reader;
+		/** Trusted CA, may be NULL
+		 */
+		std::auto_ptr<X509CertList> trustedca;
 
-		reader.LoadFile(certfile);
-		std::string cert_string = reader.Contents();
-		gnutls_datum_t cert_datum = { (unsigned char*)cert_string.data(), cert_string.length() };
+		/** Certificate revocation list, may be NULL
+		 */
+		std::auto_ptr<X509CRL> crl;
 
-		reader.LoadFile(keyfile);
-		std::string key_string = reader.Contents();
-		gnutls_datum_t key_datum = { (unsigned char*)key_string.data(), key_string.length() };
+		static int cert_callback(gnutls_session_t session, const gnutls_datum_t* req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t* sign_algos, int sign_algos_length, cert_cb_last_param_type* st);
 
-		// If this fails, no SSL port will work. At all. So, do the smart thing - throw a ModuleException
-		unsigned int certcount = Conf->getInt("certcount", 3);
-		x509_certs.resize(certcount);
-		ret = gnutls_x509_crt_list_import(&x509_certs[0], &certcount, &cert_datum, GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
-		if (ret < 0)
-			throw ModuleException("Unable to load GnuTLS server certificate (" + certfile + "): " + std::string(gnutls_strerror(ret)));
-		x509_certs.resize(certcount);
+	 public:
+		X509Credentials(const std::string& certstr, const std::string& keystr)
+			: key(keystr)
+			, certs(certstr)
+		{
+			// Throwing is ok here, the destructor of Credentials is called in that case
+			int ret = gnutls_certificate_set_x509_key(cred, certs.raw(), certs.size(), key.get());
+			ThrowOnError(ret, "Unable to set cert/key pair");
+
+#ifdef GNUTLS_NEW_CERT_CALLBACK_API
+			gnutls_certificate_set_retrieve_function(cred, cert_callback);
+#else
+			gnutls_certificate_client_set_retrieve_function(cred, cert_callback);
+#endif
+		}
 
-		if((ret = gnutls_x509_privkey_import(x509_key, &key_datum, GNUTLS_X509_FMT_PEM)) < 0)
-			throw ModuleException("Unable to load GnuTLS server private key (" + keyfile + "): " + std::string(gnutls_strerror(ret)));
+		/** Sets the trusted CA and the certificate revocation list
+		 * to use when verifying certificates
+		 */
+		void SetCA(std::auto_ptr<X509CertList>& certlist, std::auto_ptr<X509CRL>& CRL)
+		{
+			// Do nothing if certlist is NULL
+			if (certlist.get())
+			{
+				int ret = gnutls_certificate_set_x509_trust(cred, certlist->raw(), certlist->size());
+				ThrowOnError(ret, "gnutls_certificate_set_x509_trust() failed");
 
-		if((ret = gnutls_certificate_set_x509_key(x509_cred, &x509_certs[0], certcount, x509_key)) < 0)
-			throw ModuleException("Unable to set GnuTLS cert/key pair: " + std::string(gnutls_strerror(ret)));
+				if (CRL.get())
+				{
+					ret = gnutls_certificate_set_x509_crl(cred, &CRL->get(), 1);
+					ThrowOnError(ret, "gnutls_certificate_set_x509_crl() failed");
+				}
 
-		gnutls_certificate_client_set_retrieve_function (x509_cred, cert_callback);
+				trustedca = certlist;
+				crl = CRL;
+			}
+		}
+	};
 
-		ret = gnutls_dh_params_init(&dh_params);
-		dh_alloc = (ret >= 0);
-		if (!dh_alloc)
-			ServerInstance->Logs->Log("m_ssl_gnutls",DEFAULT, "m_ssl_gnutls.so: Failed to initialise DH parameters: %s", gnutls_strerror(ret));
+	class Profile : public refcountbase
+	{
+		/** Name of this profile
+		 */
+		const std::string name;
 
-		// This may be on a large (once a day or week) timer eventually.
-		GenerateDHParams();
-	}
+		/** X509 certificate(s) and key
+		 */
+		X509Credentials x509cred;
 
-	void GenerateDHParams()
-	{
- 		// Generate Diffie Hellman parameters - for use with DHE
-		// kx algorithms. These should be discarded and regenerated
-		// once a day, once a week or once a month. Depending on the
-		// security requirements.
+		/** The minimum length in bits for the DH prime to be accepted as a client
+		 */
+		unsigned int min_dh_bits;
 
-		if (!dh_alloc)
-			return;
+		/** Hashing algorithm to use when generating certificate fingerprints
+		 */
+		Hash hash;
 
-		int ret;
+		/** Priorities for ciphers, compression methods, etc.
+		 */
+		Priority priority;
+
+		Profile(const std::string& profilename, const std::string& certstr, const std::string& keystr,
+				std::auto_ptr<DHParams>& DH, unsigned int mindh, const std::string& hashstr,
+				const std::string& priostr, std::auto_ptr<X509CertList>& CA, std::auto_ptr<X509CRL>& CRL)
+			: name(profilename)
+			, x509cred(certstr, keystr)
+			, min_dh_bits(mindh)
+			, hash(hashstr)
+			, priority(priostr)
+		{
+			x509cred.SetDH(DH);
+			x509cred.SetCA(CA, CRL);
+		}
 
-		if((ret = gnutls_dh_params_generate2(dh_params, dh_bits)) < 0)
-			ServerInstance->Logs->Log("m_ssl_gnutls",DEFAULT, "m_ssl_gnutls.so: Failed to generate DH parameters (%d bits): %s", dh_bits, gnutls_strerror(ret));
-	}
+		static std::string ReadFile(const std::string& filename)
+		{
+			FileReader reader(filename);
+			std::string ret = reader.GetString();
+			if (ret.empty())
+				throw Exception("Cannot read file " + filename);
+			return ret;
+		}
 
-	~ModuleSSLGnuTLS()
+	 public:
+		static reference<Profile> Create(const std::string& profilename, ConfigTag* tag)
+		{
+			std::string certstr = ReadFile(tag->getString("certfile", "cert.pem"));
+			std::string keystr = ReadFile(tag->getString("keyfile", "key.pem"));
+
+			std::auto_ptr<DHParams> dh;
+			int gendh = tag->getInt("gendh");
+			if (gendh)
+			{
+				gendh = (gendh < 1024 ? 1024 : gendh);
+				dh = DHParams::Generate(gendh);
+			}
+			else
+				dh = DHParams::Import(ReadFile(tag->getString("dhfile", "dhparams.pem")));
+
+			// Use default priority string if this tag does not specify one
+			std::string priostr = tag->getString("priority", "NORMAL");
+			unsigned int mindh = tag->getInt("mindhbits", 1024);
+			std::string hashstr = tag->getString("hash", "md5");
+
+			// Load trusted CA and revocation list, if set
+			std::auto_ptr<X509CertList> ca;
+			std::auto_ptr<X509CRL> crl;
+			std::string filename = tag->getString("cafile");
+			if (!filename.empty())
+			{
+				ca.reset(new X509CertList(ReadFile(filename)));
+
+				filename = tag->getString("crlfile");
+				if (!filename.empty())
+					crl.reset(new X509CRL(ReadFile(filename)));
+			}
+
+			return new Profile(profilename, certstr, keystr, dh, mindh, hashstr, priostr, ca, crl);
+		}
+
+		/** Set up the given session with the settings in this profile
+		 */
+		void SetupSession(gnutls_session_t sess)
+		{
+			priority.SetupSession(sess);
+			x509cred.SetupSession(sess);
+			gnutls_dh_set_prime_bits(sess, min_dh_bits);
+		}
+
+		const std::string& GetName() const { return name; }
+		X509Credentials& GetX509Credentials() { return x509cred; }
+		gnutls_digest_algorithm_t GetHash() const { return hash.get(); }
+	};
+}
+
+class GnuTLSIOHook : public SSLIOHook
+{
+ private:
+	gnutls_session_t sess;
+	issl_status status;
+	reference<GnuTLS::Profile> profile;
+
+	void InitSession(StreamSocket* user, bool me_server)
 	{
-		for(unsigned int i=0; i < x509_certs.size(); i++)
-			gnutls_x509_crt_deinit(x509_certs[i]);
+		gnutls_init(&sess, me_server ? GNUTLS_SERVER : GNUTLS_CLIENT);
 
-		gnutls_x509_privkey_deinit(x509_key);
+		profile->SetupSession(sess);
+		gnutls_transport_set_ptr(sess, reinterpret_cast<gnutls_transport_ptr_t>(user));
+		gnutls_transport_set_push_function(sess, gnutls_push_wrapper);
+		gnutls_transport_set_pull_function(sess, gnutls_pull_wrapper);
 
-		if (dh_alloc)
-			gnutls_dh_params_deinit(dh_params);
-		if (cred_alloc)
-			gnutls_certificate_free_credentials(x509_cred);
+		if (me_server)
+			gnutls_certificate_server_set_request(sess, GNUTLS_CERT_REQUEST); // Request client certificate if any.
+	}
 
-		gnutls_global_deinit();
-		delete[] sessions;
-		ServerInstance->GenRandom = &ServerInstance->HandleGenRandom;
+	void CloseSession()
+	{
+		if (this->sess)
+		{
+			gnutls_bye(this->sess, GNUTLS_SHUT_WR);
+			gnutls_deinit(this->sess);
+		}
+		sess = NULL;
+		certificate = NULL;
+		status = ISSL_NONE;
 	}
 
-	void OnCleanup(int target_type, void* item)
+	bool Handshake(StreamSocket* user)
 	{
-		if(target_type == TYPE_USER)
+		int ret = gnutls_handshake(this->sess);
+
+		if (ret < 0)
 		{
-			LocalUser* user = IS_LOCAL(static_cast<User*>(item));
+			if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
+			{
+				// Handshake needs resuming later, read() or write() would have blocked.
 
-			if (user && user->eh.GetIOHook() == this)
+				if (gnutls_record_get_direction(this->sess) == 0)
+				{
+					// gnutls_handshake() wants to read() again.
+					this->status = ISSL_HANDSHAKING_READ;
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+				}
+				else
+				{
+					// gnutls_handshake() wants to write() again.
+					this->status = ISSL_HANDSHAKING_WRITE;
+					ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
+				}
+			}
+			else
 			{
-				// 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->SetError("Handshake Failed - " + std::string(gnutls_strerror(ret)));
+				CloseSession();
+				this->status = ISSL_CLOSING;
 			}
+
+			return false;
 		}
-	}
+		else
+		{
+			// Change the seesion state
+			this->status = ISSL_HANDSHAKEN;
 
-	Version GetVersion()
-	{
-		return Version("Provides SSL support for clients", VF_VENDOR);
-	}
+			VerifyCertificate();
 
+			// Finish writing, if any left
+			ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
 
-	void On005Numeric(std::string &output)
-	{
-		if (!sslports.empty())
-			output.append(" SSL=" + sslports);
-		if (starttls.enabled)
-			output.append(" STARTTLS");
+			return true;
+		}
 	}
 
-	void OnHookIO(StreamSocket* user, ListenSocket* lsb)
+	void VerifyCertificate()
 	{
-		if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "gnutls")
+		unsigned int certstatus;
+		const gnutls_datum_t* cert_list;
+		int ret;
+		unsigned int cert_list_size;
+		gnutls_x509_crt_t cert;
+		char str[512];
+		unsigned char digest[512];
+		size_t digest_size = sizeof(digest);
+		size_t name_size = sizeof(str);
+		ssl_cert* certinfo = new ssl_cert;
+		this->certificate = certinfo;
+
+		/* This verification function uses the trusted CAs in the credentials
+		 * structure. So you must have installed one or more CA certificates.
+		 */
+		ret = gnutls_certificate_verify_peers2(this->sess, &certstatus);
+
+		if (ret < 0)
 		{
-			/* Hook the user with our module */
-			user->AddIOHook(this);
+			certinfo->error = std::string(gnutls_strerror(ret));
+			return;
 		}
-	}
 
-	void OnRequest(Request& request)
-	{
-		if (strcmp("GET_SSL_CERT", request.id) == 0)
+		certinfo->invalid = (certstatus & GNUTLS_CERT_INVALID);
+		certinfo->unknownsigner = (certstatus & GNUTLS_CERT_SIGNER_NOT_FOUND);
+		certinfo->revoked = (certstatus & GNUTLS_CERT_REVOKED);
+		certinfo->trusted = !(certstatus & GNUTLS_CERT_SIGNER_NOT_CA);
+
+		/* Up to here the process is the same for X.509 certificates and
+		 * OpenPGP keys. From now on X.509 certificates are assumed. This can
+		 * be easily extended to work with openpgp keys as well.
+		 */
+		if (gnutls_certificate_type_get(this->sess) != GNUTLS_CRT_X509)
 		{
-			SocketCertificateRequest& req = static_cast<SocketCertificateRequest&>(request);
-			int fd = req.sock->GetFd();
-			issl_session* session = &sessions[fd];
+			certinfo->error = "No X509 keys sent";
+			return;
+		}
+
+		ret = gnutls_x509_crt_init(&cert);
+		if (ret < 0)
+		{
+			certinfo->error = gnutls_strerror(ret);
+			return;
+		}
 
-			req.cert = session->cert;
+		cert_list_size = 0;
+		cert_list = gnutls_certificate_get_peers(this->sess, &cert_list_size);
+		if (cert_list == NULL)
+		{
+			certinfo->error = "No certificate was found";
+			goto info_done_dealloc;
 		}
+
+		/* This is not a real world example, since we only check the first
+		 * certificate in the given chain.
+		 */
+
+		ret = gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER);
+		if (ret < 0)
+		{
+			certinfo->error = gnutls_strerror(ret);
+			goto info_done_dealloc;
+		}
+
+		gnutls_x509_crt_get_dn(cert, str, &name_size);
+		certinfo->dn = str;
+
+		gnutls_x509_crt_get_issuer_dn(cert, str, &name_size);
+		certinfo->issuer = str;
+
+		if ((ret = gnutls_x509_crt_get_fingerprint(cert, profile->GetHash(), digest, &digest_size)) < 0)
+		{
+			certinfo->error = gnutls_strerror(ret);
+		}
+		else
+		{
+			certinfo->fingerprint = BinToHex(digest, digest_size);
+		}
+
+		/* Beware here we do not check for errors.
+		 */
+		if ((gnutls_x509_crt_get_expiration_time(cert) < ServerInstance->Time()) || (gnutls_x509_crt_get_activation_time(cert) > ServerInstance->Time()))
+		{
+			certinfo->error = "Not activated, or expired certificate";
+		}
+
+info_done_dealloc:
+		gnutls_x509_crt_deinit(cert);
 	}
 
-	void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+	static const char* UnknownIfNULL(const char* str)
 	{
-		int fd = user->GetFd();
-		issl_session* session = &sessions[fd];
-
-		/* For STARTTLS: Don't try and init a session on a socket that already has a session */
-		if (session->sess)
-			return;
+		return str ? str : "UNKNOWN";
+	}
 
-		gnutls_init(&session->sess, GNUTLS_SERVER);
+	static ssize_t gnutls_pull_wrapper(gnutls_transport_ptr_t session_wrap, void* buffer, size_t size)
+	{
+		StreamSocket* sock = reinterpret_cast<StreamSocket*>(session_wrap);
+#ifdef _WIN32
+		GnuTLSIOHook* session = static_cast<GnuTLSIOHook*>(sock->GetIOHook());
+#endif
 
-		gnutls_set_default_priority(session->sess); // Avoid calling all the priority functions, defaults are adequate.
-		gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred);
-		gnutls_dh_set_prime_bits(session->sess, dh_bits);
+		if (sock->GetEventMask() & FD_READ_WILL_BLOCK)
+		{
+#ifdef _WIN32
+			gnutls_transport_set_errno(session->sess, EAGAIN);
+#else
+			errno = EAGAIN;
+#endif
+			return -1;
+		}
 
-		gnutls_transport_set_ptr(session->sess, reinterpret_cast<gnutls_transport_ptr_t>(user));
-		gnutls_transport_set_push_function(session->sess, gnutls_push_wrapper);
-		gnutls_transport_set_pull_function(session->sess, gnutls_pull_wrapper);
+		int rv = ServerInstance->SE->Recv(sock, reinterpret_cast<char *>(buffer), size, 0);
 
-		gnutls_certificate_server_set_request(session->sess, GNUTLS_CERT_REQUEST); // Request client certificate if any.
+#ifdef _WIN32
+		if (rv < 0)
+		{
+			/* Windows doesn't use errno, but gnutls does, so check SocketEngine::IgnoreError()
+			 * and then set errno appropriately.
+			 * The gnutls library may also have a different errno variable than us, see
+			 * gnutls_transport_set_errno(3).
+			 */
+			gnutls_transport_set_errno(session->sess, SocketEngine::IgnoreError() ? EAGAIN : errno);
+		}
+#endif
 
-		Handshake(session, user);
+		if (rv < (int)size)
+			ServerInstance->SE->ChangeEventMask(sock, FD_READ_WILL_BLOCK);
+		return rv;
 	}
 
-	void OnStreamSocketConnect(StreamSocket* user)
+	static ssize_t gnutls_push_wrapper(gnutls_transport_ptr_t session_wrap, const void* buffer, size_t size)
 	{
-		issl_session* session = &sessions[user->GetFd()];
+		StreamSocket* sock = reinterpret_cast<StreamSocket*>(session_wrap);
+#ifdef _WIN32
+		GnuTLSIOHook* session = static_cast<GnuTLSIOHook*>(sock->GetIOHook());
+#endif
+
+		if (sock->GetEventMask() & FD_WRITE_WILL_BLOCK)
+		{
+#ifdef _WIN32
+			gnutls_transport_set_errno(session->sess, EAGAIN);
+#else
+			errno = EAGAIN;
+#endif
+			return -1;
+		}
 
-		gnutls_init(&session->sess, GNUTLS_CLIENT);
+		int rv = ServerInstance->SE->Send(sock, reinterpret_cast<const char *>(buffer), size, 0);
 
-		gnutls_set_default_priority(session->sess); // Avoid calling all the priority functions, defaults are adequate.
-		gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred);
-		gnutls_dh_set_prime_bits(session->sess, dh_bits);
-		gnutls_transport_set_ptr(session->sess, reinterpret_cast<gnutls_transport_ptr_t>(user));
-		gnutls_transport_set_push_function(session->sess, gnutls_push_wrapper);
-		gnutls_transport_set_pull_function(session->sess, gnutls_pull_wrapper);
+#ifdef _WIN32
+		if (rv < 0)
+		{
+			/* Windows doesn't use errno, but gnutls does, so check SocketEngine::IgnoreError()
+			 * and then set errno appropriately.
+			 * The gnutls library may also have a different errno variable than us, see
+			 * gnutls_transport_set_errno(3).
+			 */
+			gnutls_transport_set_errno(session->sess, SocketEngine::IgnoreError() ? EAGAIN : errno);
+		}
+#endif
 
-		Handshake(session, user);
+		if (rv < (int)size)
+			ServerInstance->SE->ChangeEventMask(sock, FD_WRITE_WILL_BLOCK);
+		return rv;
 	}
 
-	void OnStreamSocketClose(StreamSocket* user)
+ public:
+	GnuTLSIOHook(IOHookProvider* hookprov, StreamSocket* sock, bool outbound, const reference<GnuTLS::Profile>& sslprofile)
+		: SSLIOHook(hookprov)
+		, sess(NULL)
+		, status(ISSL_NONE)
+		, profile(sslprofile)
 	{
-		CloseSession(&sessions[user->GetFd()]);
+		InitSession(sock, outbound);
+		sock->AddIOHook(this);
+		Handshake(sock);
 	}
 
-	int OnStreamSocketRead(StreamSocket* user, std::string& recvq)
+	void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE
 	{
-		issl_session* session = &sessions[user->GetFd()];
+		CloseSession();
+	}
 
-		if (!session->sess)
+	int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE
+	{
+		if (!this->sess)
 		{
-			CloseSession(session);
+			CloseSession();
 			user->SetError("No SSL session");
 			return -1;
 		}
 
-		if (session->status == ISSL_HANDSHAKING_READ || session->status == ISSL_HANDSHAKING_WRITE)
+		if (this->status == ISSL_HANDSHAKING_READ || this->status == ISSL_HANDSHAKING_WRITE)
 		{
 			// The handshake isn't finished, try to finish it.
 
-			if(!Handshake(session, user))
+			if (!Handshake(user))
 			{
-				if (session->status != ISSL_CLOSING)
+				if (this->status != ISSL_CLOSING)
 					return 0;
 				return -1;
 			}
 		}
 
-		// If we resumed the handshake then session->status will be ISSL_HANDSHAKEN.
+		// If we resumed the handshake then this->status will be ISSL_HANDSHAKEN.
 
-		if (session->status == ISSL_HANDSHAKEN)
+		if (this->status == ISSL_HANDSHAKEN)
 		{
 			char* buffer = ServerInstance->GetReadBuffer();
 			size_t bufsiz = ServerInstance->Config->NetBufferSize;
-			int ret = gnutls_record_recv(session->sess, buffer, bufsiz);
+			int ret = gnutls_record_recv(this->sess, buffer, bufsiz);
 			if (ret > 0)
 			{
 				recvq.append(buffer, ret);
@@ -496,48 +846,46 @@ class ModuleSSLGnuTLS : public Module
 			}
 			else if (ret == 0)
 			{
-				user->SetError("SSL Connection closed");
-				CloseSession(session);
+				user->SetError("Connection closed");
+				CloseSession();
 				return -1;
 			}
 			else
 			{
 				user->SetError(gnutls_strerror(ret));
-				CloseSession(session);
+				CloseSession();
 				return -1;
 			}
 		}
-		else if (session->status == ISSL_CLOSING)
+		else if (this->status == ISSL_CLOSING)
 			return -1;
 
 		return 0;
 	}
 
-	int OnStreamSocketWrite(StreamSocket* user, std::string& sendq)
+	int OnStreamSocketWrite(StreamSocket* user, std::string& sendq) CXX11_OVERRIDE
 	{
-		issl_session* session = &sessions[user->GetFd()];
-
-		if (!session->sess)
+		if (!this->sess)
 		{
-			CloseSession(session);
+			CloseSession();
 			user->SetError("No SSL session");
 			return -1;
 		}
 
-		if (session->status == ISSL_HANDSHAKING_WRITE || session->status == ISSL_HANDSHAKING_READ)
+		if (this->status == ISSL_HANDSHAKING_WRITE || this->status == ISSL_HANDSHAKING_READ)
 		{
 			// The handshake isn't finished, try to finish it.
-			Handshake(session, user);
-			if (session->status != ISSL_CLOSING)
+			Handshake(user);
+			if (this->status != ISSL_CLOSING)
 				return 0;
 			return -1;
 		}
 
 		int ret = 0;
 
-		if (session->status == ISSL_HANDSHAKEN)
+		if (this->status == ISSL_HANDSHAKEN)
 		{
-			ret = gnutls_record_send(session->sess, sendq.data(), sendq.length());
+			ret = gnutls_record_send(this->sess, sendq.data(), sendq.length());
 
 			if (ret == (int)sendq.length())
 			{
@@ -558,7 +906,7 @@ class ModuleSSLGnuTLS : public Module
 			else // (ret < 0)
 			{
 				user->SetError(gnutls_strerror(ret));
-				CloseSession(session);
+				CloseSession();
 				return -1;
 			}
 		}
@@ -566,182 +914,246 @@ class ModuleSSLGnuTLS : public Module
 		return 0;
 	}
 
-	bool Handshake(issl_session* session, StreamSocket* user)
+	void TellCiphersAndFingerprint(LocalUser* user)
 	{
-		int ret = gnutls_handshake(session->sess);
-
-		if (ret < 0)
+		if (sess)
 		{
-			if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
-			{
-				// Handshake needs resuming later, read() or write() would have blocked.
+			std::string text = "*** You are connected using SSL cipher '";
 
-				if(gnutls_record_get_direction(session->sess) == 0)
-				{
-					// gnutls_handshake() wants to read() again.
-					session->status = ISSL_HANDSHAKING_READ;
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
-				}
-				else
-				{
-					// gnutls_handshake() wants to write() again.
-					session->status = ISSL_HANDSHAKING_WRITE;
-					ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
-				}
-			}
-			else
-			{
-				user->SetError(std::string("Handshake Failed - ") + gnutls_strerror(ret));
-				CloseSession(session);
-				session->status = ISSL_CLOSING;
-			}
+			text += UnknownIfNULL(gnutls_kx_get_name(gnutls_kx_get(sess)));
+			text.append("-").append(UnknownIfNULL(gnutls_cipher_get_name(gnutls_cipher_get(sess)))).append("-");
+			text.append(UnknownIfNULL(gnutls_mac_get_name(gnutls_mac_get(sess)))).append("'");
 
-			return false;
+			if (!certificate->fingerprint.empty())
+				text += " and your SSL fingerprint is " + certificate->fingerprint;
+
+			user->WriteNotice(text);
 		}
-		else
-		{
-			// Change the seesion state
-			session->status = ISSL_HANDSHAKEN;
+	}
 
-			VerifyCertificate(session,user);
+	GnuTLS::Profile* GetProfile() { return profile; }
+};
 
-			// Finish writing, if any left
-			ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
+int GnuTLS::X509Credentials::cert_callback(gnutls_session_t sess, const gnutls_datum_t* req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t* sign_algos, int sign_algos_length, cert_cb_last_param_type* st)
+{
+#ifndef GNUTLS_NEW_CERT_CALLBACK_API
+	st->type = GNUTLS_CRT_X509;
+#else
+	st->cert_type = GNUTLS_CRT_X509;
+	st->key_type = GNUTLS_PRIVKEY_X509;
+#endif
+	StreamSocket* sock = reinterpret_cast<StreamSocket*>(gnutls_transport_get_ptr(sess));
+	GnuTLS::X509Credentials& cred = static_cast<GnuTLSIOHook*>(sock->GetIOHook())->GetProfile()->GetX509Credentials();
 
-			return true;
-		}
+	st->ncerts = cred.certs.size();
+	st->cert.x509 = cred.certs.raw();
+	st->key.x509 = cred.key.get();
+	st->deinit_all = 0;
+
+	return 0;
+}
+
+class GnuTLSIOHookProvider : public refcountbase, public IOHookProvider
+{
+	reference<GnuTLS::Profile> profile;
+
+ public:
+ 	GnuTLSIOHookProvider(Module* mod, reference<GnuTLS::Profile>& prof)
+		: IOHookProvider(mod, "ssl/" + prof->GetName(), IOHookProvider::IOH_SSL)
+		, profile(prof)
+	{
+		ServerInstance->Modules->AddService(*this);
 	}
 
-	void OnUserConnect(LocalUser* user)
+	~GnuTLSIOHookProvider()
 	{
-		if (user->eh.GetIOHook() == this)
-		{
-			if (sessions[user->eh.GetFd()].sess)
-			{
-				ssl_cert* cert = sessions[user->eh.GetFd()].cert;
-				std::string cipher = gnutls_kx_get_name(gnutls_kx_get(sessions[user->eh.GetFd()].sess));
-				cipher.append("-").append(gnutls_cipher_get_name(gnutls_cipher_get(sessions[user->eh.GetFd()].sess))).append("-");
-				cipher.append(gnutls_mac_get_name(gnutls_mac_get(sessions[user->eh.GetFd()].sess)));
-				if (cert->fingerprint.empty())
-					user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), cipher.c_str());
-				else
-					user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\""
-						" and your SSL fingerprint is %s", user->nick.c_str(), cipher.c_str(), cert->fingerprint.c_str());
-			}
-		}
+		ServerInstance->Modules->DelService(*this);
 	}
 
-	void CloseSession(issl_session* session)
+	void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
 	{
-		if (session->sess)
-		{
-			gnutls_bye(session->sess, GNUTLS_SHUT_WR);
-			gnutls_deinit(session->sess);
-		}
-		session->sess = NULL;
-		session->cert = NULL;
-		session->status = ISSL_NONE;
+		new GnuTLSIOHook(this, sock, true, profile);
 	}
 
-	void VerifyCertificate(issl_session* session, StreamSocket* user)
+	void OnConnect(StreamSocket* sock) CXX11_OVERRIDE
 	{
-		if (!session->sess || !user)
-			return;
+		new GnuTLSIOHook(this, sock, false, profile);
+	}
+};
 
-		unsigned int status;
-		const gnutls_datum_t* cert_list;
-		int ret;
-		unsigned int cert_list_size;
-		gnutls_x509_crt_t cert;
-		char name[MAXBUF];
-		unsigned char digest[MAXBUF];
-		size_t digest_size = sizeof(digest);
-		size_t name_size = sizeof(name);
-		ssl_cert* certinfo = new ssl_cert;
-		session->cert = certinfo;
+class ModuleSSLGnuTLS : public Module
+{
+	typedef std::vector<reference<GnuTLSIOHookProvider> > ProfileList;
 
-		/* This verification function uses the trusted CAs in the credentials
-		 * structure. So you must have installed one or more CA certificates.
-		 */
-		ret = gnutls_certificate_verify_peers2(session->sess, &status);
+	// First member of the class, gets constructed first and destructed last
+	GnuTLS::Init libinit;
 
-		if (ret < 0)
-		{
-			certinfo->error = std::string(gnutls_strerror(ret));
-			return;
-		}
+	std::string sslports;
 
-		certinfo->invalid = (status & GNUTLS_CERT_INVALID);
-		certinfo->unknownsigner = (status & GNUTLS_CERT_SIGNER_NOT_FOUND);
-		certinfo->revoked = (status & GNUTLS_CERT_REVOKED);
-		certinfo->trusted = !(status & GNUTLS_CERT_SIGNER_NOT_CA);
+	RandGen randhandler;
+	ProfileList profiles;
 
-		/* Up to here the process is the same for X.509 certificates and
-		 * OpenPGP keys. From now on X.509 certificates are assumed. This can
-		 * be easily extended to work with openpgp keys as well.
-		 */
-		if (gnutls_certificate_type_get(session->sess) != GNUTLS_CRT_X509)
-		{
-			certinfo->error = "No X509 keys sent";
-			return;
-		}
+	void ReadProfiles()
+	{
+		// First, store all profiles in a new, temporary container. If no problems occur, swap the two
+		// containers; this way if something goes wrong we can go back and continue using the current profiles,
+		// avoiding unpleasant situations where no new SSL connections are possible.
+		ProfileList newprofiles;
 
-		ret = gnutls_x509_crt_init(&cert);
-		if (ret < 0)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile");
+		if (tags.first == tags.second)
 		{
-			certinfo->error = gnutls_strerror(ret);
-			return;
+			// No <sslprofile> tags found, create a profile named "gnutls" from settings in the <gnutls> block
+			const std::string defname = "gnutls";
+			ConfigTag* tag = ServerInstance->Config->ConfValue(defname);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found; using settings from the <gnutls> tag");
+
+			try
+			{
+				reference<GnuTLS::Profile> profile(GnuTLS::Profile::Create(defname, tag));
+				newprofiles.push_back(new GnuTLSIOHookProvider(this, profile));
+			}
+			catch (CoreException& ex)
+			{
+				throw ModuleException("Error while initializing the default SSL profile - " + ex.GetReason());
+			}
 		}
 
-		cert_list_size = 0;
-		cert_list = gnutls_certificate_get_peers(session->sess, &cert_list_size);
-		if (cert_list == NULL)
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			certinfo->error = "No certificate was found";
-			goto info_done_dealloc;
+			ConfigTag* tag = i->second;
+			if (tag->getString("provider") != "gnutls")
+				continue;
+
+			std::string name = tag->getString("name");
+			if (name.empty())
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring <sslprofile> tag without name at " + tag->getTagLocation());
+				continue;
+			}
+
+			reference<GnuTLS::Profile> profile;
+			try
+			{
+				profile = GnuTLS::Profile::Create(name, tag);
+			}
+			catch (CoreException& ex)
+			{
+				throw ModuleException("Error while initializing SSL profile \"" + name + "\" at " + tag->getTagLocation() + " - " + ex.GetReason());
+			}
+
+			newprofiles.push_back(new GnuTLSIOHookProvider(this, profile));
 		}
 
-		/* This is not a real world example, since we only check the first
-		 * certificate in the given chain.
-		 */
+		// New profiles are ok, begin using them
+		// Old profiles are deleted when their refcount drops to zero
+		profiles.swap(newprofiles);
+	}
 
-		ret = gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER);
-		if (ret < 0)
+ public:
+	ModuleSSLGnuTLS()
+	{
+#ifndef GNUTLS_HAS_RND
+		gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		ReadProfiles();
+		ServerInstance->GenRandom = &randhandler;
+	}
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		sslports.clear();
+
+		ConfigTag* Conf = ServerInstance->Config->ConfValue("gnutls");
+
+		if (Conf->getBool("showports", true))
 		{
-			certinfo->error = gnutls_strerror(ret);
-			goto info_done_dealloc;
-		}
+			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") != "gnutls")
+					continue;
 
-		gnutls_x509_crt_get_dn(cert, name, &name_size);
-		certinfo->dn = name;
+				const std::string& portid = port->bind_desc;
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Enabling SSL for port %s", portid.c_str());
 
-		gnutls_x509_crt_get_issuer_dn(cert, name, &name_size);
-		certinfo->issuer = name;
+				if (port->bind_tag->getString("type", "clients") == "clients" && port->bind_addr != "127.0.0.1")
+				{
+					/*
+					 * 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;
+				}
+			}
+		}
+	}
+
+	void OnModuleRehash(User* user, const std::string &param) CXX11_OVERRIDE
+	{
+		if(param != "ssl")
+			return;
 
-		if ((ret = gnutls_x509_crt_get_fingerprint(cert, hash, digest, &digest_size)) < 0)
+		try
 		{
-			certinfo->error = gnutls_strerror(ret);
+			ReadProfiles();
 		}
-		else
+		catch (ModuleException& ex)
 		{
-			certinfo->fingerprint = irc::hex(digest, digest_size);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, ex.GetReason() + " Not applying settings.");
 		}
+	}
 
-		/* Beware here we do not check for errors.
-		 */
-		if ((gnutls_x509_crt_get_expiration_time(cert) < ServerInstance->Time()) || (gnutls_x509_crt_get_activation_time(cert) > ServerInstance->Time()))
+	~ModuleSSLGnuTLS()
+	{
+		ServerInstance->GenRandom = &ServerInstance->HandleGenRandom;
+	}
+
+	void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
+	{
+		if(target_type == TYPE_USER)
 		{
-			certinfo->error = "Not activated, or expired certificate";
+			LocalUser* user = IS_LOCAL(static_cast<User*>(item));
+
+			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");
+			}
 		}
+	}
 
-info_done_dealloc:
-		gnutls_x509_crt_deinit(cert);
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides SSL support for clients", VF_VENDOR);
+	}
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		if (!sslports.empty())
+			tokens["SSL"] = sslports;
 	}
 
-	void OnEvent(Event& ev)
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
-		if (starttls.enabled)
-			capHandler.HandleEvent(ev);
+		IOHook* hook = user->eh.GetIOHook();
+		if (hook && hook->prov->creator == this)
+			static_cast<GnuTLSIOHook*>(hook)->TellCiphersAndFingerprint(user);
 	}
 };