X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ripemd160.cpp;h=44e16c86fe89a88a9799a22b0673864b15bef31d;hb=e071bd88391e00e4d3b0104ada985e08a9eb3210;hp=464012d12abd8f3fa4f97a9d7d977f1132178e58;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 464012d12..44e16c86f 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -149,7 +149,7 @@ typedef		uint32_t		dword;
    }
 
 
-class ModuleRIPEMD160 : public Module
+class RIProv : public HashProvider
 {
 
 	void MDinit(dword *MDbuf, unsigned int* key)
@@ -407,7 +407,7 @@ class ModuleRIPEMD160 : public Module
 	byte *RMD(byte *message, dword length, unsigned int* key)
 	{
 		ServerInstance->Logs->Log("m_ripemd160", DEBUG, "RMD: '%s' length=%u", (const char*)message, length);
-		dword         MDbuf[RMDsize/32];   /* contains (A, B, C, D(, E))   */
+		dword         MDbuf[RMDsize/32];   /* contains (A, B, C, D(E))   */
 		static byte   hashcode[RMDsize/8]; /* for final hash-value         */
 		dword         X[16];               /* current 16-word chunk        */
 		unsigned int  i;                   /* counter                      */
@@ -436,65 +436,33 @@ class ModuleRIPEMD160 : public Module
 
 		return (byte *)hashcode;
 	}
-
-	unsigned int* currkey;
-	const char* chars;
-
- public:
-
-	ModuleRIPEMD160(InspIRCd* Me) : Module(Me), currkey(NULL), chars("0123456789abcdef")
+public:
+	std::string sum(const std::string& data)
 	{
-		ServerInstance->Modules->PublishInterface("HashRequest", this);
-		Implementation eventlist[] = { I_OnRequest };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		char* rv = (char*)RMD((byte*)data.data(), data.length(), NULL);
+		return std::string(rv, RMDsize / 8);
 	}
 
-	virtual ~ModuleRIPEMD160()
+	std::string sumIV(unsigned int* IV, const char* HexMap, const std::string &sdata)
 	{
-		ServerInstance->Modules->UnpublishInterface("HashRequest", this);
+		return "";
 	}
 
+	RIProv(Module* m) : HashProvider(m, "hash/ripemd160") {}
+};
 
-	virtual const char* OnRequest(Request* request)
+class ModuleRIPEMD160 : public Module
+{
+ public:
+	RIProv mr;
+	ModuleRIPEMD160() : mr(this)
 	{
-		HashRequest* SHA = (HashRequest*)request;
-		if (strcmp("KEY", request->GetId()) == 0)
-		{
-			this->currkey = (unsigned int*)SHA->GetKeyData();
-		}
-		else if (strcmp("HEX", request->GetId()) == 0)
-		{
-			this->chars = SHA->GetOutputs();
-		}
-		else if (strcmp("SUM", request->GetId()) == 0)
-		{
-			static char output[MAXBUF];
-			unsigned char* data = (unsigned char*)RMD((byte *)SHA->GetHashData().data(),SHA->GetHashData().length(), currkey);
-			int j = 0;
-			for (int i = 0; i < RMDsize / 8; i++)
-			{
-				output[j++] = chars[data[i] / 16];
-				output[j++] = chars[data[i] % 16];
-				ServerInstance->Logs->Log("m_ripemd160", DEBUG, "Hash: %02x", data[i]);
-			}
-			output[j] = '\0';
-			return output;
-		}
-		else if (strcmp("NAME", request->GetId()) == 0)
-		{
-			return "ripemd160";
-		}
-		else if (strcmp("RESET", request->GetId()) == 0)
-		{
-			this->chars = "0123456789abcdef";
-			this->currkey = NULL;
-		}
-		return NULL;
+		ServerInstance->Modules->AddService(mr);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides RIPEMD-160 hashing", VF_VENDOR);
 	}
 
 };