Update Event and Request APIs

[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 cc1b33f238b016bcadbf85a6d181af8c7c1ba9a4..ad35a585f4a1294ffd008a165f7032a18f155301 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -14,8 +14,8 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "../m_hash.h"
+#include "../ssl.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -24,7 +24,6 @@
 #include "link.h"
 #include "treesocket.h"
 #include "resolvers.h"
-#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */
 
@@ -78,12 +77,10 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
                }
 
                hmac2 += challenge;
-               HashResetRequest(Utils->Creator, sha256).Send();
-               hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
-
-               HashResetRequest(Utils->Creator, sha256).Send();
+               hmac2 = HashRequest(Utils->Creator, sha256, hmac2).result;
+               
                std::string hmac = hmac1 + hmac2;
-               hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
+               hmac = HashRequest(Utils->Creator, sha256, hmac).result;
 
                return "HMAC-SHA256:"+ hmac;
        }
@@ -129,10 +126,9 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
        this->auth_challenge = !ourchallenge.empty() && !theirchallenge.empty();
 
        std::string fp;
-       if (GetHook())
+       if (GetIOHook())
        {
-               BufferedSocketCertificateRequest req(this, Utils->Creator, GetHook());
-               req.Send();
+               SSLCertificateRequest req(this, Utils->Creator);
                if (req.cert)
                {
                        fp = req.cert->GetFingerprint();