diff options
| author | George Hazan <ghazan@miranda.im> | 2020-11-23 13:28:12 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-11-23 13:28:12 +0300 |
| commit | ce00ea0c677f5965a349a817c2006e50d8fd629e (patch) | |
| tree | 3b5f4a49b04ecac4e035a9ead73a3898f322095c /protocols/JabberG/src | |
| parent | b6216145513ed25b87a0f27f6554921b42adfea0 (diff) | |
Jabber: SCRAM-AUTH priorities changed according to https://wiki.xmpp.org/web/SASL_and_SCRAM-SHA-1(-PLUS)_/_SCRAM-SHA-256(-PLUS)#Order
Diffstat (limited to 'protocols/JabberG/src')
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 01bdddd0eb..f607d15943 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -658,23 +658,23 @@ void CJabberProto::OnProcessFeatures(const TiXmlElement *node, ThreadData *info) else if (!mir_strcmp(szMechanism, "SCRAM-SHA-1"))
pAuth = new TScramAuth(info, szMechanism, EVP_sha1(), 500);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-1-PLUS"))
- pAuth = new TScramAuth(info, szMechanism, EVP_sha1(), 501);
+ pAuth = new TScramAuth(info, szMechanism, EVP_sha1(), 600);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-224"))
pAuth = new TScramAuth(info, szMechanism, EVP_sha224(), 510);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-224-PLUS"))
- pAuth = new TScramAuth(info, szMechanism, EVP_sha224(), 511);
+ pAuth = new TScramAuth(info, szMechanism, EVP_sha224(), 610);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-256"))
pAuth = new TScramAuth(info, szMechanism, EVP_sha256(), 520);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-256-PLUS"))
- pAuth = new TScramAuth(info, szMechanism, EVP_sha256(), 521);
+ pAuth = new TScramAuth(info, szMechanism, EVP_sha256(), 620);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-384"))
pAuth = new TScramAuth(info, szMechanism, EVP_sha384(), 530);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-384-PLUS"))
- pAuth = new TScramAuth(info, szMechanism, EVP_sha384(), 531);
+ pAuth = new TScramAuth(info, szMechanism, EVP_sha384(), 630);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-512"))
pAuth = new TScramAuth(info, szMechanism, EVP_sha512(), 540);
else if (!mir_strcmp(szMechanism, "SCRAM-SHA-512-PLUS"))
- pAuth = new TScramAuth(info, szMechanism, EVP_sha512(), 541);
+ pAuth = new TScramAuth(info, szMechanism, EVP_sha512(), 640);
else if (!mir_strcmp(szMechanism, "NTLM") || !mir_strcmp(szMechanism, "GSS-SPNEGO") || !mir_strcmp(szMechanism, "GSSAPI"))
pAuth = new TNtlmAuth(info, szMechanism);
else {
|