From 14cfb60952402a25cad6681552daed657cde8237 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 12 Nov 2014 10:15:38 -0500
Subject: Refactor authentication code

---
 .../eu/siacs/conversations/utils/CryptoHelper.java | 60 +---------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/utils/CryptoHelper.java')

diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index 47595c6e3..11042d07c 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -1,14 +1,7 @@
 package eu.siacs.conversations.utils;
 
-import java.math.BigInteger;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
-import eu.siacs.conversations.entities.Account;
-import android.util.Base64;
-
 public class CryptoHelper {
 	public static final String FILETRANSFER = "?FILETRANSFERv1:";
 	final protected static char[] hexArray = "0123456789abcdef".toCharArray();
@@ -36,64 +29,13 @@ public class CryptoHelper {
 		return array;
 	}
 
-	public static String saslPlain(String username, String password) {
-		String sasl = '\u0000' + username + '\u0000' + password;
-		return Base64.encodeToString(sasl.getBytes(Charset.defaultCharset()),
-				Base64.NO_WRAP);
-	}
-
-	private static byte[] concatenateByteArrays(byte[] a, byte[] b) {
+	public static byte[] concatenateByteArrays(byte[] a, byte[] b) {
 		byte[] result = new byte[a.length + b.length];
 		System.arraycopy(a, 0, result, 0, a.length);
 		System.arraycopy(b, 0, result, a.length, b.length);
 		return result;
 	}
 
-	public static String saslDigestMd5(Account account, String challenge,
-			SecureRandom random) {
-		try {
-			String[] challengeParts = new String(Base64.decode(challenge,
-					Base64.DEFAULT)).split(",");
-			String nonce = "";
-			for (int i = 0; i < challengeParts.length; ++i) {
-				String[] parts = challengeParts[i].split("=");
-				if (parts[0].equals("nonce")) {
-					nonce = parts[1].replace("\"", "");
-				} else if (parts[0].equals("rspauth")) {
-					return null;
-				}
-			}
-			String digestUri = "xmpp/" + account.getServer();
-			String nonceCount = "00000001";
-			String x = account.getUsername() + ":" + account.getServer() + ":"
-					+ account.getPassword();
-			MessageDigest md = MessageDigest.getInstance("MD5");
-			byte[] y = md.digest(x.getBytes(Charset.defaultCharset()));
-			String cNonce = new BigInteger(100, random).toString(32);
-			byte[] a1 = concatenateByteArrays(y,
-					(":" + nonce + ":" + cNonce).getBytes(Charset
-							.defaultCharset()));
-			String a2 = "AUTHENTICATE:" + digestUri;
-			String ha1 = bytesToHex(md.digest(a1));
-			String ha2 = bytesToHex(md.digest(a2.getBytes(Charset
-					.defaultCharset())));
-			String kd = ha1 + ":" + nonce + ":" + nonceCount + ":" + cNonce
-					+ ":auth:" + ha2;
-			String response = bytesToHex(md.digest(kd.getBytes(Charset
-					.defaultCharset())));
-			String saslString = "username=\"" + account.getUsername()
-					+ "\",realm=\"" + account.getServer() + "\",nonce=\""
-					+ nonce + "\",cnonce=\"" + cNonce + "\",nc=" + nonceCount
-					+ ",qop=auth,digest-uri=\"" + digestUri + "\",response="
-					+ response + ",charset=utf-8";
-			return Base64.encodeToString(
-					saslString.getBytes(Charset.defaultCharset()),
-					Base64.NO_WRAP);
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-	}
-
 	public static String randomMucName(SecureRandom random) {
 		return randomWord(3, random) + "." + randomWord(7, random);
 	}
-- 
cgit v1.2.3