Send HALFOP= line in CAPAB CAPABILITIES for 1201 compat (anope relies on this)

[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 98bc40192fdbd074786263bf278dedb75dff4e9d..c126db66161b600a4f47eb1b4403456032ccaf67 100644 (file)
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 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.
@@ -48,7 +48,6 @@
 
 
 /* $ModDesc: Allows for RIPEMD-160 encrypted oper passwords */
-/* $ModDep: m_hash.h */
 
 /* macro definitions */
 
@@ -56,7 +55,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "m_hash.h"
+#include "hash.h"
 
 #define RMDsize 160
 
@@ -149,7 +148,7 @@ typedef             uint32_t                dword;
    }
 
 
-class ModuleRIPEMD160 : public Module
+class RIProv : public HashProvider
 {
 
        void MDinit(dword *MDbuf, unsigned int* key)
@@ -407,7 +406,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 +435,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);
        }
 
 };