X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ripemd160.cpp;h=8d3131bc02a9639083538284a88d43766ec28243;hb=f9fd78c01623514a060c607534fc52cb73140200;hp=87ca21ada432de785abe17a3413db684f94ad061;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 87ca21ada..8d3131bc0 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /*
  *
  *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
@@ -47,26 +56,15 @@
  */
 
 
-/* $ModDesc: Allows for RIPEMD-160 encrypted oper passwords */
-/* $ModDep: m_hash.h */
-
 /* macro definitions */
 
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
-#include "m_hash.h"
+#include "modules/hash.h"
 
 #define RMDsize 160
 
-#ifndef HAS_STDINT
-typedef		unsigned char		byte;
-typedef		unsigned int		dword;
-#else
-typedef		uint8_t			byte;
-typedef		uint32_t		dword;
-#endif
+typedef uint8_t byte;
+typedef uint32_t dword;
 
 /* collect four bytes into one word: */
 #define BYTES_TO_DWORD(strptr)                    \
@@ -149,14 +147,16 @@ typedef		uint32_t		dword;
    }
 
 
-class ModuleRIPEMD160 : public Module
+class RIProv : public HashProvider
 {
+	/** Final hash value
+	 */
+	byte hashcode[RMDsize/8];
 
 	void MDinit(dword *MDbuf, unsigned int* key)
 	{
 		if (key)
 		{
-			ServerInstance->Logs->Log("m_ripemd160.so", DEBUG, "initialize with custom mdbuf");
 			MDbuf[0] = key[0];
 			MDbuf[1] = key[1];
 			MDbuf[2] = key[2];
@@ -165,7 +165,6 @@ class ModuleRIPEMD160 : public Module
 		}
 		else
 		{
-			ServerInstance->Logs->Log("m_ripemd160.so", DEBUG, "initialize with default mdbuf");
 			MDbuf[0] = 0x67452301UL;
 			MDbuf[1] = 0xefcdab89UL;
 			MDbuf[2] = 0x98badcfeUL;
@@ -406,9 +405,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))   */
-		static byte   hashcode[RMDsize/8]; /* for final hash-value         */
+		dword         MDbuf[RMDsize/32];   /* contains (A, B, C, D(E))   */
 		dword         X[16];               /* current 16-word chunk        */
 		unsigned int  i;                   /* counter                      */
 		dword         nbytes;              /* # of bytes not yet processed */
@@ -436,68 +433,28 @@ class ModuleRIPEMD160 : public Module
 
 		return (byte *)hashcode;
 	}
-
-	unsigned int* currkey;
-	const char* chars;
-
- public:
-
-	ModuleRIPEMD160(InspIRCd* Me) : Module(Me), currkey(NULL), chars("0123456789abcdef")
-	{
-		ServerInstance->Modules->PublishInterface("HashRequest", this);
-		Implementation eventlist[] = { I_OnRequest };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
-	}
-
-	virtual ~ModuleRIPEMD160()
+public:
+	std::string GenerateRaw(const std::string& data)
 	{
-		ServerInstance->Modules->UnpublishInterface("HashRequest", this);
+		char* rv = (char*)RMD((byte*)data.data(), data.length(), NULL);
+		return std::string(rv, RMDsize / 8);
 	}
 
+	RIProv(Module* m) : HashProvider(m, "ripemd160", 20, 64) {}
+};
 
-	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;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows for RIPEMD-160 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides RIPEMD-160 hashing", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleRIPEMD160)
-