aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-16 03:13:53 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-16 03:13:53 +0100
commit2c6547753275a5c988ae4b6a4f15993700c736a6 (patch)
treeadab6547eec5b976a49f14d8d64fe35bda6922a8
parent2067b9bd8dcbace4b5d029a8266e9d195a3d573d (diff)
parentcfdda5f8fde8d480334b136bdf2317d66eb5e497 (diff)
Merge pull request #672 from SamWhited/development
Don't escape passwords in SASL
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java4
-rw-r--r--src/main/java/eu/siacs/conversations/utils/CryptoHelper.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
index f5765cf18..10cd3167e 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
@@ -52,7 +52,7 @@ public class ScramSha1 extends SaslMechanism {
final String[] kparts = k.split(",", 4);
try {
final byte[] saltedPassword, serverKey, clientKey;
- saltedPassword = hi(CryptoHelper.saslPrep(CryptoHelper.hexToString(kparts[1])).getBytes(),
+ saltedPassword = hi(CryptoHelper.hexToString(kparts[1]).getBytes(),
Base64.decode(CryptoHelper.hexToString(kparts[2]), Base64.DEFAULT), Integer.valueOf(kparts[3]));
serverKey = hmac(saltedPassword, SERVER_KEY_BYTES);
clientKey = hmac(saltedPassword, CLIENT_KEY_BYTES);
@@ -88,7 +88,7 @@ public class ScramSha1 extends SaslMechanism {
@Override
public String getClientFirstMessage() {
if (clientFirstMessageBare.isEmpty() && state == State.INITIAL) {
- clientFirstMessageBare = "n=" + CryptoHelper.saslPrep(account.getUsername()) +
+ clientFirstMessageBare = "n=" + CryptoHelper.saslEscape(CryptoHelper.saslPrep(account.getUsername())) +
",r=" + this.clientNonce;
state = State.AUTH_TEXT_SENT;
}
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index b4a6e65c5..7a36e2bab 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -80,7 +80,7 @@ public class CryptoHelper {
}
public static String saslPrep(final String s) {
- return saslEscape(Normalizer.normalize(s, Normalizer.Form.NFKC));
+ return Normalizer.normalize(s, Normalizer.Form.NFKC);
}
public static String prettifyFingerprint(String fingerprint) {