X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_md5.cpp;h=8de70872fc234e14205ef02461bcab91d5b96691;hb=91e0af0fc4889f20d2f63426f8fe379674fc0393;hp=6e6f5006fd552b50f1866af0428d49881936ef96;hpb=5c7db14a557d7f980dfaa8c10d40c1ccc554b35d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 6e6f5006f..8de70872f 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -61,23 +61,13 @@ class MD5Provider : public HashProvider
 		} while (--words);
 	}
 
-	void MD5Init(MD5Context *ctx, unsigned int* ikey = NULL)
+	void MD5Init(MD5Context *ctx)
 	{
 		/* These are the defaults for md5 */
-		if (!ikey)
-		{
-			ctx->buf[0] = 0x67452301;
-			ctx->buf[1] = 0xefcdab89;
-			ctx->buf[2] = 0x98badcfe;
-			ctx->buf[3] = 0x10325476;
-		}
-		else
-		{
-			ctx->buf[0] = ikey[0];
-			ctx->buf[1] = ikey[1];
-			ctx->buf[2] = ikey[2];
-			ctx->buf[3] = ikey[3];
-		}
+		ctx->buf[0] = 0x67452301;
+		ctx->buf[1] = 0xefcdab89;
+		ctx->buf[2] = 0x98badcfe;
+		ctx->buf[3] = 0x10325476;
 
 		ctx->bytes[0] = 0;
 		ctx->bytes[1] = 0;
@@ -154,7 +144,7 @@ class MD5Provider : public HashProvider
 
 	void MD5Transform(word32 buf[4], word32 const in[16])
 	{
-		register word32 a, b, c, d;
+		word32 a, b, c, d;
 
 		a = buf[0];
 		b = buf[1];
@@ -236,19 +226,19 @@ class MD5Provider : public HashProvider
 	}
 
 
-	void MyMD5(void *dest, void *orig, int len, unsigned int* ikey)
+	void MyMD5(void *dest, void *orig, int len)
 	{
 		MD5Context context;
-		MD5Init(&context, ikey);
+		MD5Init(&context);
 		MD5Update(&context, (const unsigned char*)orig, len);
 		MD5Final((unsigned char*)dest, &context);
 	}
 
  public:
-	std::string GenerateRaw(const std::string& data)
+	std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE
 	{
 		char res[16];
-		MyMD5(res, (void*)data.data(), data.length(), NULL);
+		MyMD5(res, (void*)data.data(), data.length());
 		return std::string(res, 16);
 	}