Merge branch 'feature/signup-support-#5586' into develop

1 files changed, 219 insertions, 205 deletions

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testLeapSRPSession.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testLeapSRPSession.java
index 88d70da4..2821373a 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testLeapSRPSession.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testLeapSRPSession.java
@@ -4,6 +4,7 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.Arrays;
 
 import org.jboss.security.srp.SRPParameters;
@@ -17,217 +18,217 @@ import junit.framework.TestCase;
 
 public class testLeapSRPSession extends TestCase {
 
-	public testLeapSRPSession(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testExponential() {
-		byte[] expected_A;
-		byte[] a_byte;
-		SRPParameters params;
-		LeapSRPSession client;
-		
-		/* Test 1: abytes = 4 */
-		expected_A = new BigInteger("44eba0239ddfcc5a488d208df32a89eb00e93e6576b22ba2e4410085a413cf64e9c2f08ebc36a788a0761391150ad4a0507ca43f9ca659e2734f0457a85358c0bb39fa87183c9d3f9f8a3b148dab6303a4e796294f3e956472ba0e2ea5697382acd93c8b8f1b3a7a9d8517eebffd6301bfc8de7f7b701f0878a71faae1e25ad4", 16).toByteArray();
-		String username = "username",
-				password = "password",
-				salt = "64c3289d04a6ecad",
-				a = "3565fdc2";
-		a_byte = new BigInteger(a, 16).toByteArray();
-		params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
-		client = new LeapSRPSession(username, password, params, a_byte);
-		
-		byte[] A = client.exponential();
-		
-		assertTrue(Arrays.equals(A, expected_A));
-		
-		/* Test 1: abytes = 5 */
-		a = "67c152a3";
-		expected_A = new BigInteger("11acfacc08178d48f95c0e69adb11f6d144dd0980ee6e44b391347592e3bd5e9cb841d243b3d9ac2adb25b367a2558e8829b22dcef96c0934378412383ccf95141c3cb5f17ada20f53a0225f56a07f2b0c0469ed6bbad3646f7b71bdd4bedf5cc6fac244b26d3195d8f55877ff94a925b0c0c8f7273eca733c0355b38360442e", 16).toByteArray();
-
-		a_byte = new BigInteger(a, 16).toByteArray();
-		params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
-		client = new LeapSRPSession(username, password, params, a_byte);
-		
-		A = client.exponential();
-		
-		assertTrue(Arrays.equals(A, expected_A));
-	}
-
-	public void testResponse() throws NoSuchAlgorithmException {
-		/* Test 1: with intermediate checks */
-		byte[] expected_A = trim(new BigInteger("884380f70a62193bbe3589c4e1dbdc4467b6b5a1b4486e4b779023506fc1f885ae26fa4a5d817b3f38a35f3487b147b82d4bd0069faa64fdc845f7494a78251709e212698e42ced44b0f3849adc73f467afcb26983bd13bdc38906b178003373ddd0ac1d38ce8a39ffa3a7795787207a129a784f4b65ce0b302eb1bcf4045883", 16).toByteArray());
-		byte[] expected_x = new BigInteger("4cb937fd74ee3bb53b79a3174d0c07c14131de9c825897cbca52154e74200602", 16).toByteArray();
-		byte[] expected_M1 = trim(new BigInteger("e6a8efca2c07ef24e0b69be2d4d4a7e74742a4db7a92228218fec0008f7cc94b", 16).toByteArray());
-		String username = "username",
-				password = "password",
-				salt = "64c3289d04a6ecad",
-				a = "8c911355";
-		byte[] a_byte = new BigInteger(a, 16).toByteArray();
-		SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
-		LeapSRPSession client = new LeapSRPSession(username, password, params, a_byte);
-		
-		byte[] x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
-		assertTrue(Arrays.equals(x, expected_x));
-		
-		byte[] A = client.exponential();
-		assertTrue(Arrays.equals(A, expected_A));
-
-		String B = "bc745ba25564fc312f44ea09fb663aa6d95867772e412a6a23f1bc24183e54b32f134372c560f4b3fda19ba7a56b0f84fdcdecc22be6fd256639e918e019691c40a39aa5c9631820e42b28da61b8c75b45afae9d77d63ac8f4dda093762be4a890fbd86061dbd7e5e7c03c4dacde769e0f564df00403e449c0535537f1ba7263";	
-		
-		byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
-		assertTrue(Arrays.equals(M1, expected_M1));
-
-		/* Test 2: no intermediate checks */
-		expected_A = trim(new BigInteger("9ffc407afd7e7ecd32a8ea68aa782b0254a7e2197a955b5aa646fc1fc43ff6ef2239f01b7d5b82f152c870d3e69f3321878ca2acda06dd8fb6ce02f41c7ed48061c78697b01cf353f4222311334c707358b6ec067e317527316bfa85b5ec74537e38b5b14c1100d14c96320f385e5b1dcccde07e728c7ef624353167a29ae461", 16).toByteArray());
-		expected_M1 = trim(new BigInteger("c3203ec1dd55c96038276456c18c447fb4d2a2f896c73c31d56da1781cae79a8", 16).toByteArray());
-		a = "38d5b211";
-		
-		a_byte = new BigInteger(a, 16).toByteArray();
-		params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
-		client = new LeapSRPSession(username, password, params, a_byte);
-		x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
-		A = client.exponential();
-		
-		B = "b8ca7d93dbe2478966ffe025a9f2fb43b9995ce04af9523ea9a3fa4b132136076aa66ead1597c3da23f477ce1cfaf68b5dcc94e146db06cf8391d14a76ce53aab86067b13c93b135d7be6275669b3f51afec6cc41f19e0afca7c3ad5c4d6ee4c09d4b11bcd12e26c727ee56d173b92eea6926e72cc73deebe12dd6f30f44db8a";	
-		M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
-		
-		assertTrue(Arrays.equals(M1, expected_M1));
-		
-		/* Test 3: With intermediate values */
-		expected_M1 = new BigInteger("4c01f65a9bb00f95e435593083040ae1e59e59800c598b42de821c21f3a35223", 16).toByteArray();
-		expected_A = new BigInteger("1bceab3047a6f84495fdd5b4dbe891f0b30f870d7d4e38eaef728f6a7d4e9342d8dae8502fdae4f16b718d2e916a38b16b6def45559a5ebae417a1b115ba6b6a0451c7ff174c3e2507d7d1f18ef646fd065bc9ba165a2a0ae4d6da54f060427178b95b0eff745f5c3f8c4f19ea35addc3ce0daf2aca3328c98bafcf98286d115", 16).toByteArray();
-		B = "41a7b384f2f52312fa79b9dc650ae894f543aea49800cf9477fbcf63e39cbfe6d422f7126777d645cdf749276a3ae9eb6dfcfdb887f8f60ac4094a343013fcebbd40e95b3153f403ab7bb21ea1315aa018bab6ab84017fcb084b3870a8bf1cb717b39c9a28177c61ce7d1738379be9d192dd9793b50ebc3afabe5e78b0a4b017";
-		a = "36ee80ec";
-		
-		a_byte = new BigInteger(a, 16).toByteArray();
-		params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
-		client = new LeapSRPSession(username, password, params, a_byte);
-		x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
-		A = client.exponential();
-		
-		M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
-		
-		assertTrue(Arrays.equals(M1, expected_M1));
-	}
+    public testLeapSRPSession(String name) {
+	super(name);
+    }
+
+    protected void setUp() throws Exception {
+	super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+	super.tearDown();
+    }
+
+    public void testExponential() {
+	byte[] expected_A;
+	byte[] a_byte;
+	SRPParameters params;
+	LeapSRPSession client;
+		
+	/* Test 1: abytes = 4 */
+	expected_A = new BigInteger("44eba0239ddfcc5a488d208df32a89eb00e93e6576b22ba2e4410085a413cf64e9c2f08ebc36a788a0761391150ad4a0507ca43f9ca659e2734f0457a85358c0bb39fa87183c9d3f9f8a3b148dab6303a4e796294f3e956472ba0e2ea5697382acd93c8b8f1b3a7a9d8517eebffd6301bfc8de7f7b701f0878a71faae1e25ad4", 16).toByteArray();
+	String username = "username",
+	    password = "password",
+	    salt = "64c3289d04a6ecad",
+	    a = "3565fdc2";
+	a_byte = new BigInteger(a, 16).toByteArray();
+	params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
+	client = new LeapSRPSession(username, password, params, a_byte);
+		
+	byte[] A = client.exponential();
+		
+	assertTrue(Arrays.equals(A, expected_A));
+		
+	/* Test 1: abytes = 5 */
+	a = "67c152a3";
+	expected_A = new BigInteger("11acfacc08178d48f95c0e69adb11f6d144dd0980ee6e44b391347592e3bd5e9cb841d243b3d9ac2adb25b367a2558e8829b22dcef96c0934378412383ccf95141c3cb5f17ada20f53a0225f56a07f2b0c0469ed6bbad3646f7b71bdd4bedf5cc6fac244b26d3195d8f55877ff94a925b0c0c8f7273eca733c0355b38360442e", 16).toByteArray();
+
+	a_byte = new BigInteger(a, 16).toByteArray();
+	params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
+	client = new LeapSRPSession(username, password, params, a_byte);
+		
+	A = client.exponential();
+		
+	assertTrue(Arrays.equals(A, expected_A));
+    }
+
+    public void testResponse() throws NoSuchAlgorithmException {
+	/* Test 1: with intermediate checks */
+	byte[] expected_A = trim(new BigInteger("884380f70a62193bbe3589c4e1dbdc4467b6b5a1b4486e4b779023506fc1f885ae26fa4a5d817b3f38a35f3487b147b82d4bd0069faa64fdc845f7494a78251709e212698e42ced44b0f3849adc73f467afcb26983bd13bdc38906b178003373ddd0ac1d38ce8a39ffa3a7795787207a129a784f4b65ce0b302eb1bcf4045883", 16).toByteArray());
+	byte[] expected_x = new BigInteger("4cb937fd74ee3bb53b79a3174d0c07c14131de9c825897cbca52154e74200602", 16).toByteArray();
+	byte[] expected_M1 = trim(new BigInteger("e6a8efca2c07ef24e0b69be2d4d4a7e74742a4db7a92228218fec0008f7cc94b", 16).toByteArray());
+	String username = "username",
+	    password = "password",
+	    salt = "64c3289d04a6ecad",
+	    a = "8c911355";
+	byte[] a_byte = new BigInteger(a, 16).toByteArray();
+	SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
+	LeapSRPSession client = new LeapSRPSession(username, password, params, a_byte);
+		
+	byte[] x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
+	assertTrue(Arrays.equals(x, expected_x));
+		
+	byte[] A = client.exponential();
+	assertTrue(Arrays.equals(A, expected_A));
+
+	String B = "bc745ba25564fc312f44ea09fb663aa6d95867772e412a6a23f1bc24183e54b32f134372c560f4b3fda19ba7a56b0f84fdcdecc22be6fd256639e918e019691c40a39aa5c9631820e42b28da61b8c75b45afae9d77d63ac8f4dda093762be4a890fbd86061dbd7e5e7c03c4dacde769e0f564df00403e449c0535537f1ba7263";	
+		
+	byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
+	assertTrue(Arrays.equals(M1, expected_M1));
+
+	/* Test 2: no intermediate checks */
+	expected_A = trim(new BigInteger("9ffc407afd7e7ecd32a8ea68aa782b0254a7e2197a955b5aa646fc1fc43ff6ef2239f01b7d5b82f152c870d3e69f3321878ca2acda06dd8fb6ce02f41c7ed48061c78697b01cf353f4222311334c707358b6ec067e317527316bfa85b5ec74537e38b5b14c1100d14c96320f385e5b1dcccde07e728c7ef624353167a29ae461", 16).toByteArray());
+	expected_M1 = trim(new BigInteger("c3203ec1dd55c96038276456c18c447fb4d2a2f896c73c31d56da1781cae79a8", 16).toByteArray());
+	a = "38d5b211";
+		
+	a_byte = new BigInteger(a, 16).toByteArray();
+	params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
+	client = new LeapSRPSession(username, password, params, a_byte);
+	x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
+	A = client.exponential();
+		
+	B = "b8ca7d93dbe2478966ffe025a9f2fb43b9995ce04af9523ea9a3fa4b132136076aa66ead1597c3da23f477ce1cfaf68b5dcc94e146db06cf8391d14a76ce53aab86067b13c93b135d7be6275669b3f51afec6cc41f19e0afca7c3ad5c4d6ee4c09d4b11bcd12e26c727ee56d173b92eea6926e72cc73deebe12dd6f30f44db8a";	
+	M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
+		
+	assertTrue(Arrays.equals(M1, expected_M1));
+		
+	/* Test 3: With intermediate values */
+	expected_M1 = new BigInteger("4c01f65a9bb00f95e435593083040ae1e59e59800c598b42de821c21f3a35223", 16).toByteArray();
+	expected_A = new BigInteger("1bceab3047a6f84495fdd5b4dbe891f0b30f870d7d4e38eaef728f6a7d4e9342d8dae8502fdae4f16b718d2e916a38b16b6def45559a5ebae417a1b115ba6b6a0451c7ff174c3e2507d7d1f18ef646fd065bc9ba165a2a0ae4d6da54f060427178b95b0eff745f5c3f8c4f19ea35addc3ce0daf2aca3328c98bafcf98286d115", 16).toByteArray();
+	B = "41a7b384f2f52312fa79b9dc650ae894f543aea49800cf9477fbcf63e39cbfe6d422f7126777d645cdf749276a3ae9eb6dfcfdb887f8f60ac4094a343013fcebbd40e95b3153f403ab7bb21ea1315aa018bab6ab84017fcb084b3870a8bf1cb717b39c9a28177c61ce7d1738379be9d192dd9793b50ebc3afabe5e78b0a4b017";
+	a = "36ee80ec";
+		
+	a_byte = new BigInteger(a, 16).toByteArray();
+	params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), new BigInteger(salt, 16).toByteArray(), "SHA-256");
+	client = new LeapSRPSession(username, password, params, a_byte);
+	x = client.calculatePasswordHash(username, password, new BigInteger(salt, 16).toByteArray());
+	A = client.exponential();
+		
+	M1 = client.response(new BigInteger(salt, 16).toByteArray(), new BigInteger(B, 16).toByteArray());
+		
+	assertTrue(Arrays.equals(M1, expected_M1));
+    }
 	
-	public void testCalculateV() throws NoSuchAlgorithmException {
-		String expected_v = "502f3ffddc78b866330550c2c60ebd68427c1793237d770e6390d1f794abd47b6786fa5025728d1ca4ec24cfc7a89808278330099ad66456a7c9c88be570b928f9825ac2ecdee31792335f7fa5fc9a78b692c487aa400c7d5cc5c1f2a3a74634c4afa0159600bbf22bf6dfb1e0d85061e55ce8df6243758066503bcf51c83848cf7184209731f89a90d888934c75798828859babe73c17009bf827723fc1bcd0";
+    public void testCalculateV() throws NoSuchAlgorithmException {
+	String expected_v = "502f3ffddc78b866330550c2c60ebd68427c1793237d770e6390d1f794abd47b6786fa5025728d1ca4ec24cfc7a89808278330099ad66456a7c9c88be570b928f9825ac2ecdee31792335f7fa5fc9a78b692c487aa400c7d5cc5c1f2a3a74634c4afa0159600bbf22bf6dfb1e0d85061e55ce8df6243758066503bcf51c83848cf7184209731f89a90d888934c75798828859babe73c17009bf827723fc1bcd0";
 		
-		BigInteger k = new BigInteger("bf66c44a428916cad64aa7c679f3fd897ad4c375e9bbb4cbf2f5de241d618ef0", 16);
-		BigInteger g = new BigInteger("2", 16);
-		BigInteger N = new BigInteger(ConfigHelper.NG_1024, 16);
-		BigInteger x = new BigInteger("4cb937fd74ee3bb53b79a3174d0c07c14131de9c825897cbca52154e74200602", 16);
+	BigInteger k = new BigInteger("bf66c44a428916cad64aa7c679f3fd897ad4c375e9bbb4cbf2f5de241d618ef0", 16);
+	BigInteger g = new BigInteger("2", 16);
+	BigInteger N = new BigInteger(ConfigHelper.NG_1024, 16);
+	BigInteger x = new BigInteger("4cb937fd74ee3bb53b79a3174d0c07c14131de9c825897cbca52154e74200602", 16);
 		
-		BigInteger v = k.multiply(g.modPow(x, N));  // g^x % N
+	BigInteger v = k.multiply(g.modPow(x, N));  // g^x % N
 		
-		assertEquals(v.toString(16), expected_v);
-		assertTrue(Arrays.equals(v.toByteArray(), new BigInteger(expected_v, 16).toByteArray()));
-	}
+	assertEquals(v.toString(16), expected_v);
+	assertTrue(Arrays.equals(v.toByteArray(), new BigInteger(expected_v, 16).toByteArray()));
+    }
 	
-	public void testGetU() throws NoSuchAlgorithmException {
-		/* Test 1 */
-		String Astr = "46b1d1fe038a617966821bd5bb6af967be1bcd6f54c2db5a474cb80b625870e4616953271501a82198d0c14e72b95cdcfc9ec867027b0389aacb313319d4e81604ccf09ce7841dc333be2e03610ae46ec0c8e06b8e86975e0984cae4d0b61c51f1fe5499a4d4d42460261a3e134f841f2cef4d68a583130ee8d730e0b51a858f";
-		String Bstr = "5e1a9ac84b1d9212a0d8f8fe444a34e7da4556a1ef5aebc043ae7276099ccdb305fd7e1c179729e24b484a35c0e33b6a898477590b93e9a4044fc1b8d6bc73db8ac7778f546b25ec3f22e92ab7144e5b974dc58e82a333262063062b6944a2e4393d2a087e4906e6a8cfa0fdfd8a5e5930b7cdb45435cbee7c49dfa1d1216881";
-		String ustr = "759c3cfb6bfaccf07eeb8e46fe6ea290291d4d32faca0681830a372983ab0a61";
-		
-		byte[] Abytes = new BigInteger(Astr, 16).toByteArray();
-		byte[] Bbytes = new BigInteger(Bstr, 16).toByteArray();
-		byte[] expected_u = new BigInteger(ustr, 16).toByteArray();
-		
-		MessageDigest u_digest = MessageDigest.getInstance("SHA256");
-		u_digest.update(trim(Abytes));
-		u_digest.update(trim(Bbytes));
-		byte[] u = new BigInteger(1, u_digest.digest()).toByteArray();
-		
-		assertTrue(Arrays.equals(expected_u, u));
-		
-		/* Test 2 */
-		Astr = "c4013381bdb2fdd901944b9d823360f367c52635b576b9a50d2db77141d357ed391c3ac5fa452c2bbdc35f96bfed21df61627b40aed8f67f21ebf81e5621333f44049d6c9f6ad36464041438350e1f86000a8e3bfb63d4128c18322d2517b0d3ead63fd504a9c8f2156d46e64268110cec5f3ccab54a21559c7ab3ad67fedf90";
-		Bstr = "e5d988752e8f265f01b98a1dcdecc4b685bd512e7cd9507f3c29f206c27dac91e027641eed1765c4603bbd7a9aa7fac300ef67dafe611ba2dbe29a32d83d486296f328d38b44c0c211d01d3fe422aac168b6850c87782338969c54594fc87804d4db34910ad4b5452a81027842ac8d8d8288fd44872e4c719ac8fb971d0a33e1";
-		ustr = "6510328f913b81ba662e564ee5afb7c395ea27c3c0276fc5ca51f0edecd4baf1";
-		
-		Abytes = new BigInteger(Astr, 16).toByteArray();
-		Bbytes = new BigInteger(Bstr, 16).toByteArray();
-		expected_u = new BigInteger(ustr, 16).toByteArray();
-		expected_u = trim(expected_u);
-		
-		u_digest = MessageDigest.getInstance("SHA-256");
-		u_digest.update(trim(Abytes));
-		u_digest.update(trim(Bbytes));
-		u = new BigInteger(1, u_digest.digest()).toByteArray();
-		u = trim(u);
-		
-		assertTrue(Arrays.equals(expected_u, u));
-		
-		/* Test 3 */
-		Astr = "d13973fe4e0e13423cd036caf0912e23a1f9b0c23966f5a5897c8ff17c5cbac8bab7f07d9ac4ee47396a7c68e80ce854c84f243148521277900aaa132a7b93b61e54d742d7f36edb4cdef54bc78cca69ac72653a7ae0fc47ec1e9a84024ea9487a61357e28eddc185e4fe01388e64e6b8f688dd74471d56dd244204522e08483";
-		Bstr = "a6701686d9d987a43f06e8497330c8add8febd191a7a975bced0d058eb03ccc6805263349363b2d54ac435b01155dc41c6067287d9b93e3637ab3b7e8bc7d9cf38d9fdbb2ca9ee8ba1946a46cb555cb7dafcc177fcf7a4b0eb1e5db2249949c1fd15e0b7c1b3616f9e2649bdf074ed841efbdc9f29ee8c8bfcedeaed3dc49378";
-		ustr = "78414ec80cf44225e7ed386dcf2ceb89837327ccae11b761fc77d48c0307977";
-		
-		Abytes = new BigInteger(Astr, 16).toByteArray();
-		Bbytes = new BigInteger(Bstr, 16).toByteArray();
-		expected_u = new BigInteger(ustr, 16).toByteArray();
-		expected_u = trim(expected_u);
-		
-		u_digest = MessageDigest.getInstance("SHA-256");
-		u_digest.update(trim(Abytes));
-		u_digest.update(trim(Bbytes));
-		u = new BigInteger(1, u_digest.digest()).toByteArray();
-		u = trim(u);
-		
-		assertTrue(Arrays.equals(expected_u, u));
-		
-		/* Test 4 */
-		Astr = "ee8bc0cb97dd9c9937759658ff9d791df1dd57b48c5febc2e98af028d0e36eaddf1a3fc555f2bcd6456827e8c7b07ec02a1f365457843bda226bfc1a55c4776879f9df6c916810131ec65a3a4cf473c6a34299d64c91cf26542ea0fc059d24422fc783460c3fafe26bf6f7c24904ae1c5a6421e2f5315030ab007ce8f2c2fd97";
-		Bstr = "95ecbd13b28c7f38318fd664ee97d9e853b0d6e9cbff9a3775a3cc5d5077ffc146aec70d9439e75c19a34b67368b8bd7035ba6254e0a260d99b1e253aae2e0d8f4a13e1ed472f3ef0e3086300cd15d059f6be7d7141ee09071b1c5e5d1c83b250a3c8f1a587f8fe59d49aaeb2cfc7e13a5a58bc76cc8baf7f6a647982c67ee49";
-		ustr = "e28737c7307c84e4d0866b7cf882f22852a764b109634f77a5eb986a96ffcf9a";
-		
-		Abytes = new BigInteger(Astr, 16).toByteArray();
-		Bbytes = new BigInteger(Bstr, 16).toByteArray();
-		expected_u = new BigInteger(ustr, 16).toByteArray();
-		expected_u = trim(expected_u);
-		assertEquals(new BigInteger(1, expected_u).toString(16), ustr);
-		
-		u_digest = MessageDigest.getInstance("SHA-256");
-		u_digest.update(trim(Abytes));
-		u_digest.update(trim(Bbytes));
-		u = new BigInteger(1, u_digest.digest()).toByteArray();
-		u = trim(u);
-		
-		assertTrue(Arrays.equals(expected_u, u));
-	}
+    public void testGetU() throws NoSuchAlgorithmException {
+	/* Test 1 */
+	String Astr = "46b1d1fe038a617966821bd5bb6af967be1bcd6f54c2db5a474cb80b625870e4616953271501a82198d0c14e72b95cdcfc9ec867027b0389aacb313319d4e81604ccf09ce7841dc333be2e03610ae46ec0c8e06b8e86975e0984cae4d0b61c51f1fe5499a4d4d42460261a3e134f841f2cef4d68a583130ee8d730e0b51a858f";
+	String Bstr = "5e1a9ac84b1d9212a0d8f8fe444a34e7da4556a1ef5aebc043ae7276099ccdb305fd7e1c179729e24b484a35c0e33b6a898477590b93e9a4044fc1b8d6bc73db8ac7778f546b25ec3f22e92ab7144e5b974dc58e82a333262063062b6944a2e4393d2a087e4906e6a8cfa0fdfd8a5e5930b7cdb45435cbee7c49dfa1d1216881";
+	String ustr = "759c3cfb6bfaccf07eeb8e46fe6ea290291d4d32faca0681830a372983ab0a61";
+		
+	byte[] Abytes = new BigInteger(Astr, 16).toByteArray();
+	byte[] Bbytes = new BigInteger(Bstr, 16).toByteArray();
+	byte[] expected_u = new BigInteger(ustr, 16).toByteArray();
+		
+	MessageDigest u_digest = MessageDigest.getInstance("SHA256");
+	u_digest.update(trim(Abytes));
+	u_digest.update(trim(Bbytes));
+	byte[] u = new BigInteger(1, u_digest.digest()).toByteArray();
+		
+	assertTrue(Arrays.equals(expected_u, u));
+		
+	/* Test 2 */
+	Astr = "c4013381bdb2fdd901944b9d823360f367c52635b576b9a50d2db77141d357ed391c3ac5fa452c2bbdc35f96bfed21df61627b40aed8f67f21ebf81e5621333f44049d6c9f6ad36464041438350e1f86000a8e3bfb63d4128c18322d2517b0d3ead63fd504a9c8f2156d46e64268110cec5f3ccab54a21559c7ab3ad67fedf90";
+	Bstr = "e5d988752e8f265f01b98a1dcdecc4b685bd512e7cd9507f3c29f206c27dac91e027641eed1765c4603bbd7a9aa7fac300ef67dafe611ba2dbe29a32d83d486296f328d38b44c0c211d01d3fe422aac168b6850c87782338969c54594fc87804d4db34910ad4b5452a81027842ac8d8d8288fd44872e4c719ac8fb971d0a33e1";
+	ustr = "6510328f913b81ba662e564ee5afb7c395ea27c3c0276fc5ca51f0edecd4baf1";
+		
+	Abytes = new BigInteger(Astr, 16).toByteArray();
+	Bbytes = new BigInteger(Bstr, 16).toByteArray();
+	expected_u = new BigInteger(ustr, 16).toByteArray();
+	expected_u = trim(expected_u);
+		
+	u_digest = MessageDigest.getInstance("SHA-256");
+	u_digest.update(trim(Abytes));
+	u_digest.update(trim(Bbytes));
+	u = new BigInteger(1, u_digest.digest()).toByteArray();
+	u = trim(u);
+		
+	assertTrue(Arrays.equals(expected_u, u));
+		
+	/* Test 3 */
+	Astr = "d13973fe4e0e13423cd036caf0912e23a1f9b0c23966f5a5897c8ff17c5cbac8bab7f07d9ac4ee47396a7c68e80ce854c84f243148521277900aaa132a7b93b61e54d742d7f36edb4cdef54bc78cca69ac72653a7ae0fc47ec1e9a84024ea9487a61357e28eddc185e4fe01388e64e6b8f688dd74471d56dd244204522e08483";
+	Bstr = "a6701686d9d987a43f06e8497330c8add8febd191a7a975bced0d058eb03ccc6805263349363b2d54ac435b01155dc41c6067287d9b93e3637ab3b7e8bc7d9cf38d9fdbb2ca9ee8ba1946a46cb555cb7dafcc177fcf7a4b0eb1e5db2249949c1fd15e0b7c1b3616f9e2649bdf074ed841efbdc9f29ee8c8bfcedeaed3dc49378";
+	ustr = "78414ec80cf44225e7ed386dcf2ceb89837327ccae11b761fc77d48c0307977";
+		
+	Abytes = new BigInteger(Astr, 16).toByteArray();
+	Bbytes = new BigInteger(Bstr, 16).toByteArray();
+	expected_u = new BigInteger(ustr, 16).toByteArray();
+	expected_u = trim(expected_u);
+		
+	u_digest = MessageDigest.getInstance("SHA-256");
+	u_digest.update(trim(Abytes));
+	u_digest.update(trim(Bbytes));
+	u = new BigInteger(1, u_digest.digest()).toByteArray();
+	u = trim(u);
+		
+	assertTrue(Arrays.equals(expected_u, u));
+		
+	/* Test 4 */
+	Astr = "ee8bc0cb97dd9c9937759658ff9d791df1dd57b48c5febc2e98af028d0e36eaddf1a3fc555f2bcd6456827e8c7b07ec02a1f365457843bda226bfc1a55c4776879f9df6c916810131ec65a3a4cf473c6a34299d64c91cf26542ea0fc059d24422fc783460c3fafe26bf6f7c24904ae1c5a6421e2f5315030ab007ce8f2c2fd97";
+	Bstr = "95ecbd13b28c7f38318fd664ee97d9e853b0d6e9cbff9a3775a3cc5d5077ffc146aec70d9439e75c19a34b67368b8bd7035ba6254e0a260d99b1e253aae2e0d8f4a13e1ed472f3ef0e3086300cd15d059f6be7d7141ee09071b1c5e5d1c83b250a3c8f1a587f8fe59d49aaeb2cfc7e13a5a58bc76cc8baf7f6a647982c67ee49";
+	ustr = "e28737c7307c84e4d0866b7cf882f22852a764b109634f77a5eb986a96ffcf9a";
+		
+	Abytes = new BigInteger(Astr, 16).toByteArray();
+	Bbytes = new BigInteger(Bstr, 16).toByteArray();
+	expected_u = new BigInteger(ustr, 16).toByteArray();
+	expected_u = trim(expected_u);
+	assertEquals(new BigInteger(1, expected_u).toString(16), ustr);
+		
+	u_digest = MessageDigest.getInstance("SHA-256");
+	u_digest.update(trim(Abytes));
+	u_digest.update(trim(Bbytes));
+	u = new BigInteger(1, u_digest.digest()).toByteArray();
+	u = trim(u);
+		
+	assertTrue(Arrays.equals(expected_u, u));
+    }
 	
-	@SmallTest
-	public void testCalculatePasswordHash() throws UnsupportedEncodingException, NoSuchAlgorithmException {
-		String salt_str = "", username_str = "", password_str = "";
-		String expected_inner = "cfb9ae3ec5433076889c4fe5663926e20bf570cc7950a51c889a314fab2f5ed716bde9c1cc91be14",
-				expected_x = "9736a5e386a18f35bb08cac0f7c70bdbe120f2efe019874d0eb23b85b1955858";
-		
-		/* Test 1 */
-		salt_str = "cfb9ae3ec5433076"; username_str = "nostradamus"; password_str = "$[[//jjiilajfewahug43a89y¿";
-		password_str = password_str.replaceAll("\\\\", "\\\\\\\\");
-		// Calculate x = H(s | H(U | ':' | password))
-		MessageDigest x_digest = MessageDigest.getInstance("SHA-256");
-		
-		// Try to convert the username to a byte[] using UTF-8
-		byte[] user = null;
-		byte[] password_bytes = null;
-		byte[] colon = {};
-
-		String encoding = "UTF-8";
-		encoding = "ISO-8859-1";
-		user = ConfigHelper.trim(username_str.getBytes(encoding));
-		colon = ConfigHelper.trim(":".getBytes(encoding));
-		password_bytes = ConfigHelper.trim(password_str.getBytes(encoding));
+    @SmallTest
+    public void testCalculatePasswordHash() throws UnsupportedEncodingException, NoSuchAlgorithmException {
+	String salt_str = "", username_str = "", password_str = "";
+	String expected_inner = "cfb9ae3ec5433076889c4fe5663926e20bf570cc7950a51c889a314fab2f5ed716bde9c1cc91be14",
+	    expected_x = "9736a5e386a18f35bb08cac0f7c70bdbe120f2efe019874d0eb23b85b1955858";
+		
+	/* Test 1 */
+	salt_str = "cfb9ae3ec5433076"; username_str = "nostradamus"; password_str = "$[[//jjiilajfewahug43a89y¿";
+	password_str = password_str.replaceAll("\\\\", "\\\\\\\\");
+	// Calculate x = H(s | H(U | ':' | password))
+	MessageDigest x_digest = MessageDigest.getInstance("SHA-256");
+		
+	// Try to convert the username to a byte[] using UTF-8
+	byte[] user = null;
+	byte[] password_bytes = null;
+	byte[] colon = {};
+
+	String encoding = "UTF-8";
+	encoding = "ISO-8859-1";
+	user = ConfigHelper.trim(username_str.getBytes(encoding));
+	colon = ConfigHelper.trim(":".getBytes(encoding));
+	password_bytes = ConfigHelper.trim(password_str.getBytes(encoding));
 		
 		// Build the hash
 		x_digest.update(user);
@@ -620,6 +621,19 @@ public class testLeapSRPSession extends TestCase {
 		assertTrue(verified);
 	}
 
+    public void testSignUpMath() throws NoSuchAlgorithmException{
+	String username = "parmegvtest29";
+	String password = "holahola2";
+	byte[] salt = new BigInteger("67e8348d1500d26c", 16).toByteArray();
+	
+	SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), new BigInteger("2").toByteArray(), salt, "SHA-256");
+	LeapSRPSession client = new LeapSRPSession(username, password, params);
+
+	String expected_v = "12bea84e588ffa2f8fc5ae47cb5e751a8f2d9e8125268ad9ab483eff83f98cb08484350eb478bee582b8b72363ff8e7b12e9f332e86f7a0bd77689927c609d275471c6ad2cff8b1e7bbfc3664169c3b7bccb0b974154c1f1656b64274568015ca1b849c9d9890ae4437ed686341b432340809b81c30727ed2aadea8bdec6d101";
+	
+	assertEquals(expected_v, client.calculateV(username, password, salt).toString(16));
+    }
+    
 	public byte[] trim(byte[] in) {
 		if(in.length == 0 || in[0] != 0)
 			return in;