Fixes found by removing User inheritance from StreamSocket

[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 00d3fb1e9260fa1ddcc8247b1b814bfa5c500d29..6ac9c3d87f78664a762f5a802b8aadb38c67cc9b 100644 (file)
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -39,7 +39,7 @@ typedef unsigned char byte;
 
 /** An MD5 context, used by m_opermd5
  */
-class MD5Context : public classbase
+class MD5Context
 {
  public:
        word32 buf[4];
@@ -276,10 +276,10 @@ class ModuleMD5 : public Module
        {
                if (strcmp("HASH", request.id) == 0)
                {
-                       char res[33];
+                       char res[16];
                        HashRequest& req = static_cast<HashRequest&>(request);
-                       GenHash(req.data.data(), res, "0123456789abcdef", NULL, req.data.length());
-                       req.result = res;
+                       MyMD5(res, (void*)req.data.data(), req.data.length(), NULL);
+                       req.binresult.assign(res, 16);
                }
                else if (strcmp("HASH-IV", request.id) == 0)
                {
@@ -296,7 +296,7 @@ class ModuleMD5 : public Module
 
        Version GetVersion()
        {
-               return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+               return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR);
        }
 };