X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=70727b301147ffe036e45e4e3b8dd5ca7d204a40;hb=8e8445d1c0744130f232d3c6f56d5fe1079773ad;hp=22937abf5bdab9dc27144b63d2047fb92af07a5c;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 22937abf5..70727b301 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -134,12 +134,12 @@ uint32_t sha256_k[64] =
 
 class ModuleSHA256 : public Module
 {
-	void SHA256Init(SHA256Context *ctx, const unsigned int* key)
+	void SHA256Init(SHA256Context *ctx, const unsigned int* ikey)
 	{
-		if (key)
+		if (ikey)
 		{
 			for (int i = 0; i < 8; i++)
-				ctx->h[i] = key[i];
+				ctx->h[i] = ikey[i];
 		}
 		else
 		{
@@ -236,12 +236,12 @@ class ModuleSHA256 : public Module
 			UNPACK32(ctx->h[i], &digest[i << 2]);
 	}
 	
-	void SHA256(const char *src, char *dest, int len, const char* hxc, const unsigned int* key = NULL)
+	void SHA256(const char *src, char *dest, int len, const char* hxc, const unsigned int* ikey = NULL)
 	{
 		// Generate the hash
 		unsigned char bytehash[SHA256_DIGEST_SIZE];
 		SHA256Context ctx;
-		SHA256Init(&ctx, key);
+		SHA256Init(&ctx, ikey);
 		SHA256Update(&ctx, (unsigned char *)src, (unsigned int)len);
 		SHA256Final(&ctx, bytehash);
 		// Convert it to hex
@@ -271,7 +271,7 @@ class ModuleSHA256 : public Module
 	}
 
 
-	virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		HashRequest* SHA = (HashRequest*)request;
 		if (strcmp("KEY", request->GetId()) == 0)
@@ -302,7 +302,7 @@ class ModuleSHA256 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version(1, 2, 0, 1, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };