X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=a1c989163ff0fea98012ac1913e3a89ce0964695;hb=fb66fb5ce3410d7e32813aed85e8ad3050584740;hp=8d786cc3f98e82b2758f3973fb147776a965833d;hpb=7b6bd133ca4472f6cb8058d5e34e3c8b2af7e99a;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 8d786cc3f..a1c989163 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #ifdef _WIN32
-# pragma comment(lib, "libgnutls-28.lib")
+# pragma comment(lib, "libgnutls-30.lib")
 #endif
 
 /* $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'") */
@@ -1150,22 +1150,10 @@ info_done_dealloc:
 		return 1;
 	}
 
-	void TellCiphersAndFingerprint(LocalUser* user)
-	{
-		if (sess)
-		{
-			std::string text = "*** You are connected using SSL cipher '";
-			GetCiphersuite(text);
-			text += '\'';
-			if (!certificate->fingerprint.empty())
-				text += " and your SSL certificate fingerprint is " + certificate->fingerprint;
-
-			user->WriteNotice(text);
-		}
-	}
-
-	void GetCiphersuite(std::string& out) const
+	void GetCiphersuite(std::string& out) const CXX11_OVERRIDE
 	{
+		if (!IsHandshakeDone())
+			return;
 		out.append(UnknownIfNULL(gnutls_protocol_get_name(gnutls_protocol_get_version(sess)))).push_back('-');
 		out.append(UnknownIfNULL(gnutls_kx_get_name(gnutls_kx_get(sess)))).push_back('-');
 		out.append(UnknownIfNULL(gnutls_cipher_get_name(gnutls_cipher_get(sess)))).push_back('-');
@@ -1344,13 +1332,6 @@ class ModuleSSLGnuTLS : public Module
 		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 
-	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
-	{
-		IOHook* hook = user->eh.GetIOHook();
-		if (hook && hook->prov->creator == this)
-			static_cast<GnuTLSIOHook*>(hook)->TellCiphersAndFingerprint(user);
-	}
-
 	ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
 	{
 		if ((user->eh.GetIOHook()) && (user->eh.GetIOHook()->prov->creator == this))