Implement feature in bug #395 reported by stealth, and tidy up a bit

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

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 21343cdcfdc88926dcc1104512a17bf57cd68ada..3b7df836994ce1d24219d95184745cd9206919d7 100644 (file)
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,17 +14,13 @@
 /* $ModDesc: Allows for MD5 encrypted oper passwords */
 /* $ModDep: m_hash.h */
 
-using namespace std;
-
-#include "inspircd_config.h"
+#include "inspircd.h"
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-
 #include "m_hash.h"
 
 /* The four core functions - F1 is optimized somewhat */
@@ -38,7 +31,7 @@ using namespace std;
 
 /* This is the central step in the MD5 algorithm. */
 #define MD5STEP(f,w,x,y,z,in,s) \
-         (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
+       (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
 
 #ifndef HAS_STDINT
 typedef unsigned int uint32_t;
@@ -70,9 +63,8 @@ class ModuleMD5 : public Module
                        p += 4;
                } while (--words);
        }
-       
-       /* XXX - maybe if we had an md5/encryption moduletype? *shrug* */
-       void MD5Init(struct MD5Context *ctx, unsigned int* key = NULL)
+
+       void MD5Init(MD5Context *ctx, unsigned int* key = NULL)
        {
                /* These are the defaults for md5 */
                if (!key)
@@ -94,7 +86,7 @@ class ModuleMD5 : public Module
                ctx->bytes[1] = 0;
        }
 
-       void MD5Update(struct MD5Context *ctx, byte const *buf, int len)
+       void MD5Update(MD5Context *ctx, byte const *buf, int len)
        {
                word32 t;
        
@@ -131,7 +123,7 @@ class ModuleMD5 : public Module
                memcpy(ctx->in, buf, len);
        }
        
-       void MD5Final(byte digest[16], struct MD5Context *ctx)
+       void MD5Final(byte digest[16], MD5Context *ctx)
        {
                int count = (int)(ctx->bytes[0] & 0x3f); /* Bytes in ctx->in */
                byte *p = (byte *)ctx->in + count;      /* First unused byte */
@@ -276,7 +268,7 @@ class ModuleMD5 : public Module
  public:
 
        ModuleMD5(InspIRCd* Me)
-               : Module::Module(Me), key(NULL), chars(NULL)
+               : Module(Me), key(NULL), chars(NULL)
        {
                ServerInstance->PublishInterface("HashRequest", this);
        }
@@ -294,7 +286,7 @@ class ModuleMD5 : public Module
        virtual char* OnRequest(Request* request)
        {
                HashRequest* MD5 = (HashRequest*)request;
-               ServerInstance->Log(DEBUG,"MD5 REQUEST type %s", request->GetId());
+
                if (strcmp("KEY", request->GetId()) == 0)
                {
                        this->key = (unsigned int*)MD5->GetKeyData();
@@ -305,7 +297,6 @@ class ModuleMD5 : public Module
                }
                else if (strcmp("SUM", request->GetId()) == 0)
                {
-                       ServerInstance->Log(DEBUG,"MD5 SUM!");
                        static char data[MAXBUF];
                        GenHash((const char*)MD5->GetHashData(), data, chars ? chars : "0123456789abcdef", key);
                        return data;
@@ -316,7 +307,6 @@ class ModuleMD5 : public Module
                }
                else if (strcmp("RESET", request->GetId()) == 0)
                {
-                       ServerInstance->Log(DEBUG,"MD5 RESET!");
                        this->chars = NULL;
                        this->key = NULL;
                }
@@ -329,27 +319,4 @@ class ModuleMD5 : public Module
        }
 };
 
-
-class ModuleMD5Factory : public ModuleFactory
-{
- public:
-       ModuleMD5Factory()
-       {
-       }
-       
-       ~ModuleMD5Factory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleMD5(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleMD5Factory;
-}
+MODULE_INIT(ModuleMD5)