X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=26c70346edd168b01fb30e52aedd141c351e488d;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=f446633b63c7844d94b013bf8806c9a230ec80fa;hpb=9591819654a80241874e9ce85c40e162d8c5ccbb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index f446633b6..26c70346e 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -51,18 +48,16 @@
  */
 
 /* $ModDesc: Allows for SHA-256 encrypted oper passwords */
-/* $ModDep: m_sha256.h */
+/* $ModDep: m_hash.h */
 
-#include "inspircd_config.h"
+#include "inspircd.h"
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-
-#include "m_sha256.h"
+#include "m_hash.h"
 
 #ifndef HAS_STDINT
 typedef unsigned int uint32_t;
@@ -142,7 +137,7 @@ uint32_t sha256_k[64] =
 
 class ModuleSHA256 : public Module
 {
-	void SHA256Init(struct SHA256Context *ctx, const unsigned int* key)
+	void SHA256Init(SHA256Context *ctx, const unsigned int* key)
 	{
 		if (key)
 		{
@@ -158,7 +153,7 @@ class ModuleSHA256 : public Module
 		ctx->tot_len = 0;
 	}
 
-	void SHA256Transform(struct SHA256Context *ctx, unsigned char *message, unsigned int block_nb)
+	void SHA256Transform(SHA256Context *ctx, unsigned char *message, unsigned int block_nb)
 	{
 		uint32_t w[64];
 		uint32_t wv[8];
@@ -192,7 +187,7 @@ class ModuleSHA256 : public Module
 		}
 	}
 	
-	void SHA256Update(struct SHA256Context *ctx, unsigned char *message, unsigned int len)
+	void SHA256Update(SHA256Context *ctx, unsigned char *message, unsigned int len)
 	{
 		unsigned int rem_len = SHA256_BLOCK_SIZE - ctx->len;
 		memcpy(&ctx->block[ctx->len], message, rem_len);
@@ -212,7 +207,7 @@ class ModuleSHA256 : public Module
 		ctx->tot_len += (block_nb + 1) << 6;
 	}
 	
-	void SHA256Final(struct SHA256Context *ctx, unsigned char *digest)
+	void SHA256Final(SHA256Context *ctx, unsigned char *digest)
 	{
 		unsigned int block_nb = (1 + ((SHA256_BLOCK_SIZE - 9) < (ctx->len % SHA256_BLOCK_SIZE)));
 		unsigned int len_b = (ctx->tot_len + ctx->len) << 3;
@@ -229,7 +224,7 @@ class ModuleSHA256 : public Module
 	{
 		// Generate the hash
 		unsigned char bytehash[SHA256_DIGEST_SIZE];
-		struct SHA256Context ctx;
+		SHA256Context ctx;
 		SHA256Init(&ctx, key);
 		SHA256Update(&ctx, (unsigned char *)src, (unsigned int)len);
 		SHA256Final(&ctx, bytehash);
@@ -247,12 +242,14 @@ class ModuleSHA256 : public Module
 
  public:
 
-	ModuleSHA256(InspIRCd* Me) : Module::Module(Me), key(NULL), chars(NULL)
+	ModuleSHA256(InspIRCd* Me) : Module(Me), key(NULL), chars(NULL)
 	{
+		ServerInstance->PublishInterface("HashRequest", this);
 	}
 
 	virtual ~ModuleSHA256()
 	{
+		ServerInstance->UnpublishInterface("HashRequest", this);
 	}
 
 	void Implements(char *List)
@@ -262,22 +259,26 @@ class ModuleSHA256 : public Module
 
 	virtual char* OnRequest(Request* request)
 	{
-		SHA256Request* SHA = (SHA256Request*)request;
-		if (strcmp("SHA256_KEY", request->GetId()) == 0)
+		HashRequest* SHA = (HashRequest*)request;
+		if (strcmp("KEY", request->GetId()) == 0)
 		{
 			this->key = (unsigned int*)SHA->GetKeyData();
 		}
-		else if (strcmp("SHA256_HEX", request->GetId()) == 0)
+		else if (strcmp("HEX", request->GetId()) == 0)
 		{
 			this->chars = (char*)SHA->GetOutputs();
 		}
-		else if (strcmp("SHA256_SUM", request->GetId()) == 0)
+		else if (strcmp("SUM", request->GetId()) == 0)
 		{
 			static char data[MAXBUF];
 			SHA256((const char*)SHA->GetHashData(), data, strlen(SHA->GetHashData()), chars ? chars : "0123456789abcdef", key);
 			return data;
 		}
-		else if (strcmp("SHA256_RESET", request->GetId()) == 0)
+		else if (strcmp("NAME", request->GetId()) == 0)
+		{
+			return "sha256";
+		}
+		else if (strcmp("RESET", request->GetId()) == 0)
 		{
 			this->chars = NULL;
 			this->key = NULL;
@@ -287,7 +288,7 @@ class ModuleSHA256 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 1, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };
 
@@ -310,7 +311,7 @@ public:
 
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleSHA256Factory;
 }