X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=99200c920080d6733acd79606e16954e36eeb60e;hb=be609949e3ec2543d6cb16d23240870028732f36;hp=b80e3d5bbb508c6cb76daa0e1ab751dd2806428b;hpb=bfaf7e3b27981a5144faba6d17c6e29fac735dbb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index b80e3d5bb..99200c920 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -159,7 +159,7 @@ class ModuleSHA256 : public Module
 		{
 			int j;
 			sub_block = message + ((i - 1) << 6);
-	
+
 			for (j = 0; j < 16; j++)
 				PACK32(&sub_block[j << 2], &w[j]);
 			for (j = 16; j < 64; j++)
@@ -183,7 +183,7 @@ class ModuleSHA256 : public Module
 				ctx->h[j] += wv[j];
 		}
 	}
-	
+
 	void SHA256Update(SHA256Context *ctx, unsigned char *message, unsigned int len)
 	{
 		/*
@@ -205,7 +205,7 @@ class ModuleSHA256 : public Module
 		unsigned int tmp_len = SHA256_BLOCK_SIZE - ctx->len;
 		unsigned int rem_len = len < tmp_len ? len : tmp_len;
 
-		
+
 		memcpy(&ctx->block[ctx->len], message, rem_len);
 		if (ctx->len + len < SHA256_BLOCK_SIZE)
 		{
@@ -222,7 +222,7 @@ class ModuleSHA256 : public Module
 		ctx->len = rem_len;
 		ctx->tot_len += (block_nb + 1) << 6;
 	}
-	
+
 	void SHA256Final(SHA256Context *ctx, unsigned char *digest)
 	{
 		unsigned int block_nb = (1 + ((SHA256_BLOCK_SIZE - 9) < (ctx->len % SHA256_BLOCK_SIZE)));
@@ -235,7 +235,7 @@ class ModuleSHA256 : public Module
 		for (int i = 0 ; i < 8; i++)
 			UNPACK32(ctx->h[i], &digest[i << 2]);
 	}
-	
+
 	void SHA256(const char *src, char *dest, int len, const char* hxc, const unsigned int* ikey = NULL)
 	{
 		// Generate the hash
@@ -285,7 +285,7 @@ class ModuleSHA256 : public Module
 		else if (strcmp("SUM", request->GetId()) == 0)
 		{
 			static char data[MAXBUF];
-			SHA256((const char*)SHA->GetHashData(), data, strlen(SHA->GetHashData()), chars ? chars : "0123456789abcdef", key);
+			SHA256((const char*)SHA->GetHashData().data(), data, SHA->GetHashData().length(), chars ? chars : "0123456789abcdef", key);
 			return data;
 		}
 		else if (strcmp("NAME", 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("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };