summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-01-27 16:55:28 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-01-27 16:55:28 +0100
commitbe692fc3af2dde60c4e6a665fe21092875b3ae5c (patch)
treeeb05443e056051804e7bf7384b5794eba5ad0a51 /src/modules
parent46aa62b2d3deaa0633cd93eb6946146329fd14f2 (diff)
m_ssl_gnutls, m_ssl_openssl Prepend TLS protocol version to ciphersuite string
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp1
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 967cb2a8e..e4c3128f5 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -945,6 +945,7 @@ 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))));
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 2b4562544..c1a3bf41a 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -691,6 +691,7 @@ class OpenSSLIOHook : public SSLIOHook
void GetCiphersuite(std::string& out) const
{
+ out.append(SSL_get_version(sess)).push_back('-');
out.append(SSL_get_cipher(sess));
}
};