Use InspIRCd::TimingSafeCompare in more places.

diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp
index 04cb06b087ce99eafc2e8bf45c6b8a6ad390cb97..a8de729d2b7704da0d7f1afff83b3b7f5f36638c 100644 (file)
--- a/src/modules/m_bcrypt.cpp
+++ b/src/modules/m_bcrypt.cpp
@@ -56,17 +56,6 @@ class BCryptProvider : public HashProvider
                return Generate(data, Salt());
        }
 
-       bool Compare(const std::string& input, const std::string& hash) CXX11_OVERRIDE
-       {
-               std::string ret = Generate(input, hash);
-               if (ret.empty())
-                       return false;
-
-               if (ret == hash)
-                       return true;
-               return false;
-       }
-
        std::string ToPrintable(const std::string& raw) CXX11_OVERRIDE
        {
                return raw;

diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp
index a4ac69f127dbc8067c420642a58e903f7b8ca78e..8a57936fd70b93e95bdd511e33428f91afd14f63 100644 (file)
--- a/src/modules/m_pbkdf2.cpp
+++ b/src/modules/m_pbkdf2.cpp
@@ -126,7 +126,7 @@ class PBKDF2Provider : public HashProvider
                        return false;
 
                std::string cmp = PBKDF2(input, hs.salt, hs.iterations, hs.length);
-               return (cmp == hs.hash);
+               return InspIRCd::TimingSafeCompare(cmp, hs.hash);
        }
 
        std::string ToPrintable(const std::string& raw) CXX11_OVERRIDE