X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fhmac.cpp;h=00f908dc878946bfe3ea358663ca15fda1b3cfef;hb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;hp=62cf5c114177445f05ad9e94d71939c224aaf446;hpb=192fa7d3138ccb5929dc9af8de3395d6ea25619c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 62cf5c114..00f908dc8 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -12,12 +12,10 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "../m_hash.h"
+#include "../ssl.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -26,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 */
 
@@ -68,7 +65,8 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 		 * Note that we are encoding the hex hash, not the binary
 		 * output of the hash which is slightly different to standard.
 		 *
-		 * Don't ask me why its always 0x5c and 0x36... it just is.
+		 * 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;
 
@@ -79,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).hex();
+		
 		std::string hmac = hmac1 + hmac2;
-		hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
+		hmac = HashRequest(Utils->Creator, sha256, hmac).hex();
 
 		return "HMAC-SHA256:"+ hmac;
 	}
@@ -98,21 +94,17 @@ std::string TreeSocket::RandString(unsigned int ilength)
 {
 	char* randombuf = new char[ilength+1];
 	std::string out;
-#ifdef WINDOWS
-	int f = -1;
-#else
+#ifndef WINDOWS
 	int f = open("/dev/urandom", O_RDONLY, 0);
-#endif
 
 	if (f >= 0)
 	{
-#ifndef WINDOWS
-		if (read(f, randombuf, ilength) < 1)
-			ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "There are crack smoking monkeys in your kernel (in other words, nonblocking /dev/urandom blocked.)");
+		if (read(f, randombuf, ilength) < (int)ilength)
+			ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Entropy source has gone predictable (did not return enough data)");
 		close(f);
-#endif
 	}
 	else
+#endif
 	{
 		for (unsigned int i = 0; i < ilength; i++)
 			randombuf[i] = rand();
@@ -120,8 +112,8 @@ std::string TreeSocket::RandString(unsigned int ilength)
 
 	for (unsigned int i = 0; i < ilength; i++)
 	{
-		char randchar = static_cast<char>((randombuf[i] & 0x7F) | 0x21);
-		out += (randchar == '=' ? '_' : randchar);
+		char randchar = static_cast<char>(0x3F + (randombuf[i] & 0x3F));
+		out += randchar;
 	}
 
 	delete[] randombuf;
@@ -133,18 +125,26 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
 	this->auth_fingerprint = !link.Fingerprint.empty();
 	this->auth_challenge = !ourchallenge.empty() && !theirchallenge.empty();
 
-	const char* fp = NULL;
-	if (GetHook())
-		fp = BufferedSocketFingerprintRequest(this, Utils->Creator, GetHook()).Send();
-
-	if (fp)
-		ServerInstance->Logs->Log("m_spanningtree", DEFAULT, std::string("Server SSL fingerprint ") + fp);
+	std::string fp;
+	if (GetIOHook())
+	{
+		SSLCertificateRequest req(this, Utils->Creator);
+		if (req.cert)
+		{
+			fp = req.cert->GetFingerprint();
+			ServerInstance->Logs->Log("m_spanningtree", DEFAULT, std::string("Server SSL fingerprint ") + fp);
+		}
+	}
 
 	if (auth_fingerprint)
 	{
 		/* Require fingerprint to exist and match */
-		if (!fp || link.Fingerprint != std::string(fp))
+		if (link.Fingerprint != fp)
+		{
+			ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL fingerprint on link %s: need '%s' got '%s'", 
+				link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
 			return false;
+		}
 	}
 
 	if (auth_challenge)