diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-01-16 20:59:41 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-01-16 20:59:41 +0100 |
| commit | 8c251fc0ddaf88c1ca79fe0d09abc0fc88da33d0 (patch) | |
| tree | d714509483c9066aeceb8904eb0c27b4cda78325 /src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | |
| parent | 0156ec58eeb39c796953e2942930aae0b8049940 (diff) | |
Add SCRAM-SHA-2 support
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 9fae887ec..883df52d8 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -60,6 +60,7 @@ import de.pixart.messenger.crypto.sasl.External; import de.pixart.messenger.crypto.sasl.Plain; import de.pixart.messenger.crypto.sasl.SaslMechanism; import de.pixart.messenger.crypto.sasl.ScramSha1; +import de.pixart.messenger.crypto.sasl.ScramSha256; import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Message; import de.pixart.messenger.entities.ServiceDiscoveryResult; @@ -883,6 +884,8 @@ public class XmppConnection implements Runnable { auth.setAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-sasl"); if (mechanisms.contains("EXTERNAL") && account.getPrivateKeyAlias() != null) { saslMechanism = new External(tagWriter, account, mXmppConnectionService.getRNG()); + } else if (mechanisms.contains("SCRAM-SHA-256")) { + saslMechanism = new ScramSha256(tagWriter, account, mXmppConnectionService.getRNG()); } else if (mechanisms.contains("SCRAM-SHA-1")) { saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG()); } else if (mechanisms.contains("PLAIN")) { |