narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

prefer PLAIN over DIGEST-MD5

Browse source 
DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors
This commit is contained in:
Daniel Gultsch 2015-01-02 01:39:19 +01:00
parent bb3bf25523
commit 8d2f454479
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java
View file

@ -14,7 +14,7 @@ public class Plain extends SaslMechanism {
@Override @Override
public int getPriority() { public int getPriority() {
return 0; return 10;
} }
@Override @Override

4
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -576,10 +576,10 @@ public class XmppConnection implements Runnable {
auth.setAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-sasl"); auth.setAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-sasl");
if (mechanisms.contains("SCRAM-SHA-1")) { if (mechanisms.contains("SCRAM-SHA-1")) {
saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG()); saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG());
//} else if (mechanisms.contains("DIGEST-MD5")) {
// saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG());
} else if (mechanisms.contains("PLAIN")) { } else if (mechanisms.contains("PLAIN")) {
saslMechanism = new Plain(tagWriter, account); saslMechanism = new Plain(tagWriter, account);
} else if (mechanisms.contains("DIGEST-MD5")) {
saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG());
} }
final JSONObject keys = account.getKeys(); final JSONObject keys = account.getKeys();
try { try {