Merge pull request #16 from assaabloy-ppi/master

RemovingBase64 dependency to work with Java 7. Java 7 is a requiremen…

Author: sequoiar

src/com/iwebpp/crypto/TweetNaclFast.java

@@ -5,7 +5,6 @@
 
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
-import java.util.Base64;
 import java.lang.System;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -3390,16 +3389,6 @@ public static byte[] makeSecretBoxNonce() {
 	  return randombytes(SecretBox.nonceLength);
 	}
 
-	public static String base64EncodeToString(byte [] b) {
-	  return Base64.getUrlEncoder().withoutPadding().encodeToString(b);
-	}
-	// byte[] Base64.getUrlEncoder().withoutPadding().encode(b);
-	
-	public static byte[] base64Decode(String s) {
-	  return Base64.getUrlDecoder().decode(s);
-	}
-	// byte[] Base64.getUrlDecoder().decode(byte[] b)
-	
   public static String hexEncodeToString( byte [] raw ) {
     String HEXES = "0123456789ABCDEF";
     final StringBuilder hex = new StringBuilder( 2 * raw.length );

src/com/iwebpp/crypto/tests/TweetNaclFastTest.java

@@ -194,17 +194,13 @@ private boolean testBoxNonce() throws UnsupportedEncodingException {
 
 		// explicit nonce
         byte [] theNonce = TweetNaclFast.makeBoxNonce();
-		byte [] theNonce2 = TweetNaclFast.base64Decode(
-		                      TweetNaclFast.base64EncodeToString(theNonce));
-		Log.d(TAG, "BoxNonce Base64 test Equal: " + "\"" + java.util.Arrays.equals(theNonce, theNonce2) + "\"");
 		byte [] theNonce3 = TweetNaclFast.hexDecode(
 		                      TweetNaclFast.hexEncodeToString(theNonce));
 		Log.d(TAG, "BoxNonce Hex test Equal: " + "\"" + java.util.Arrays.equals(theNonce, theNonce3) + "\"");
 		String theNoncet = "";
 		for (int i = 0; i < theNonce.length; i ++)
 			theNoncet += " "+theNonce[i];
 		Log.d(TAG, "BoxNonce: "+theNoncet);
-		Log.d(TAG, "BoxNonce: " + "\"" + TweetNaclFast.base64EncodeToString(theNonce) + "\"");
 		Log.d(TAG, "BoxNonce: " + "\"" + TweetNaclFast.hexEncodeToString(theNonce) + "\"");