m_spanningtree Assign an id to new Memberships

[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..895323a02a475ada3d4da7b0da7fa591c7d2f6dc 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()
 {
@@ -57,15 +51,15 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
        /* This is a simple (maybe a bit hacky?) HMAC algorithm, thanks to jilles for
         * suggesting the use of HMAC to secure the password against various attacks.
         *
-        * Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
+        * Note: If an sha256 provider is not available, we MUST fall back to plaintext with no
         *       HMAC challenge/response.
         */
        HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
-       if (Utils->ChallengeResponse && sha256 && !challenge.empty())
+       if (sha256 && !challenge.empty())
                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 an SHA256 provider (e.g. 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 */