Merge branch 'develop'

10 files changed, 892 insertions, 483 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4795488d..5eb17444 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ android {
 	}
     }
 
-    check.dependsOn connectedCheck
+    //check.dependsOn connectedCheck
  }
 
 dependencies {
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;
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 9f4b8d27..dd7af633 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -172,6 +172,13 @@ public class ProviderAPI extends IntentService {
 					receiver.send(PROVIDER_NOK, result);
 				}
 			}
+		} else if (action.equalsIgnoreCase(SRP_REGISTER)) {
+		    Bundle session_id_bundle = registerWithSRP(parameters);
+		    if(session_id_bundle.getBoolean(RESULT_KEY)) {
+			receiver.send(SRP_REGISTRATION_SUCCESSFUL, session_id_bundle);
+		    } else {
+			receiver.send(SRP_REGISTRATION_FAILED, session_id_bundle);
+		    }
 		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
 			Bundle session_id_bundle = authenticateBySRP(parameters);
 				if(session_id_bundle.getBoolean(RESULT_KEY)) {
@@ -193,7 +200,47 @@ public class ProviderAPI extends IntentService {
 				}
 		}
 	}
-	
+
+    private Bundle registerWithSRP(Bundle task) {
+	Bundle session_id_bundle = new Bundle();
+	int progress = 0;
+		
+	String username = (String) task.get(LogInDialog.USERNAME);
+	String password = (String) task.get(LogInDialog.PASSWORD);
+	String authentication_server = (String) task.get(Provider.API_URL);
+	if(validUserLoginData(username, password)) {
+		
+	    SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
+	    LeapSRPSession client = new LeapSRPSession(username, password, params);
+	    byte[] salt = ConfigHelper.trim(client.calculateNewSalt());
+	    // byte[] salted_password = client.calculatePasswordHash(username, password, salt);
+	    /* Calculate password verifier */
+	    BigInteger password_verifier = client.calculateV(username, password, salt);
+	    /* Send to the server */
+	    JSONObject result = sendNewUserDataToSRPServer(authentication_server, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
+	    if(result.has(ERRORS))
+		session_id_bundle = authFailedNotification(result, username);
+	    else {
+		session_id_bundle.putString(LogInDialog.USERNAME, username);
+		session_id_bundle.putString(LogInDialog.PASSWORD, password);
+		session_id_bundle.putBoolean(RESULT_KEY, true);
+	    }
+	    Log.d(TAG, result.toString());
+	    broadcast_progress(progress++);
+	} else {
+	    if(!wellFormedPassword(password)) {
+		session_id_bundle.putBoolean(RESULT_KEY, false);
+		session_id_bundle.putString(LogInDialog.USERNAME, username);
+		session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+	    }
+	    if(username.isEmpty()) {
+		session_id_bundle.putBoolean(RESULT_KEY, false);
+		session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+	    }
+	}
+		
+	return session_id_bundle;
+    }
 	/**
 	 * Starts the authentication process using SRP protocol.
 	 * 
@@ -201,88 +248,87 @@ public class ProviderAPI extends IntentService {
 	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if authentication was successful. 
 	 */
 	private Bundle authenticateBySRP(Bundle task) {
-		Bundle session_id_bundle = new Bundle();
-		int progress = 0;
+	    Bundle session_id_bundle = new Bundle();
+	    int progress = 0;
 		
-		String username = (String) task.get(LogInDialog.USERNAME);
-		String password = (String) task.get(LogInDialog.PASSWORD);
-		if(validUserLoginData(username, password)) {
+	    String username = (String) task.get(LogInDialog.USERNAME);
+	    String password = (String) task.get(LogInDialog.PASSWORD);
+	    if(validUserLoginData(username, password)) {
 		
-			String authentication_server = (String) task.get(Provider.API_URL);
-
-			SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
-			LeapSRPSession client = new LeapSRPSession(username, password, params);
-			byte[] A = client.exponential();
+		String authentication_server = (String) task.get(Provider.API_URL);
+		JSONObject authentication_step_result = new JSONObject();
+
+		SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
+		LeapSRPSession client = new LeapSRPSession(username, password, params);
+		byte[] A = client.exponential();
+		broadcast_progress(progress++);
+		authentication_step_result = sendAToSRPServer(authentication_server, username, new BigInteger(1, A).toString(16));
+		try {
+		    String salt = authentication_step_result.getString(LeapSRPSession.SALT);
+		    broadcast_progress(progress++);
+		    byte[] Bbytes = new BigInteger(authentication_step_result.getString("B"), 16).toByteArray();
+		    byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
+		    if(M1 != null) {
 			broadcast_progress(progress++);
-			try {
-				JSONObject saltAndB = sendAToSRPServer(authentication_server, username, new BigInteger(1, A).toString(16));
-				if(saltAndB.length() > 0) {
-					String salt = saltAndB.getString(LeapSRPSession.SALT);
-					broadcast_progress(progress++);
-					byte[] Bbytes = new BigInteger(saltAndB.getString("B"), 16).toByteArray();
-					byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
-					if(M1 != null) {
-					broadcast_progress(progress++);
-					JSONObject session_idAndM2 = sendM1ToSRPServer(authentication_server, username, M1);
-					  if(session_idAndM2.has(LeapSRPSession.M2) && client.verify((byte[])session_idAndM2.get(LeapSRPSession.M2))) {
-						  session_id_bundle.putBoolean(RESULT_KEY, true);
-						  broadcast_progress(progress++);
-					  } else {
-						  session_id_bundle.putBoolean(RESULT_KEY, false);
-						  session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
-						  session_id_bundle.putString(LogInDialog.USERNAME, username);
-					  }
-					} else {
-						session_id_bundle.putBoolean(RESULT_KEY, false);
-						session_id_bundle.putString(LogInDialog.USERNAME, username);
-						session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
-					}
-					broadcast_progress(progress++);
-				} else {
-					session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
-					session_id_bundle.putString(LogInDialog.USERNAME, username);
-					session_id_bundle.putBoolean(RESULT_KEY, false);
-				}
-			} catch (ClientProtocolException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_client_http_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (IOException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_io_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (JSONException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_json_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (NoSuchAlgorithmException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_no_such_algorithm_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (KeyManagementException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (KeyStoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (CertificateException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		} else {
-			if(!wellFormedPassword(password)) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-				session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
-			}
-			if(username.isEmpty()) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+			authentication_step_result = sendM1ToSRPServer(authentication_server, username, M1);
+			setTokenIfAvailable(authentication_step_result);
+			byte[] M2 = new BigInteger(authentication_step_result.getString(LeapSRPSession.M2), 16).toByteArray();
+			if(client.verify(M2)) {
+			    session_id_bundle.putBoolean(RESULT_KEY, true);
+			    broadcast_progress(progress++);
+			} else {
+			    authFailedNotification(authentication_step_result, username);
 			}
+		    } else {
+			session_id_bundle.putBoolean(RESULT_KEY, false);
+			session_id_bundle.putString(LogInDialog.USERNAME, username);
+			session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
+		    }
+		} catch (JSONException e) {
+		    session_id_bundle = authFailedNotification(authentication_step_result, username);
+		    e.printStackTrace();
+		}
+		broadcast_progress(progress++);
+	    } else {
+		if(!wellFormedPassword(password)) {
+		    session_id_bundle.putBoolean(RESULT_KEY, false);
+		    session_id_bundle.putString(LogInDialog.USERNAME, username);
+		    session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
 		}
+		if(username.isEmpty()) {
+		    session_id_bundle.putBoolean(RESULT_KEY, false);
+		    session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		}
+	    }
 		
-		return session_id_bundle;
+	    return session_id_bundle;
+	}
+
+    private boolean setTokenIfAvailable(JSONObject authentication_step_result) {
+	try {
+	    LeapSRPSession.setToken(authentication_step_result.getString(LeapSRPSession.TOKEN));
+	    CookieHandler.setDefault(null); // we don't need cookies anymore
+	} catch(JSONException e) { //
+	    return false;
 	}
+	return true;
+    }
+    
+    private Bundle authFailedNotification(JSONObject result, String username) {
+	Bundle user_notification_bundle = new Bundle();
+	try{
+	    JSONObject error_message = result.getJSONObject(ERRORS);
+	    String error_type = error_message.keys().next().toString();
+	    String message = error_message.get(error_type).toString();
+	    user_notification_bundle.putString(getResources().getString(R.string.user_message), message);
+	} catch(JSONException e) {}
+	
+	if(!username.isEmpty())
+	    user_notification_bundle.putString(LogInDialog.USERNAME, username);
+	user_notification_bundle.putBoolean(RESULT_KEY, false);
+
+	return user_notification_bundle;
+    }
 	
 	/**
 	 * Sets up an intent with the progress value passed as a parameter
@@ -330,14 +376,11 @@ public class ProviderAPI extends IntentService {
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendAToSRPServer(String server_url, String username, String clientA) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+	private JSONObject sendAToSRPServer(String server_url, String username, String clientA) {
 		Map<String, String> parameters = new HashMap<String, String>();
 		parameters.put("login", username);
 		parameters.put("A", clientA);
 		return sendToServer(server_url + "/sessions.json", "POST", parameters);
-		
-		/*HttpPost post = new HttpPost(server_url + "/sessions.json" + "?" + "login=" + username + "&&" + "A=" + clientA);
-		return sendToServer(post);*/
 	}
 
 	/**
@@ -354,72 +397,106 @@ public class ProviderAPI extends IntentService {
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+	private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1) {
 		Map<String, String> parameters = new HashMap<String, String>();
 		parameters.put("client_auth", new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
 		
-		//HttpPut put = new HttpPut(server_url + "/sessions/" + username +".json" + "?" + "client_auth" + "=" + new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
-		JSONObject json_response = sendToServer(server_url + "/sessions/" + username +".json", "PUT", parameters);
-
-		JSONObject session_idAndM2 = new JSONObject();
-		if(json_response.length() > 0) {
-			byte[] M2_not_trimmed = new BigInteger(json_response.getString(LeapSRPSession.M2), 16).toByteArray();
-			/*Cookie session_id_cookie = LeapHttpClient.getInstance(getApplicationContext()).getCookieStore().getCookies().get(0);
-			session_idAndM2.put(ConfigHelper.SESSION_ID_COOKIE_KEY, session_id_cookie.getName());
-			session_idAndM2.put(ConfigHelper.SESSION_ID_KEY, session_id_cookie.getValue());*/
-			session_idAndM2.put(LeapSRPSession.M2, ConfigHelper.trim(M2_not_trimmed));
-			CookieHandler.setDefault(null); // we don't need cookies anymore
-			String token = json_response.getString(LeapSRPSession.TOKEN);
-			LeapSRPSession.setToken(token);
-		}
-		return session_idAndM2;
+		return sendToServer(server_url + "/sessions/" + username +".json", "PUT", parameters);
 	}
-	
+
 	/**
-	 * Executes an HTTP request expecting a JSON response.
-	 * @param url
-	 * @param request_method
-	 * @param parameters
+	 * Sends an HTTP POST request to the api server to register a new user.
+	 * @param server_url
+	 * @param username
+	 * @param salted_password
+	 * @param password_verifier   
 	 * @return response from authentication server
+	 * @throws ClientProtocolException
 	 * @throws IOException
 	 * @throws JSONException
-	 * @throws MalformedURLException 
 	 * @throws CertificateException 
 	 * @throws NoSuchAlgorithmException 
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendToServer(String url, String request_method, Map<String, String> parameters) throws JSONException, MalformedURLException, IOException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
-		JSONObject json_response;
+    private JSONObject sendNewUserDataToSRPServer(String server_url, String username, String salt, String password_verifier) {
+	Map<String, String> parameters = new HashMap<String, String>();
+	parameters.put("user[login]", username);
+	parameters.put("user[password_salt]", salt);
+	parameters.put("user[password_verifier]", password_verifier);
+	Log.d(TAG, server_url);
+	Log.d(TAG, parameters.toString());
+	return sendToServer(server_url + "/users", "POST", parameters);
+    }
+	
+	/**
+	 * Executes an HTTP request expecting a JSON response.
+	 * @param url
+	 * @param request_method
+	 * @param parameters
+	 * @return response from authentication server
+	 */
+	private JSONObject sendToServer(String url, String request_method, Map<String, String> parameters) {
+	    JSONObject json_response;
+	    HttpsURLConnection urlConnection = null;
+	    try {
 		InputStream is = null;
-		HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(url).openConnection();
+		urlConnection = (HttpsURLConnection)new URL(url).openConnection();
 		urlConnection.setRequestMethod(request_method);
 		urlConnection.setChunkedStreamingMode(0);
 		urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+		
+		DataOutputStream writer = new DataOutputStream(urlConnection.getOutputStream());
+		writer.writeBytes(formatHttpParameters(parameters));
+		writer.close();
+
+		is = urlConnection.getInputStream();
+		String plain_response = new Scanner(is).useDelimiter("\\A").next();
+		json_response = new JSONObject(plain_response);
+	    } catch (ClientProtocolException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (IOException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (JSONException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (NoSuchAlgorithmException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (KeyManagementException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (KeyStoreException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (CertificateException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    }
+
+	    return json_response;
+	}
+
+    private JSONObject getErrorMessage(HttpsURLConnection urlConnection) {
+	JSONObject error_message = new JSONObject();
+	if(urlConnection != null) {
+	    InputStream error_stream = urlConnection.getErrorStream();
+	    if(error_stream != null) {
+		String error_response = new Scanner(error_stream).useDelimiter("\\A").next();
+		Log.d("Error", error_response);
 		try {
-			
-			DataOutputStream writer = new DataOutputStream(urlConnection.getOutputStream());
-			writer.writeBytes(formatHttpParameters(parameters));
-			writer.close();
-
-			is = urlConnection.getInputStream();
-			String plain_response = new Scanner(is).useDelimiter("\\A").next();
-			json_response = new JSONObject(plain_response);
-		} finally {
-			InputStream error_stream = urlConnection.getErrorStream();
-			if(error_stream != null) {
-				String error_response = new Scanner(error_stream).useDelimiter("\\A").next();
-				urlConnection.disconnect();
-				Log.d("Error", error_response);
-				json_response = new JSONObject(error_response);
-				if(!json_response.isNull(ERRORS) || json_response.has(ERRORS)) {
-					return new JSONObject();
-				}
-			}
+		    error_message = new JSONObject(error_response);
+		} catch (JSONException e) {
+		    Log.d(TAG, e.getMessage());
+		    e.printStackTrace();
 		}
-
-		return json_response;
+		urlConnection.disconnect();
+	    }
 	}
+	return error_message;
+    }
 	
 	private String formatHttpParameters(Map<String, String> parameters) throws UnsupportedEncodingException	{
 	    StringBuilder result = new StringBuilder();
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 3c17ebb8..6f18b79a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -21,6 +21,7 @@ import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
+import se.leap.bitmaskclient.SignUpDialog;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
@@ -50,7 +51,7 @@ import android.widget.Toast;
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author parmegv
  */
-public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface,Receiver {
+public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface, SignUpDialog.SignUpDialogInterface, Receiver {
 
 	protected static final int CONFIGURE_LEAP = 0;
 	protected static final int SWITCH_PROVIDER = 1;
@@ -204,6 +205,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 					menu.findItem(R.id.login_button).setVisible(true);
 					menu.findItem(R.id.logout_button).setVisible(false);
 				}
+				menu.findItem(R.id.signup_button).setVisible(true);
 			}
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
@@ -243,6 +245,9 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		case R.id.logout_button:
 			logOut();
 			return true;
+		case R.id.signup_button:
+			signUpDialog(((ViewGroup)findViewById(android.R.id.content)).getChildAt(0), Bundle.EMPTY);
+			return true;
 		default:
 				return super.onOptionsItemSelected(item);
 		}
@@ -286,6 +291,15 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	EipServiceFragment eipFragment = (EipServiceFragment) getFragmentManager().findFragmentByTag(EipServiceFragment.TAG);
 	eipFragment.checkEipSwitch(false);
     }
+
+    public void cancelLoginOrSignup() {
+	if(mProgressBar == null) mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
+	if(mProgressBar != null) {
+	    mProgressBar.setVisibility(ProgressBar.GONE);
+	    if(eipStatus == null) eipStatus = (TextView) findViewById(R.id.eipStatus);
+	    if(eipStatus != null) eipStatus.setText("");
+	}
+    }
 	
 	/**
 	 * Asks ProviderAPI to log out.
@@ -340,6 +354,58 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    newFragment.show(fragment_transaction, LogInDialog.TAG);
 	}
 
+    	@Override
+	public void signUp(String username, String password) {
+	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
+	    eipStatus = (TextView) findViewById(R.id.eipStatus);
+		
+	    providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());
+	    providerAPI_result_receiver.setReceiver(this);
+		
+	    Intent provider_API_command = new Intent(this, ProviderAPI.class);
+
+	    Bundle parameters = new Bundle();
+	    parameters.putString(SignUpDialog.USERNAME, username);
+	    parameters.putString(SignUpDialog.PASSWORD, password);
+
+	    JSONObject provider_json;
+	    try {
+		provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
+		parameters.putString(Provider.API_URL, provider_json.getString(Provider.API_URL) + "/" + provider_json.getString(Provider.API_VERSION));
+	    } catch (JSONException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	    }
+
+	    provider_API_command.setAction(ProviderAPI.SRP_REGISTER);
+	    provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
+	    provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+		
+	    mProgressBar.setVisibility(ProgressBar.VISIBLE);
+	    eipStatus.setText(R.string.signingup_message);
+	    //mProgressBar.setMax(4);
+	    startService(provider_API_command);
+	}
+    
+	/**
+	 * Shows the sign up dialog.
+	 * @param view from which the dialog is created.
+	 */
+	public void signUpDialog(View view, Bundle resultData) {
+	    FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();
+	    Fragment previous_sign_up_dialog = getFragmentManager().findFragmentByTag(SignUpDialog.TAG);
+	    if (previous_sign_up_dialog != null) {
+	        fragment_transaction.remove(previous_sign_up_dialog);
+	    }
+	    fragment_transaction.addToBackStack(null);
+
+	    DialogFragment newFragment = SignUpDialog.newInstance();
+	    if(resultData != null && !resultData.isEmpty()) {
+	    	newFragment.setArguments(resultData);
+	    }
+	    newFragment.show(fragment_transaction, SignUpDialog.TAG);
+	}
+
 	/**
 	 * Asks ProviderAPI to download an authenticated OpenVPN certificate.
 	 * @param session_id cookie for the server to allow us to download the certificate.
@@ -364,7 +430,11 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
 	@Override
 	public void onReceiveResult(int resultCode, Bundle resultData) {
-		if(resultCode == ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL){
+	    if(resultCode == ProviderAPI.SRP_REGISTRATION_SUCCESSFUL){
+		authenticate(resultData.getString(LogInDialog.USERNAME), resultData.getString(LogInDialog.PASSWORD));
+	    } else if(resultCode == ProviderAPI.SRP_REGISTRATION_FAILED){
+		signUpDialog(((ViewGroup)findViewById(android.R.id.content)).getChildAt(0), resultData);
+	    } else if(resultCode == ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL){
 			String session_id_cookie_key = resultData.getString(ProviderAPI.SESSION_ID_COOKIE_KEY);
 			String session_id_string = resultData.getString(ProviderAPI.SESSION_ID_KEY);
 			setResult(RESULT_OK);
@@ -379,7 +449,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
         	//Cookie session_id = new BasicClientCookie(session_id_cookie_key, session_id_string);
         	downloadAuthedUserCertificate(/*session_id*/);
 		} else if(resultCode == ProviderAPI.SRP_AUTHENTICATION_FAILED) {
-        	logInDialog(getCurrentFocus(), resultData);
+		    logInDialog(getCurrentFocus(), resultData);
 		} else if(resultCode == ProviderAPI.LOGOUT_SUCCESSFUL) {
 			authed_eip = false;
 			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(EIP.AUTHED_EIP, authed_eip).commit();
diff --git a/app/src/main/java/se/leap/bitmaskclient/LeapSRPSession.java b/app/src/main/java/se/leap/bitmaskclient/LeapSRPSession.java
index a317d95e..29b429d1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/LeapSRPSession.java
+++ b/app/src/main/java/se/leap/bitmaskclient/LeapSRPSession.java
@@ -16,13 +16,13 @@
  */
  package se.leap.bitmaskclient;
 
+
 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;
 
 /**
@@ -42,6 +42,7 @@ public class LeapSRPSession {
 	final public static String M2 = "M2";
 	final public static String TOKEN = "token";
 	final public static String AUTHORIZATION_HEADER= "Authorization";
+    	final public static String TAG= "Leap SRP session class tag";
 	
 	private SRPParameters params;
 	private String username;
@@ -155,14 +156,23 @@ public class LeapSRPSession {
 		return x_digest_bytes;
 	}
 
+    public byte[] calculateNewSalt() {
+	try {
+	    BigInteger salt = new BigInteger(64, SecureRandom.getInstance("SHA1PRNG"));
+	    return salt.toByteArray();
+	} catch(NoSuchAlgorithmException e) {
+	    e.printStackTrace();
+	}
+	return null;
+    }
 	/**
 	 * Calculates the parameter V of the SRP-6a algorithm.
-	 * @param k_string constant k predefined by the SRP server implementation.
 	 * @return the value of V
 	 */
-	private BigInteger calculateV(String k_string) {
-		BigInteger k = new BigInteger(k_string, 16);
-		BigInteger v = k.multiply(g.modPow(x, N));  // g^x % N
+    public BigInteger calculateV(String username, String password, byte[] salt) {
+		byte[] x_bytes = calculatePasswordHash(username, password, ConfigHelper.trim(salt));
+		x = new BigInteger(1, x_bytes);
+		BigInteger v = g.modPow(x, N);  // g^x % N
 		return v;
 	}
 
@@ -209,17 +219,11 @@ public class LeapSRPSession {
 	 * @return the parameter M1
 	 * @throws NoSuchAlgorithmException
 	 */
-	public byte[] response(byte[] salt_bytes, byte[] Bbytes) throws NoSuchAlgorithmException {
+    public byte[] response(byte[] salt_bytes, byte[] Bbytes) {
 		// Calculate x = H(s | H(U | ':' | password))
 		byte[] M1 = null;
 		if(new BigInteger(1, Bbytes).mod(new BigInteger(1, N_bytes)) != BigInteger.ZERO) {
-			byte[] xb = calculatePasswordHash(username, password, ConfigHelper.trim(salt_bytes));
-			this.x = new BigInteger(1, xb);
-
-			// Calculate v = kg^x mod N
-			String k_string = "bf66c44a428916cad64aa7c679f3fd897ad4c375e9bbb4cbf2f5de241d618ef0";
-			this.v = calculateV(k_string);
-
+		    this.v = calculateV(username, password, salt_bytes);
 			// H(N)
 			byte[] digest_of_n = newDigest().digest(N_bytes);
 
@@ -253,8 +257,7 @@ public class LeapSRPSession {
 			byte[] S_bytes = ConfigHelper.trim(S.toByteArray());
 
 			// K = SessionHash(S)
-			String hash_algorithm = params.hashAlgorithm;
-			MessageDigest sessionDigest = MessageDigest.getInstance(hash_algorithm);
+			MessageDigest sessionDigest = newDigest();
 			K = ConfigHelper.trim(sessionDigest.digest(S_bytes));
 
 			// clientHash = H(N) xor H(g) | H(U) | A | B | K
@@ -283,8 +286,9 @@ public class LeapSRPSession {
 		
 		BigInteger B = new BigInteger(1, Bbytes);
 		BigInteger u = new BigInteger(1, u_bytes);
-		
-		BigInteger B_minus_v = B.subtract(v);
+		String k_string = "bf66c44a428916cad64aa7c679f3fd897ad4c375e9bbb4cbf2f5de241d618ef0";
+		BigInteger k = new BigInteger(k_string, 16);
+		BigInteger B_minus_v = B.subtract(k.multiply(v));
 		BigInteger a_ux = a.add(u.multiply(x));
 		BigInteger S = B_minus_v.modPow(a_ux, N);
 		return S;
@@ -338,4 +342,8 @@ public class LeapSRPSession {
 		}
 		return md;
 	}
+
+    public byte[] getK() {
+	return K;
+    }
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java b/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java
index a28c9049..45d3a373 100644
--- a/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java
@@ -99,6 +99,14 @@ public class LogInDialog extends DialogFragment {
 			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int id) {
 					dialog.cancel();
+					interface_with_Dashboard.cancelLoginOrSignup();
+				}
+			})
+		    .setNeutralButton(R.string.signup_button, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id) {
+					String username = username_field.getText().toString();
+					String password = password_field.getText().toString();
+					interface_with_Dashboard.signUp(username, password);
 				}
 			});
 		
@@ -112,13 +120,10 @@ public class LogInDialog extends DialogFragment {
 	 *
 	 */
 	public interface LogInDialogInterface {
-		/**
-		 * Starts authentication process.
-		 * @param username
-		 * @param password
-		 */
 	    public void authenticate(String username, String password);
 	    public void cancelAuthedEipOn();
+	    public void signUp(String username, String password);
+	    public void cancelLoginOrSignup();
     }
 
 	LogInDialogInterface interface_with_Dashboard;
diff --git a/app/src/main/java/se/leap/bitmaskclient/SignUpDialog.java b/app/src/main/java/se/leap/bitmaskclient/SignUpDialog.java
new file mode 100644
index 00000000..120d4eec
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/SignUpDialog.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+ package se.leap.bitmaskclient;
+
+import se.leap.bitmaskclient.R;
+import android.R.color;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.provider.CalendarContract.Colors;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.BounceInterpolator;
+import android.widget.EditText;
+import android.widget.TextView;
+
+/**
+ * Implements the sign up dialog, currently without progress dialog.
+ * 
+ * It returns to the previous fragment when finished, and sends username and password to the registration method.
+ * 
+ * It also notifies the user if the password is not valid. 
+ * 
+ * @author parmegv
+ *
+ */
+public class SignUpDialog extends DialogFragment {
+     
+	final public static String TAG = "signUpDialog";
+	final public static String VERB = "log in";
+	final public static String USERNAME = "username";
+	final public static String PASSWORD = "password";
+	final public static String USERNAME_MISSING = "username missing";
+	final public static String PASSWORD_INVALID_LENGTH = "password_invalid_length";
+
+    private static boolean is_eip_pending = false;
+    
+	public AlertDialog onCreateDialog(Bundle savedInstanceState) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		LayoutInflater inflater = getActivity().getLayoutInflater();
+		View log_in_dialog_view = inflater.inflate(R.layout.log_in_dialog, null);
+
+		final TextView user_message = (TextView)log_in_dialog_view.findViewById(R.id.user_message);
+		if(getArguments() != null && getArguments().containsKey(getResources().getString(R.string.user_message))) {
+			user_message.setText(getArguments().getString(getResources().getString(R.string.user_message)));
+		} else {
+			user_message.setVisibility(View.GONE);
+		}
+		
+		final EditText username_field = (EditText)log_in_dialog_view.findViewById(R.id.username_entered);
+		if(getArguments() != null && getArguments().containsKey(USERNAME)) {
+			String username = getArguments().getString(USERNAME);
+			username_field.setText(username);
+		}
+		if (getArguments() != null && getArguments().containsKey(USERNAME_MISSING)) {
+			username_field.setError(getResources().getString(R.string.username_ask));
+    	}
+		
+		final EditText password_field = (EditText)log_in_dialog_view.findViewById(R.id.password_entered);
+		if(!username_field.getText().toString().isEmpty() && password_field.isFocusable()) {
+			password_field.requestFocus();
+		}
+		if (getArguments() != null && getArguments().containsKey(PASSWORD_INVALID_LENGTH)) {
+		    password_field.setError(getResources().getString(R.string.error_not_valid_password_user_message));
+		}
+		if(getArguments() != null && getArguments().getBoolean(EipServiceFragment.IS_EIP_PENDING, false)) {
+			is_eip_pending = true;
+		    }
+
+		
+		builder.setView(log_in_dialog_view)
+			.setPositiveButton(R.string.signup_button, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id) {
+					String username = username_field.getText().toString();
+					String password = password_field.getText().toString();
+					dialog.dismiss();
+					interface_with_Dashboard.signUp(username, password);
+				}
+			})
+			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id) {
+					dialog.cancel();
+					interface_with_Dashboard.cancelLoginOrSignup();
+				}
+			});
+		
+		return builder.create();
+	}
+	
+	/**
+	 * Interface used to communicate SignUpDialog with Dashboard.
+	 * 
+	 * @author parmegv
+	 *
+	 */
+	public interface SignUpDialogInterface {
+	    public void signUp(String username, String password);
+	    public void cancelAuthedEipOn();
+	    public void cancelLoginOrSignup();
+    }
+
+	SignUpDialogInterface interface_with_Dashboard;
+
+	/**
+	 * @return a new instance of this DialogFragment.
+	 */
+	public static DialogFragment newInstance() {
+		SignUpDialog dialog_fragment = new SignUpDialog();
+		return dialog_fragment;
+	}
+	
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+        	interface_with_Dashboard = (SignUpDialogInterface) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement SignUpDialogListener");
+        }
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+	if(is_eip_pending)
+	    interface_with_Dashboard.cancelAuthedEipOn();
+	super.onCancel(dialog);	    
+    }
+}
diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
index 676c07c7..663231cd 100644
--- a/app/src/main/res/menu/client_dashboard.xml
+++ b/app/src/main/res/menu/client_dashboard.xml
@@ -6,18 +6,20 @@
     <item
         android:id="@+id/switch_provider"
         android:orderInCategory="501"
-        android:title="@string/switch_provider_menu_option"/>  
+        android:title="@string/switch_provider_menu_option"/>
+    <item
+        android:id="@+id/signup_button"
+        android:title="@string/signup_button"
+        android:visible="false"/>
     <item
         android:id="@+id/login_button"
         android:showAsAction="ifRoom"
         android:title="@string/login_button"
-        android:visible="false">
-    </item>
+        android:visible="false"/>
     <item
         android:id="@+id/logout_button"
         android:showAsAction="ifRoom"
         android:title="@string/logout_button"
-        android:visible="false">
-    </item>
+        android:visible="false"/>
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 492c48c7..ac692a69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,6 +116,7 @@
     <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
+    <string name="signup_button">Sign Up</string>
     <string name="setup_error_title">Configuration Error</string>
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
@@ -126,6 +127,7 @@
     <string name="configuring_provider">Configuring provider</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="authenticating_message">Logging in</string>
+    <string name="signingup_message">Signing up</string>
     <string name="logout_message">Logging out from this session.</string>
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 150b27b2..6d1ff879 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -167,6 +167,13 @@ public class ProviderAPI extends IntentService {
 					receiver.send(PROVIDER_NOK, result);
 				}
 			}
+		} else if (action.equalsIgnoreCase(SRP_REGISTER)) {
+		    Bundle session_id_bundle = registerWithSRP(parameters);
+		    if(session_id_bundle.getBoolean(RESULT_KEY)) {
+			receiver.send(SRP_REGISTRATION_SUCCESSFUL, session_id_bundle);
+		    } else {
+			receiver.send(SRP_REGISTRATION_FAILED, session_id_bundle);
+		    }
 		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
 			Bundle session_id_bundle = authenticateBySRP(parameters);
 				if(session_id_bundle.getBoolean(RESULT_KEY)) {
@@ -188,6 +195,47 @@ public class ProviderAPI extends IntentService {
 				}
 		}
 	}
+
+    private Bundle registerWithSRP(Bundle task) {
+	Bundle session_id_bundle = new Bundle();
+	int progress = 0;
+		
+	String username = (String) task.get(LogInDialog.USERNAME);
+	String password = (String) task.get(LogInDialog.PASSWORD);
+	String authentication_server = (String) task.get(Provider.API_URL);
+	if(validUserLoginData(username, password)) {
+		
+	    SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
+	    LeapSRPSession client = new LeapSRPSession(username, password, params);
+	    byte[] salt = ConfigHelper.trim(client.calculateNewSalt());
+	    // byte[] salted_password = client.calculatePasswordHash(username, password, salt);
+	    /* Calculate password verifier */
+	    BigInteger password_verifier = client.calculateV(username, password, salt);
+	    /* Send to the server */
+	    JSONObject result = sendNewUserDataToSRPServer(authentication_server, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
+	    if(result.has(ERRORS))
+		session_id_bundle = authFailedNotification(result, username);
+	    else {
+		session_id_bundle.putString(LogInDialog.USERNAME, username);
+		session_id_bundle.putString(LogInDialog.PASSWORD, password);
+		session_id_bundle.putBoolean(RESULT_KEY, true);
+	    }
+	    Log.d(TAG, result.toString());
+	    broadcast_progress(progress++);
+	} else {
+	    if(!wellFormedPassword(password)) {
+		session_id_bundle.putBoolean(RESULT_KEY, false);
+		session_id_bundle.putString(LogInDialog.USERNAME, username);
+		session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+	    }
+	    if(username.isEmpty()) {
+		session_id_bundle.putBoolean(RESULT_KEY, false);
+		session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+	    }
+	}
+		
+	return session_id_bundle;
+    }
 	
 	/**
 	 * Starts the authentication process using SRP protocol.
@@ -196,88 +244,87 @@ public class ProviderAPI extends IntentService {
 	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if authentication was successful. 
 	 */
 	private Bundle authenticateBySRP(Bundle task) {
-		Bundle session_id_bundle = new Bundle();
-		int progress = 0;
+	    Bundle session_id_bundle = new Bundle();
+	    int progress = 0;
 		
-		String username = (String) task.get(LogInDialog.USERNAME);
-		String password = (String) task.get(LogInDialog.PASSWORD);
-		if(validUserLoginData(username, password)) {
+	    String username = (String) task.get(LogInDialog.USERNAME);
+	    String password = (String) task.get(LogInDialog.PASSWORD);
+	    if(validUserLoginData(username, password)) {
 		
-			String authentication_server = (String) task.get(Provider.API_URL);
-
-			SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
-			LeapSRPSession client = new LeapSRPSession(username, password, params);
-			byte[] A = client.exponential();
+		String authentication_server = (String) task.get(Provider.API_URL);
+		JSONObject authentication_step_result = new JSONObject();
+
+		SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
+		LeapSRPSession client = new LeapSRPSession(username, password, params);
+		byte[] A = client.exponential();
+		broadcast_progress(progress++);
+		authentication_step_result = sendAToSRPServer(authentication_server, username, new BigInteger(1, A).toString(16));
+		try {
+		    String salt = authentication_step_result.getString(LeapSRPSession.SALT);
+		    broadcast_progress(progress++);
+		    byte[] Bbytes = new BigInteger(authentication_step_result.getString("B"), 16).toByteArray();
+		    byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
+		    if(M1 != null) {
 			broadcast_progress(progress++);
-			try {
-				JSONObject saltAndB = sendAToSRPServer(authentication_server, username, new BigInteger(1, A).toString(16));
-				if(saltAndB.length() > 0) {
-					String salt = saltAndB.getString(LeapSRPSession.SALT);
-					broadcast_progress(progress++);
-					byte[] Bbytes = new BigInteger(saltAndB.getString("B"), 16).toByteArray();
-					byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
-					if(M1 != null) {
-					broadcast_progress(progress++);
-					JSONObject session_idAndM2 = sendM1ToSRPServer(authentication_server, username, M1);
-					  if(session_idAndM2.has(LeapSRPSession.M2) && client.verify((byte[])session_idAndM2.get(LeapSRPSession.M2))) {
-						  session_id_bundle.putBoolean(RESULT_KEY, true);
-						  broadcast_progress(progress++);
-					  } else {
-						  session_id_bundle.putBoolean(RESULT_KEY, false);
-						  session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
-						  session_id_bundle.putString(LogInDialog.USERNAME, username);
-					  }
-					} else {
-						session_id_bundle.putBoolean(RESULT_KEY, false);
-						session_id_bundle.putString(LogInDialog.USERNAME, username);
-						session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
-					}
-					broadcast_progress(progress++);
-				} else {
-					session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
-					session_id_bundle.putString(LogInDialog.USERNAME, username);
-					session_id_bundle.putBoolean(RESULT_KEY, false);
-				}
-			} catch (ClientProtocolException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_client_http_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (IOException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_io_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (JSONException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_json_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (NoSuchAlgorithmException e) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_no_such_algorithm_exception_user_message));
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-			} catch (KeyManagementException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (KeyStoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (CertificateException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		} else {
-			if(!wellFormedPassword(password)) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putString(LogInDialog.USERNAME, username);
-				session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
-			}
-			if(username.isEmpty()) {
-				session_id_bundle.putBoolean(RESULT_KEY, false);
-				session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+			authentication_step_result = sendM1ToSRPServer(authentication_server, username, M1);
+			setTokenIfAvailable(authentication_step_result);
+			byte[] M2 = new BigInteger(authentication_step_result.getString(LeapSRPSession.M2), 16).toByteArray();
+			if(client.verify(M2)) {
+			    session_id_bundle.putBoolean(RESULT_KEY, true);
+			    broadcast_progress(progress++);
+			} else {
+			    authFailedNotification(authentication_step_result, username);
 			}
+		    } else {
+			session_id_bundle.putBoolean(RESULT_KEY, false);
+			session_id_bundle.putString(LogInDialog.USERNAME, username);
+			session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
+		    }
+		} catch (JSONException e) {
+		    session_id_bundle = authFailedNotification(authentication_step_result, username);
+		    e.printStackTrace();
+		}
+		broadcast_progress(progress++);
+	    } else {
+		if(!wellFormedPassword(password)) {
+		    session_id_bundle.putBoolean(RESULT_KEY, false);
+		    session_id_bundle.putString(LogInDialog.USERNAME, username);
+		    session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
 		}
+		if(username.isEmpty()) {
+		    session_id_bundle.putBoolean(RESULT_KEY, false);
+		    session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		}
+	    }
 		
-		return session_id_bundle;
+	    return session_id_bundle;
+	}
+
+    private boolean setTokenIfAvailable(JSONObject authentication_step_result) {
+	try {
+	    LeapSRPSession.setToken(authentication_step_result.getString(LeapSRPSession.TOKEN));
+	    CookieHandler.setDefault(null); // we don't need cookies anymore
+	} catch(JSONException e) { //
+	    return false;
 	}
+	return true;
+    }
+    
+    private Bundle authFailedNotification(JSONObject result, String username) {
+	Bundle user_notification_bundle = new Bundle();
+	try{
+	    JSONObject error_message = result.getJSONObject(ERRORS);
+	    String error_type = error_message.keys().next().toString();
+	    String message = error_message.get(error_type).toString();
+	    user_notification_bundle.putString(getResources().getString(R.string.user_message), message);
+	} catch(JSONException e) {}
+	
+	if(!username.isEmpty())
+	    user_notification_bundle.putString(LogInDialog.USERNAME, username);
+	user_notification_bundle.putBoolean(RESULT_KEY, false);
+
+	return user_notification_bundle;
+    }
 	
 	/**
 	 * Sets up an intent with the progress value passed as a parameter
@@ -325,14 +372,11 @@ public class ProviderAPI extends IntentService {
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendAToSRPServer(String server_url, String username, String clientA) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+    private JSONObject sendAToSRPServer(String server_url, String username, String clientA) {
 		Map<String, String> parameters = new HashMap<String, String>();
 		parameters.put("login", username);
 		parameters.put("A", clientA);
 		return sendToServer(server_url + "/sessions.json", "POST", parameters);
-		
-		/*HttpPost post = new HttpPost(server_url + "/sessions.json" + "?" + "login=" + username + "&&" + "A=" + clientA);
-		return sendToServer(post);*/
 	}
 
 	/**
@@ -349,26 +393,36 @@ public class ProviderAPI extends IntentService {
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+    private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1) {
 		Map<String, String> parameters = new HashMap<String, String>();
 		parameters.put("client_auth", new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
-		
-		//HttpPut put = new HttpPut(server_url + "/sessions/" + username +".json" + "?" + "client_auth" + "=" + new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
-		JSONObject json_response = sendToServer(server_url + "/sessions/" + username +".json", "PUT", parameters);
-
-		JSONObject session_idAndM2 = new JSONObject();
-		if(json_response.length() > 0) {
-			byte[] M2_not_trimmed = new BigInteger(json_response.getString(LeapSRPSession.M2), 16).toByteArray();
-			/*Cookie session_id_cookie = LeapHttpClient.getInstance(getApplicationContext()).getCookieStore().getCookies().get(0);
-			session_idAndM2.put(ConfigHelper.SESSION_ID_COOKIE_KEY, session_id_cookie.getName());
-			session_idAndM2.put(ConfigHelper.SESSION_ID_KEY, session_id_cookie.getValue());*/
-			session_idAndM2.put(LeapSRPSession.M2, ConfigHelper.trim(M2_not_trimmed));
-			CookieHandler.setDefault(null); // we don't need cookies anymore
-			String token = json_response.getString(LeapSRPSession.TOKEN);
-			LeapSRPSession.setToken(token);
-		}
-		return session_idAndM2;
+		return sendToServer(server_url + "/sessions/" + username +".json", "PUT", parameters);
 	}
+
+	/**
+	 * Sends an HTTP POST request to the api server to register a new user.
+	 * @param server_url
+	 * @param username
+	 * @param salted_password
+	 * @param password_verifier   
+	 * @return response from authentication server
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 * @throws JSONException
+	 * @throws CertificateException 
+	 * @throws NoSuchAlgorithmException 
+	 * @throws KeyStoreException 
+	 * @throws KeyManagementException 
+	 */
+    private JSONObject sendNewUserDataToSRPServer(String server_url, String username, String salt, String password_verifier) {
+	Map<String, String> parameters = new HashMap<String, String>();
+	parameters.put("user[login]", username);
+	parameters.put("user[password_salt]", salt);
+	parameters.put("user[password_verifier]", password_verifier);
+	Log.d(TAG, server_url);
+	Log.d(TAG, parameters.toString());
+	return sendToServer(server_url + "/users", "POST", parameters);
+    }
 	
 	/**
 	 * Executes an HTTP request expecting a JSON response.
@@ -384,38 +438,68 @@ public class ProviderAPI extends IntentService {
 	 * @throws KeyStoreException 
 	 * @throws KeyManagementException 
 	 */
-	private JSONObject sendToServer(String url, String request_method, Map<String, String> parameters) throws JSONException, MalformedURLException, IOException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
-		JSONObject json_response;
+	private JSONObject sendToServer(String url, String request_method, Map<String, String> parameters) {
+	    JSONObject json_response;
+	    HttpsURLConnection urlConnection = null;
+	    try {
 		InputStream is = null;
-		HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(url).openConnection();
+		urlConnection = (HttpsURLConnection)new URL(url).openConnection();
 		urlConnection.setRequestMethod(request_method);
 		urlConnection.setChunkedStreamingMode(0);
 		urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+		
+		DataOutputStream writer = new DataOutputStream(urlConnection.getOutputStream());
+		writer.writeBytes(formatHttpParameters(parameters));
+		writer.close();
+
+		is = urlConnection.getInputStream();
+		String plain_response = new Scanner(is).useDelimiter("\\A").next();
+		json_response = new JSONObject(plain_response);
+	    } catch (ClientProtocolException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (IOException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (JSONException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (NoSuchAlgorithmException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (KeyManagementException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (KeyStoreException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    } catch (CertificateException e) {
+		json_response = getErrorMessage(urlConnection);
+		e.printStackTrace();
+	    }
+
+	    return json_response;
+	}
+
+    private JSONObject getErrorMessage(HttpsURLConnection urlConnection) {
+	JSONObject error_message = new JSONObject();
+	if(urlConnection != null) {
+	    InputStream error_stream = urlConnection.getErrorStream();
+	    if(error_stream != null) {
+		String error_response = new Scanner(error_stream).useDelimiter("\\A").next();
+		Log.d("Error", error_response);
 		try {
-			
-			DataOutputStream writer = new DataOutputStream(urlConnection.getOutputStream());
-			writer.writeBytes(formatHttpParameters(parameters));
-			writer.close();
-
-			is = urlConnection.getInputStream();
-			String plain_response = new Scanner(is).useDelimiter("\\A").next();
-			json_response = new JSONObject(plain_response);
-		} finally {
-			InputStream error_stream = urlConnection.getErrorStream();
-			if(error_stream != null) {
-				String error_response = new Scanner(error_stream).useDelimiter("\\A").next();
-				urlConnection.disconnect();
-				Log.d("Error", error_response);
-				json_response = new JSONObject(error_response);
-				if(!json_response.isNull(ERRORS) || json_response.has(ERRORS)) {
-					return new JSONObject();
-				}
-			}
+		    error_message = new JSONObject(error_response);
+		} catch (JSONException e) {
+		    Log.d(TAG, e.getMessage());
+		    e.printStackTrace();
 		}
-
-		return json_response;
+		urlConnection.disconnect();
+	    }
 	}
-	
+	return error_message;
+    }
+    
 	private String formatHttpParameters(Map<String, String> parameters) throws UnsupportedEncodingException	{
 	    StringBuilder result = new StringBuilder();
 	    boolean first = true;