vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

SMACK-404 Changed StringUtils.decodeBase64(String) behavior so that the method does not try to detect and decompress a gzip-compressed input. Refactored every use of the Base64.(de|en)code* methods to use the StringUtils (de|en)codeBase64 methods instead.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13416 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Florian Schmaus 2013-01-29 22:49:20 +00:00 • committed by flow
parent e3f84cdbe6
commit 401c37bd28
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/org/jivesoftware/smack/sasl/SASLMechanism.java
View file

@ -23,7 +23,7 @@ package org.jivesoftware.smack.sasl;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.SASLAuthentication;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.util.Base64;
import org.jivesoftware.smack.util.StringUtils;
import java.io.IOException;
import java.util.Map;
@ -115,7 +115,7 @@ public abstract class SASLMechanism implements CallbackHandler {
try {
if(sc.hasInitialResponse()) {
byte[] response = sc.evaluateChallenge(new byte[0]);
authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES);
authenticationText = StringUtils.encodeBase64(response, false);
}
} catch (SaslException e) {
throw new XMPPException("SASL authentication failed", e);
@ -136,7 +136,7 @@ public abstract class SASLMechanism implements CallbackHandler {
public void challengeReceived(String challenge) throws IOException {
byte response[];
if(challenge != null) {
response = sc.evaluateChallenge(Base64.decode(challenge));
response = sc.evaluateChallenge(StringUtils.decodeBase64(challenge));
} else {
response = sc.evaluateChallenge(new byte[0]);
}
@ -146,7 +146,7 @@ public abstract class SASLMechanism implements CallbackHandler {
responseStanza = new Response();
}
else {
responseStanza = new Response(Base64.encodeBytes(response,Base64.DONT_BREAK_LINES));
responseStanza = new Response(StringUtils.encodeBase64(response, false));
}
// Send the authentication to the server