Update to KeyCode Encoding Logic

Update to KeyCode Encoding Logic

Author: BRIAN HOLYFIELD

SendSafelyAPI/src/com/sendsafely/handlers/CreatePackageHandler.java

@@ -82,9 +82,7 @@ protected Package convert(CreatePackageResponse obj) throws CreatePackageFailedE
 		try
 		{
 			Package info = getPackageInformation(obj);
-			String b64String = CryptoUtil.GenerateKeyCode();
-			String decodedString = DatatypeConverter.printBase64Binary(b64String.getBytes());
-			info.setKeyCode(new String(UrlBase64.encode(decodedString.getBytes())));
+			info.setKeyCode(CryptoUtil.GenerateKeyCode());
 			return info;
 		}
 		catch (TokenGenerationFailedException e)

SendSafelyAPI/src/com/sendsafely/utils/CryptoUtil.java

@@ -14,6 +14,7 @@
 import javax.xml.bind.DatatypeConverter;
 
 import com.sendsafely.exceptions.PublicKeyEncryptionFailedException;
+
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
@@ -26,15 +27,6 @@
 import org.bouncycastle.crypto.util.PrivateKeyFactory;
 import org.bouncycastle.crypto.util.PublicKeyFactory;
 import org.bouncycastle.openpgp.*;
-import org.bouncycastle.openpgp.PGPCompressedData;
-import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
-import org.bouncycastle.openpgp.PGPEncryptedDataList;
-import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.PGPLiteralData;
-import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
-import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.bouncycastle.openpgp.PGPPBEEncryptedData;
-import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
 import org.bouncycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator;
 import org.bouncycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator;
@@ -43,11 +35,13 @@
 import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
 import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.UrlBase64;
 
 import com.sendsafely.exceptions.MessageException;
 import com.sendsafely.exceptions.PublicKeyDecryptionFailedException;
 import com.sendsafely.exceptions.SignatureCreationFailedException;
 import com.sendsafely.exceptions.TokenGenerationFailedException;
+
 import org.bouncycastle.util.io.Streams;
 
 public class CryptoUtil 
@@ -91,8 +85,7 @@ public static String GenerateKeyCode() throws TokenGenerationFailedException
 		} catch (NoSuchProviderException e) {
 			throw new TokenGenerationFailedException(e);
 		}
-		
-		return DatatypeConverter.printBase64Binary(randomBytes);
+		return new String(UrlBase64.encode(randomBytes)).replace(".", "");
 	}
 
 	public static String PBKDF2(String token, String salt, int iterations)