Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / modules / m_ripemd160.cpp

diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 464012d12abd8f3fa4f97a9d7d977f1132178e58..04c27e83d181bfe38003000da054cbef7eefbbbe 100644 (file)
--- 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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
@@ -48,7 +57,6 @@
 
 
 /* $ModDesc: Allows for RIPEMD-160 encrypted oper passwords */
-/* $ModDep: m_hash.h */
 
 /* macro definitions */
 
@@ -56,7 +64,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "m_hash.h"
+#include "hash.h"
 
 #define RMDsize 160
 
@@ -149,8 +157,11 @@ 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)
        {
@@ -407,8 +418,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,65 +446,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", 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;
+               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);
        }
 
 };