Replace hardcoded mode letters, part 3

[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 ec39fb7467ab7d479e6191b0ad79fc42b9ad8308..0b96f9b26fcf88ee0b66ae2561bd2b0c459dfc03 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -19,18 +19,12 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
 #include "modules/hash.h"
 #include "modules/ssl.h"
-#include "socketengine.h"
 
 #include "main.h"
-#include "utils.h"
-#include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
-#include "resolvers.h"
 
 const std::string& TreeSocket::GetOurChallenge()
 {
@@ -65,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("m_spanningtree", LOG_DEFAULT, "Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
 
        return password;
 }
@@ -75,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);
@@ -100,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 */