X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fhmac.cpp;h=b7c952797b3318146418a8070a257ae96df6b507;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=d990e1fbf4dfa1c680fbbc9640660e7896ccdfd2;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index d990e1fbf..b7c952797 100644
--- 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 "../hash.h"
-#include "../ssl.h"
-#include "socketengine.h"
+#include "modules/hash.h"
+#include "modules/ssl.h"
 
 #include "main.h"
-#include "utils.h"
-#include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
-#include "resolvers.h"
 
 const std::string& TreeSocket::GetOurChallenge()
 {
@@ -62,39 +56,10 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 	 */
 	HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
 	if (Utils->ChallengeResponse && sha256 && !challenge.empty())
-	{
-		if (proto_version < 1202)
-		{
-			/* This is how HMAC is done in InspIRCd 1.2:
-			 *
-			 * sha256( (pass xor 0x5c) + sha256((pass xor 0x36) + m) )
-			 *
-			 * 5c and 36 were chosen as part of the HMAC standard, because they
-			 * flip the bits in a way likely to strengthen the function.
-			 */
-			std::string hmac1, hmac2;
-
-			for (size_t n = 0; n < password.length(); n++)
-			{
-				hmac1.push_back(static_cast<char>(password[n] ^ 0x5C));
-				hmac2.push_back(static_cast<char>(password[n] ^ 0x36));
-			}
-
-			hmac2.append(challenge);
-			hmac2 = sha256->hexsum(hmac2);
-		
-			std::string hmac = hmac1 + hmac2;
-			hmac = sha256->hexsum(hmac);
+		return "AUTH:" + BinToBase64(sha256->hmac(password, challenge));
 
-			return "HMAC-SHA256:"+ hmac;
-		}
-		else
-		{
-			return "AUTH:" + BinToBase64(sha256->hmac(password, challenge));
-		}
-	}
-	else if (!challenge.empty() && !sha256)
-		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
+	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!");
 
 	return password;
 }