summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-01-27 16:52:21 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-01-27 16:52:21 +0100
commit46aa62b2d3deaa0633cd93eb6946146329fd14f2 (patch)
treea3c52c3ce39240a9c286cd9b2e455a3b2824b77c /src/modules
parent045747290ba1088daf7f70d5d36d0eb4c8ba2b4e (diff)
m_ssl_gnutls, m_ssl_openssl Extract code that builds a ciphersuite string into a method
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp14
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp9
2 files changed, 17 insertions, 6 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index be642a79d..967cb2a8e 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,13 @@ info_done_dealloc:
}
}
+ void GetCiphersuite(std::string& out) const
+ {
+ 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..2b4562544 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,11 @@ class OpenSSLIOHook : public SSLIOHook
user->WriteNotice(text);
}
}
+
+ void GetCiphersuite(std::string& out) const
+ {
+ out.append(SSL_get_cipher(sess));
+ }
};
static void StaticSSLInfoCallback(const SSL* ssl, int where, int rc)