diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-04-30 16:54:37 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-04-30 16:54:37 +0200 |
| commit | fb66fb5ce3410d7e32813aed85e8ad3050584740 (patch) | |
| tree | a36d649156325dbd76f314eaac6c14f724d56b04 /src/modules/extra/m_ssl_gnutls.cpp | |
| parent | 6cfe4011ec0e90718d7d5a449a5330b8e9a18ec3 (diff) | |
| parent | 1e4b53a286e428e78bd5650815048970d345f7e3 (diff) | |
Merge branch 'master+sslconnmsg'
Diffstat (limited to 'src/modules/extra/m_ssl_gnutls.cpp')
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 6a653dded..a1c989163 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -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)) |