diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-16 12:28:21 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-16 12:28:21 +0100 |
| commit | 84b2ce10b7a38aaaa9d2d3ee8ad4e1213402640f (patch) | |
| tree | 9fb75476bd57dfb964ea4e9cf422385a7e21cc1f /src/main | |
| parent | d43aeb721835e43a15e3496b3c06dda54d516d76 (diff) | |
| parent | 2c6547753275a5c988ae4b6a4f15993700c736a6 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java | 4 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | 2 |
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) { |