]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Fix challenge auth when using m_hash_gnutls instead of m_sha256.
authorPeter Powell <petpow@saberuk.com>
Fri, 5 Aug 2016 19:50:11 +0000 (20:50 +0100)
committerPeter Powell <petpow@saberuk.com>
Fri, 5 Aug 2016 19:56:56 +0000 (20:56 +0100)
src/modules/m_spanningtree/capab.cpp

index 7b64358980d6bb41e49dbadeee5b437ea327fd5b..0ab815fef71e8eaef8c38516f8d6d236552071b0 100644 (file)
@@ -27,6 +27,7 @@
 #include "utils.h"
 #include "link.h"
 #include "main.h"
+#include "../hash.h"
 
 std::string TreeSocket::MyModules(int filter)
 {
@@ -134,7 +135,7 @@ void TreeSocket::SendCapabilities(int phase)
 
        std::string extra;
        /* Do we have sha256 available? If so, we send a challenge */
-       if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so")))
+       if (Utils->ChallengeResponse && (ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256")))
        {
                SetOurChallenge(ServerInstance->GenRandomStr(20));
                extra = " CHALLENGE=" + this->GetOurChallenge();
@@ -320,7 +321,7 @@ bool TreeSocket::Capab(const parameterlist &params)
 
                /* Challenge response, store their challenge for our password */
                std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
-               if (Utils->ChallengeResponse && (n != this->capab->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))
+               if (Utils->ChallengeResponse && (n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256")))
                {
                        /* Challenge-response is on now */
                        this->SetTheirChallenge(n->second);