m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / hmac.cpp

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index b7c952797b3318146418a8070a257ae96df6b507..d79f13567b925860325e65401787da43066dc43c 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -59,7 +59,7 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
                return "AUTH:" + BinToBase64(sha256->hmac(password, challenge));
 
        if (!challenge.empty() && !sha256)
-               ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
 
        return password;
 }
@@ -69,16 +69,6 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
        capab->auth_fingerprint = !link.Fingerprint.empty();
        capab->auth_challenge = !capab->ourchallenge.empty() && !capab->theirchallenge.empty();
 
-       std::string fp;
-       if (GetIOHook())
-       {
-               SocketCertificateRequest req(this, Utils->Creator);
-               if (req.cert)
-               {
-                       fp = req.cert->GetFingerprint();
-               }
-       }
-
        if (capab->auth_challenge)
        {
                std::string our_hmac = MakePass(link.RecvPass, capab->ourchallenge);
@@ -94,6 +84,7 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
                        return false;
        }
 
+       std::string fp = SSLClientCert::GetFingerprint(this);
        if (capab->auth_fingerprint)
        {
                /* Require fingerprint to exist and match */