Merge insp20

[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 ae8d15a30549aa3262acc1a6cd4c8714a174dd3d..8d3131bc02a9639083538284a88d43766ec28243 100644 (file)
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -149,12 +149,14 @@ typedef uint32_t dword;
 
 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", LOG_DEBUG, "initialize with custom mdbuf");
                        MDbuf[0] = key[0];
                        MDbuf[1] = key[1];
                        MDbuf[2] = key[2];
@@ -163,7 +165,6 @@ class RIProv : public HashProvider
                }
                else
                {
-                       ServerInstance->Logs->Log("m_ripemd160.so", LOG_DEBUG, "initialize with default mdbuf");
                        MDbuf[0] = 0x67452301UL;
                        MDbuf[1] = 0xefcdab89UL;
                        MDbuf[2] = 0x98badcfeUL;
@@ -404,9 +405,7 @@ class RIProv : public HashProvider
 
        byte *RMD(byte *message, dword length, unsigned int* key)
        {
-               ServerInstance->Logs->Log("m_ripemd160", LOG_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         X[16];               /* current 16-word chunk        */
                unsigned int  i;                   /* counter                      */
                dword         nbytes;              /* # of bytes not yet processed */
@@ -435,13 +434,13 @@ class RIProv : public HashProvider
                return (byte *)hashcode;
        }
 public:
-       std::string sum(const std::string& data)
+       std::string GenerateRaw(const std::string& data)
        {
                char* rv = (char*)RMD((byte*)data.data(), data.length(), NULL);
                return std::string(rv, RMDsize / 8);
        }
 
-       RIProv(Module* m) : HashProvider(m, "hash/ripemd160", 20, 64) {}
+       RIProv(Module* m) : HashProvider(m, "ripemd160", 20, 64) {}
 };
 
 class ModuleRIPEMD160 : public Module
@@ -450,7 +449,6 @@ class ModuleRIPEMD160 : public Module
        RIProv mr;
        ModuleRIPEMD160() : mr(this)
        {
-               ServerInstance->Modules->AddService(mr);
        }
 
        Version GetVersion() CXX11_OVERRIDE