Resolve /STATS S conflict between SVSHOLD and SHUN

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

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index d27856b3e31d16fdfeab8036391bc822565b08fc..44e02eeda8b07368eb15c40ea017d94e476e374c 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -14,20 +14,7 @@
 /* $ModDesc: Allows for hashed oper passwords */
 
 #include "inspircd.h"
-#include "m_hash.h"
-
-static std::string hmac(HashProvider* hp, const std::string& key, const std::string& msg)
-{
-       std::string hmac1, hmac2;
-       for (size_t n = 0; n < key.length(); n++)
-       {
-               hmac1.push_back(static_cast<char>(key[n] ^ 0x5C));
-               hmac2.push_back(static_cast<char>(key[n] ^ 0x36));
-       }
-       hmac2.append(msg);
-       hmac1.append(hp->sum(hmac2));
-       return hp->sum(hmac1);
-}
+#include "hash.h"
 
 /* Handle /MKPASSWD
  */
@@ -51,12 +38,13 @@ class CommandMkpasswd : public Command
                                user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str());
                                return;
                        }
-                       std::string salt = GenRandomStr(6, false);
-                       std::string target = hmac(hp, salt, stuff);
+                       std::string salt = ServerInstance->GenRandomStr(6, false);
+                       std::string target = hp->hmac(salt, stuff);
                        std::string str = BinToBase64(salt) + "$" + BinToBase64(target, NULL, 0);
 
                        user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
                                user->nick.c_str(), algo.c_str(), stuff.c_str(), str.c_str());
+                       return;
                }
                HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + algo);
                if (hp)
@@ -109,15 +97,7 @@ class ModuleOperHash : public Module
                        std::string salt = Base64ToBin(data.substr(0, sep));
                        std::string target = Base64ToBin(data.substr(sep + 1));
 
-                       std::string hmac1, hmac2;
-                       for (size_t n = 0; n < salt.length(); n++)
-                       {
-                               hmac1.push_back(static_cast<char>(salt[n] ^ 0x5C));
-                               hmac2.push_back(static_cast<char>(salt[n] ^ 0x36));
-                       }
-                       hmac2.append(input);
-                       hmac1.append(hp->sum(hmac2));
-                       if (target == hp->sum(hmac1))
+                       if (target == hp->hmac(salt, input))
                                return MOD_RES_ALLOW;
                        else
                                return MOD_RES_DENY;