X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_md5.cpp;h=aea9f2806f5f9ee761bf588cf16e9ab84d06457d;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=3b7df836994ce1d24219d95184745cd9206919d7;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 3b7df8369..aea9f2806 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,9 +18,6 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "m_hash.h"
 
 /* The four core functions - F1 is optimized somewhat */
@@ -55,7 +52,7 @@ class ModuleMD5 : public Module
 	void byteSwap(word32 *buf, unsigned words)
 	{
 		byte *p = (byte *)buf;
-	
+
 		do
 		{
 			*buf++ = (word32)((unsigned)p[3] << 8 | p[2]) << 16 |
@@ -64,10 +61,10 @@ class ModuleMD5 : public Module
 		} while (--words);
 	}
 
-	void MD5Init(MD5Context *ctx, unsigned int* key = NULL)
+	void MD5Init(MD5Context *ctx, unsigned int* ikey = NULL)
 	{
 		/* These are the defaults for md5 */
-		if (!key)
+		if (!ikey)
 		{
 			ctx->buf[0] = 0x67452301;
 			ctx->buf[1] = 0xefcdab89;
@@ -76,12 +73,12 @@ class ModuleMD5 : public Module
 		}
 		else
 		{
-			ctx->buf[0] = key[0];
-			ctx->buf[1] = key[1];
-			ctx->buf[2] = key[2];
-			ctx->buf[3] = key[3];
+			ctx->buf[0] = ikey[0];
+			ctx->buf[1] = ikey[1];
+			ctx->buf[2] = ikey[2];
+			ctx->buf[3] = ikey[3];
 		}
-	
+
 		ctx->bytes[0] = 0;
 		ctx->bytes[1] = 0;
 	}
@@ -89,13 +86,13 @@ class ModuleMD5 : public Module
 	void MD5Update(MD5Context *ctx, byte const *buf, int len)
 	{
 		word32 t;
-	
+
 		/* Update byte count */
-	
+
 		t = ctx->bytes[0];
 		if ((ctx->bytes[0] = t + len) < t)
 			ctx->bytes[1]++;	/* Carry from low to high */
-	
+
 		t = 64 - (t & 0x3f);	/* Space available in ctx->in (at least 1) */
 		if ((unsigned)t > (unsigned)len)
 		{
@@ -108,7 +105,7 @@ class ModuleMD5 : public Module
 		MD5Transform(ctx->buf, ctx->in);
 		buf += (unsigned)t;
 		len -= (unsigned)t;
-	
+
 		/* Process data in 64-byte chunks */
 		while (len >= 64)
 		{
@@ -118,22 +115,22 @@ class ModuleMD5 : public Module
 			buf += 64;
 			len -= 64;
 		}
-	
+
 		/* Handle any remaining bytes of data. */
 		memcpy(ctx->in, buf, len);
 	}
-	
+
 	void MD5Final(byte digest[16], MD5Context *ctx)
 	{
 		int count = (int)(ctx->bytes[0] & 0x3f); /* Bytes in ctx->in */
 		byte *p = (byte *)ctx->in + count;	/* First unused byte */
-	
+
 		/* Set the first char of padding to 0x80.  There is always room. */
 		*p++ = 0x80;
-	
+
 		/* Bytes of padding needed to make 56 bytes (-8..55) */
 		count = 56 - 1 - count;
-	
+
 		if (count < 0)
 		{	/* Padding forces an extra block */
 			memset(p, 0, count+8);
@@ -144,26 +141,26 @@ class ModuleMD5 : public Module
 		}
 		memset(p, 0, count+8);
 		byteSwap(ctx->in, 14);
-	
+
 		/* Append length in bits and transform */
 		ctx->in[14] = ctx->bytes[0] << 3;
 		ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
 		MD5Transform(ctx->buf, ctx->in);
-	
+
 		byteSwap(ctx->buf, 4);
 		memcpy(digest, ctx->buf, 16);
 		memset(ctx, 0, sizeof(ctx));
 	}
-	
+
 	void MD5Transform(word32 buf[4], word32 const in[16])
 	{
 		register word32 a, b, c, d;
-	
+
 		a = buf[0];
 		b = buf[1];
 		c = buf[2];
 		d = buf[3];
-	
+
 		MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
 		MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
 		MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
@@ -180,7 +177,7 @@ class ModuleMD5 : public Module
 		MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
 		MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
 		MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-	
+
 		MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
 		MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
 		MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
@@ -197,7 +194,7 @@ class ModuleMD5 : public Module
 		MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
 		MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
 		MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-	
+
 		MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
 		MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
 		MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
@@ -214,7 +211,7 @@ class ModuleMD5 : public Module
 		MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
 		MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
 		MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-	
+
 		MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
 		MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
 		MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
@@ -231,28 +228,28 @@ class ModuleMD5 : public Module
 		MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
 		MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
 		MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-	
+
 		buf[0] += a;
 		buf[1] += b;
 		buf[2] += c;
 		buf[3] += d;
 	}
-	
-	
-	void MyMD5(void *dest, void *orig, int len, unsigned int* key)
+
+
+	void MyMD5(void *dest, void *orig, int len, unsigned int* ikey)
 	{
 		MD5Context context;
-		MD5Init(&context, key);
+		MD5Init(&context, ikey);
 		MD5Update(&context, (const unsigned char*)orig, len);
 		MD5Final((unsigned char*)dest, &context);
 	}
-	
-	
-	void GenHash(const char* src, char* dest, const char* xtab, unsigned int* key)
+
+
+	void GenHash(const char* src, char* dest, const char* xtab, unsigned int* ikey, size_t srclen)
 	{
 		unsigned char bytes[16];
 
-		MyMD5((char*)bytes, (void*)src, strlen(src), key);
+		MyMD5((char*)bytes, (void*)src, srclen, ikey);
 
 		for (int i = 0; i < 16; i++)
 		{
@@ -270,20 +267,18 @@ class ModuleMD5 : public Module
 	ModuleMD5(InspIRCd* Me)
 		: Module(Me), key(NULL), chars(NULL)
 	{
-		ServerInstance->PublishInterface("HashRequest", this);
+		ServerInstance->Modules->PublishInterface("HashRequest", this);
+		Implementation eventlist[] = { I_OnRequest };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
-	
+
 	virtual ~ModuleMD5()
 	{
-		ServerInstance->UnpublishInterface("HashRequest", this);
+		ServerInstance->Modules->UnpublishInterface("HashRequest", this);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRequest] = 1;
-	}
-	
-	virtual char* OnRequest(Request* request)
+
+	virtual const char* OnRequest(Request* request)
 	{
 		HashRequest* MD5 = (HashRequest*)request;
 
@@ -298,7 +293,7 @@ class ModuleMD5 : public Module
 		else if (strcmp("SUM", request->GetId()) == 0)
 		{
 			static char data[MAXBUF];
-			GenHash((const char*)MD5->GetHashData(), data, chars ? chars : "0123456789abcdef", key);
+			GenHash(MD5->GetHashData().data(), data, chars ? chars : "0123456789abcdef", key, MD5->GetHashData().length());
 			return data;
 		}
 		else if (strcmp("NAME", request->GetId()) == 0)
@@ -315,7 +310,7 @@ class ModuleMD5 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version("$Id$",VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 };