Don't update the idle timer when a user replies to a CTCP.

[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 6ceb4b481bb80790045316a610ad390947947570..98910db823a5f28dadcac2072a35f4f568416efb 100644 (file)
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -56,25 +56,15 @@
  */
 
 
-/* $ModDesc: Allows for RIPEMD-160 encrypted oper passwords */
-
 /* macro definitions */
 
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
-#include "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)                    \
@@ -159,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", DEBUG, "initialize with custom mdbuf");
                        MDbuf[0] = key[0];
                        MDbuf[1] = key[1];
                        MDbuf[2] = key[2];
@@ -173,7 +165,6 @@ class RIProv : public HashProvider
                }
                else
                {
-                       ServerInstance->Logs->Log("m_ripemd160.so", DEBUG, "initialize with default mdbuf");
                        MDbuf[0] = 0x67452301UL;
                        MDbuf[1] = 0xefcdab89UL;
                        MDbuf[2] = 0x98badcfeUL;
@@ -414,9 +405,7 @@ class RIProv : public HashProvider
 
        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         X[16];               /* current 16-word chunk        */
                unsigned int  i;                   /* counter                      */
                dword         nbytes;              /* # of bytes not yet processed */
@@ -445,18 +434,13 @@ class RIProv : public HashProvider
                return (byte *)hashcode;
        }
 public:
-       std::string sum(const std::string& data)
+       std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE
        {
                char* rv = (char*)RMD((byte*)data.data(), data.length(), NULL);
                return std::string(rv, RMDsize / 8);
        }
 
-       std::string sumIV(unsigned int* IV, const char* HexMap, const std::string &sdata)
-       {
-               return "";
-       }
-
-       RIProv(Module* m) : HashProvider(m, "hash/ripemd160", 20, 64) {}
+       RIProv(Module* m) : HashProvider(m, "ripemd160", 20, 64) {}
 };
 
 class ModuleRIPEMD160 : public Module
@@ -465,15 +449,12 @@ class ModuleRIPEMD160 : public Module
        RIProv mr;
        ModuleRIPEMD160() : mr(this)
        {
-               ServerInstance->Modules->AddService(mr);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides RIPEMD-160 hashing", VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleRIPEMD160)
-