2 files changed, 19 insertions, 6 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index be642a79d..e4c3128f5 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -934,11 +934,8 @@ info_done_dealloc:
 		if (sess)
 		{
 			std::string text = "*** You are connected using SSL cipher '";
-
-			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("'");
-
+			GetCiphersuite(text);
+			text += '\'';
 			if (!certificate->fingerprint.empty())
 				text += " and your SSL certificate fingerprint is " + certificate->fingerprint;
 
@@ -946,6 +943,14 @@ info_done_dealloc:
 		}
 	}
 
+	void GetCiphersuite(std::string& out) const
+	{
+		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('-');
+		out.append(UnknownIfNULL(gnutls_mac_get_name(gnutls_mac_get(sess))));
+	}
+
 	GnuTLS::Profile* GetProfile() { return profile; }
 };
 
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index b38478d6d..c1a3bf41a 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -678,7 +678,9 @@ class OpenSSLIOHook : public SSLIOHook
 	{
 		if (sess)
 		{
-			std::string text = "*** You are connected using SSL cipher '" + std::string(SSL_get_cipher(sess)) + "'";
+			std::string text = "*** You are connected using SSL cipher '";
+			GetCiphersuite(text);
+			text += '\'';
 			const std::string& fingerprint = certificate->fingerprint;
 			if (!fingerprint.empty())
 				text += " and your SSL certificate fingerprint is " + fingerprint;
@@ -686,6 +688,12 @@ class OpenSSLIOHook : public SSLIOHook
 			user->WriteNotice(text);
 		}
 	}
+
+	void GetCiphersuite(std::string& out) const
+	{
+		out.append(SSL_get_version(sess)).push_back('-');
+		out.append(SSL_get_cipher(sess));
+	}
 };
 
 static void StaticSSLInfoCallback(const SSL* ssl, int where, int rc)