narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use base64 instead of base36 when creating random strings

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-30 11:39:47 +02:00
parent 01b207d44d
commit e11277c70f
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
View file

@ -26,6 +26,10 @@ public abstract class SaslMechanism {
public AuthenticationException(final Exception inner) { public AuthenticationException(final Exception inner) {
super(inner); super(inner);
} }
public AuthenticationException(final String message, final Exception exception) {
super(message,exception);
}
} }
public static class InvalidStateException extends AuthenticationException { public static class InvalidStateException extends AuthenticationException {

9
src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
View file

@ -70,7 +70,7 @@ abstract class ScramMechanism extends SaslMechanism {
super(tagWriter, account, rng); super(tagWriter, account, rng);
// This nonce should be different for each authentication attempt. // This nonce should be different for each authentication attempt.
clientNonce = new BigInteger(100, this.rng).toString(32); clientNonce = CryptoHelper.random(100,rng);
clientFirstMessageBare = ""; clientFirstMessageBare = "";
} }
@ -93,7 +93,12 @@ abstract class ScramMechanism extends SaslMechanism {
if (challenge == null) { if (challenge == null) {
throw new AuthenticationException("challenge can not be null"); throw new AuthenticationException("challenge can not be null");
} }
byte[] serverFirstMessage = Base64.decode(challenge, Base64.DEFAULT); byte[] serverFirstMessage;
try {
serverFirstMessage = Base64.decode(challenge, Base64.DEFAULT);
} catch (IllegalArgumentException e) {
throw new AuthenticationException("Unable to decode server challenge",e);
}
final Tokenizer tokenizer = new Tokenizer(serverFirstMessage); final Tokenizer tokenizer = new Tokenizer(serverFirstMessage);
String nonce = ""; String nonce = "";
int iterationCount = -1; int iterationCount = -1;

8
src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
View file

@ -1,6 +1,7 @@
package eu.siacs.conversations.utils; package eu.siacs.conversations.utils;
import android.os.Bundle; import android.os.Bundle;
import android.util.Base64;
import android.util.Pair; import android.util.Pair;
import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.X500Name;
@ -12,6 +13,7 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateParsingException; import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
@ -97,6 +99,12 @@ public final class CryptoHelper {
return Normalizer.normalize(s, Normalizer.Form.NFKC); return Normalizer.normalize(s, Normalizer.Form.NFKC);
} }
public static String random(int length, SecureRandom random) {
final byte[] bytes = new byte[length];
random.nextBytes(bytes);
return Base64.encodeToString(bytes,Base64.NO_PADDING|Base64.NO_WRAP);
}
public static String prettifyFingerprint(String fingerprint) { public static String prettifyFingerprint(String fingerprint) {
if (fingerprint==null) { if (fingerprint==null) {
return ""; return "";

3
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -66,6 +66,7 @@ import eu.siacs.conversations.entities.ServiceDiscoveryResult;
import eu.siacs.conversations.generator.IqGenerator; import eu.siacs.conversations.generator.IqGenerator;
import eu.siacs.conversations.services.NotificationService; import eu.siacs.conversations.services.NotificationService;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.utils.IP; import eu.siacs.conversations.utils.IP;
import eu.siacs.conversations.utils.Patterns; import eu.siacs.conversations.utils.Patterns;
import eu.siacs.conversations.utils.Resolver; import eu.siacs.conversations.utils.Resolver;
@ -1322,7 +1323,7 @@ public class XmppConnection implements Runnable {
} }
private String nextRandomId() { private String nextRandomId() {
return new BigInteger(50, mXmppConnectionService.getRNG()).toString(36); return CryptoHelper.random(50,mXmppConnectionService.getRNG());
} }
public String sendIqPacket(final IqPacket packet, final OnIqPacketReceived callback) { public String sendIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {