prefer PLAIN over DIGEST-MD5

Daniel Gultsch created 11 years ago

DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors

Change summary

src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java   | 2 +-
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java

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

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

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