diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-08-08 10:57:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 10:57:04 +0200 |
| commit | 30a9cd0f5d9d6f96b637adb4afc8dbc727bf1afe (patch) | |
| tree | 3562afba24e82dee34bc3ceed1c110737816450c | |
| parent | 57b01bc95833f29c660f92d13645e088b0df0df2 (diff) | |
| parent | 25cdcdc777c265124e55bf0fb94fdd856065f25b (diff) | |
Merge pull request #1196 from SaberUK/insp20+sha256
[2.0] Fix challenge auth when using m_hash_gnutls instead of m_sha256.
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 7b6435898..0ab815fef 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -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 ¶ms) /* 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); |