Merge pull request #1059 from OVERdrive-IRC/m_repeat/fix-typo

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

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 895323a02a475ada3d4da7b0da7fa591c7d2f6dc..2001d560de06e578f00fb51cabde35484fe6f932 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -69,37 +69,41 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
        capab->auth_fingerprint = !link.Fingerprint.empty();
        capab->auth_challenge = !capab->ourchallenge.empty() && !capab->theirchallenge.empty();
 
+       std::string fp = SSLClientCert::GetFingerprint(this);
+       if (capab->auth_fingerprint)
+       {
+               /* Require fingerprint to exist and match */
+               if (link.Fingerprint != fp)
+               {
+                       ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL certificate fingerprint on link %s: need \"%s\" got \"%s\"",
+                               link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
+                       SendError("Invalid SSL certificate fingerprint " + fp + " - expected " + link.Fingerprint);
+                       return false;
+               }
+       }
+
        if (capab->auth_challenge)
        {
                std::string our_hmac = MakePass(link.RecvPass, capab->ourchallenge);
 
-               /* Straight string compare of hashes */
-               if (our_hmac != theirs)
+               // Use the timing-safe compare function to compare the hashes
+               if (!InspIRCd::TimingSafeCompare(our_hmac, theirs))
                        return false;
        }
        else
        {
-               /* Straight string compare of plaintext */
-               if (link.RecvPass != theirs)
+               // Use the timing-safe compare function to compare the passwords
+               if (!InspIRCd::TimingSafeCompare(link.RecvPass, theirs))
                        return false;
        }
 
-       std::string fp = SSLClientCert::GetFingerprint(this);
-       if (capab->auth_fingerprint)
+       // Tell opers to set up fingerprint verification if it's not already set up and the SSL mod gave us a fingerprint
+       // this time
+       if ((!capab->auth_fingerprint) && (!fp.empty()))
        {
-               /* Require fingerprint to exist and match */
-               if (link.Fingerprint != fp)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL fingerprint on link %s: need \"%s\" got \"%s\"",
-                               link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
-                       SendError("Provided invalid SSL fingerprint " + fp + " - expected " + link.Fingerprint);
-                       return false;
-               }
-       }
-       else if (!fp.empty())
-       {
-               ServerInstance->SNO->WriteToSnoMask('l', "SSL fingerprint for link %s is \"%s\". "
+               ServerInstance->SNO->WriteToSnoMask('l', "SSL certificate fingerprint for link %s is \"%s\". "
                        "You can improve security by specifying this in <link:fingerprint>.", link.Name.c_str(), fp.c_str());
        }
+
        return true;
 }