aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-16 15:01:06 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-16 15:01:06 +0200
commit9edcca1045126ecbaf4818c4e48881e06cbbd657 (patch)
tree9c84e822736e23aa554485003f3801e04c241efc /src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
parente8e0eccd82df13f1a589abce55b9e54325569223 (diff)
parent569bc435d35e79e667045aa5ed861439ebf5363c (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java3
1 files changed, 3 insertions, 0 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 c95a62df..f47677f6 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
@@ -101,6 +101,9 @@ public class ScramSha1 extends SaslMechanism {
public String getResponse(final String challenge) throws AuthenticationException {
switch (state) {
case AUTH_TEXT_SENT:
+ if (challenge == null) {
+ throw new AuthenticationException("challenge can not be null");
+ }
serverFirstMessage = Base64.decode(challenge, Base64.DEFAULT);
final Tokenizer tokenizer = new Tokenizer(serverFirstMessage);
String nonce = "";