Swiftdiff options
| author | Gurmeen Bindra <gurmeen.bindra@isode.com> | 2015-08-21 13:33:46 (GMT) |
|---|---|---|
| committer | Gurmeen Bindra <gurmeen.bindra@isode.com> | 2015-08-21 13:44:58 (GMT) |
| commit | 277e11b13ea468697804aeb76a1431446c7d3944 (patch) | |
| tree | a89844b828cdb7ca699d7f6cba0631e9a805f8f3 /src/com/isode/stroke/sasl | |
| parent | 73cb8ef5b98cf9b5026c4620a325ee799e6fcb8a (diff) | |
| download | stroke-277e11b13ea468697804aeb76a1431446c7d3944.zip stroke-277e11b13ea468697804aeb76a1431446c7d3944.tar.bz2 | |
Fix code to not throw StringPrepParseException that was part of ICU jar
The IDNConverter interface now throws java strandard IllegalArg exception
instead of the ICU specific StringPrepParseException. Users of stroke that
are not using ICU will now be able to use it without the icu jar.
Test-information:
Sanity tested by connecting to an XMPP server using an XMPP client
Change-Id: I6999ae0c690b70bc748f131908a758a01dac20b9
Diffstat (limited to 'src/com/isode/stroke/sasl')
| -rw-r--r-- | src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java b/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java index 1d2b4d9..2b302d0 100644 --- a/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java +++ b/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java @@ -8,17 +8,15 @@ */ package com.isode.stroke.sasl; +import java.util.HashMap; +import java.util.Map; + import com.isode.stroke.base.ByteArray; import com.isode.stroke.base.SafeByteArray; -import com.ibm.icu.text.StringPrepParseException; +import com.isode.stroke.crypto.CryptoProvider; +import com.isode.stroke.idn.IDNConverter; import com.isode.stroke.stringcodecs.Base64; import com.isode.stroke.stringcodecs.PBKDF2; -import com.isode.stroke.idn.IDNConverter; -import com.isode.stroke.crypto.CryptoProvider; -import java.text.Normalizer; -import java.text.Normalizer.Form; -import java.util.HashMap; -import java.util.Map; public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator { @@ -113,7 +111,7 @@ public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator { // Compute all the values needed for the server signature try { saltedPassword = PBKDF2.encode(idnConverter.getStringPrepared(getPassword(), IDNConverter.StringPrepProfile.SASLPrep), salt, iterations, crypto); - } catch (StringPrepParseException e) { + } catch (IllegalArgumentException e) { } authMessage = getInitialBareClientMessage().append(",").append(initialServerMessage).append(",").append(getFinalMessageWithoutProof()); @@ -161,7 +159,7 @@ public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator { String authenticationID = ""; try { authenticationID = idnConverter.getStringPrepared(getAuthenticationID(), IDNConverter.StringPrepProfile.SASLPrep); - } catch (StringPrepParseException e) { + } catch (IllegalArgumentException e) { } return new ByteArray("n=" + escape(authenticationID) + ",r=" + clientnonce); |