diff options
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_sasl2.cpp | 5 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_sasl2.cpp b/protocols/JabberG/src/jabber_sasl2.cpp index 8f3a2fefa8..9ee2d298e1 100644 --- a/protocols/JabberG/src/jabber_sasl2.cpp +++ b/protocols/JabberG/src/jabber_sasl2.cpp @@ -73,8 +73,9 @@ void CJabberProto::OnProcessUpgrade(const TiXmlElement *n, ThreadData *info) pTask = new TScramTask(info, szMechanism, EVP_sha256(), 520); else if (!mir_strcmp(szMechanism, "UPGR-SCRAM-SHA-384")) pTask = new TScramTask(info, szMechanism, EVP_sha384(), 530); - //else if (!mir_strcmp(szMechanism, "UPGR-SCRAM-SHA-512")) - //pTask = new TScramTask(info, szMechanism, EVP_sha512(), 540); + // uncomment those lines when ejabberd will support SHA-512 normally + // else if (!mir_strcmp(szMechanism, "UPGR-SCRAM-SHA-512")) + // pTask = new TScramTask(info, szMechanism, EVP_sha512(), 540); else { debugLogA("Unsupported mechanism for upgrade: %s, skipping", szMechanism); return; diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index c283904cde..753b2cadc8 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -717,7 +717,7 @@ void CJabberProto::OnProcessFeatures(const TiXmlElement *node, ThreadData *info) if (auto *sm = XmlGetChildByTag(c, "sm", "xmlns", JABBER_FEAT_SM))
m_StrmMgmt.CheckStreamFeatures(sm);
- if (auto *bind = XmlGetChildByTag(c, "sm", "xmlns", "urn:xmpp:bind:0")) {
+ if (auto *bind = XmlGetChildByTag(c, "bind", "xmlns", "urn:xmpp:bind:0")) {
// dunno why we need to handle that
}
}
|