gui example extended

Author: astrapi69

README.md

@@ -125,5 +125,5 @@ Here is a list of awesome projects for cryptography:
  * [cryptacular](https://github.com/vt-middleware/cryptacular) The friendly complement to the BouncyCastle crypto API for Java.
  * [JSch](http://www.jcraft.com/jsch/) JSch is a pure Java implementation of SSH2.
  * [Apache Shiro](https://github.com/apache/shiro) Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management.
-
+ * [commons-ssl](http://juliusdavies.ca/commons-ssl/)
 

crypt-core/src/main/java/de/alpharogroup/crypto/key/KeyExtensions.java

@@ -25,9 +25,7 @@
 package de.alpharogroup.crypto.key;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
@@ -38,10 +36,6 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
-import org.apache.commons.codec.binary.Base64;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemReader;
-
 import de.alpharogroup.crypto.algorithm.KeyPairGeneratorAlgorithm;
 import de.alpharogroup.crypto.key.reader.PemObjectReader;
 import de.alpharogroup.crypto.key.reader.PrivateKeyReader;
@@ -52,7 +46,7 @@
 /**
  * The class {@link KeyExtensions} holds utility methods for read public and private keys from
  * files.
- * 
+ *
  * @deprecated Use instead the reader classes {@link PublicKeyReader}, {@link PrivateKeyReader} and
  *             {@link PemObjectReader}.
  */
@@ -82,53 +76,6 @@ public class KeyExtensions
 	/** The Constant BEGIN_RSA_PRIVATE_KEY_PREFIX. */
 	public static final String BEGIN_RSA_PRIVATE_KEY_PREFIX = "-----BEGIN RSA PRIVATE KEY-----\n";
 
-	/**
-	 * Gets the pem object.
-	 *
-	 * @param file
-	 *            the file
-	 * @return the pem object
-	 * @throws IOException
-	 *             Signals that an I/O exception has occurred.
-	 */
-	public static PemObject getPemObject(final File file) throws IOException
-	{
-		PemObject pemObject;
-		final PemReader pemReader = new PemReader(new InputStreamReader(new FileInputStream(file)));
-		try
-		{
-			pemObject = pemReader.readPemObject();
-		}
-		finally
-		{
-			pemReader.close();
-		}
-		return pemObject;
-	}
-
-	/**
-	 * Read public key.
-	 *
-	 * @param file
-	 *            the file
-	 * @return the public key
-	 * @throws IOException
-	 *             Signals that an I/O exception has occurred.
-	 * @throws NoSuchAlgorithmException
-	 *             is thrown if instantiation of the cypher object fails.
-	 * @throws InvalidKeySpecException
-	 *             is thrown if generation of the SecretKey object fails.
-	 * @throws NoSuchProviderException
-	 *             is thrown if the specified provider is not registered in the security provider
-	 *             list.
-	 */
-	public static PublicKey readPublicKey(final File file) throws IOException,
-		NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException
-	{
-		final byte[] keyBytes = Files.readAllBytes(file.toPath());
-		return readPublicKey(keyBytes, "BC");
-	}
-
 	/**
 	 * Read public key.
 	 *
@@ -227,87 +174,4 @@ public static PrivateKey readPrivateKey(final byte[] privateKeyBytes, final Stri
 		return privateKey;
 	}
 
-	/**
-	 * Read pem private key.
-	 *
-	 * @param file
-	 *            the file
-	 * @param securityProvider
-	 *            the security provider
-	 * @return the private key
-	 * @throws Exception
-	 *             is thrown if if a security error occur
-	 */
-	public static PrivateKey readPemPrivateKey(final File file,
-		final SecurityProvider securityProvider) throws Exception
-	{
-		final byte[] keyBytes = Files.readAllBytes(file.toPath());
-
-		final String privateKeyAsString = new String(keyBytes)
-			.replace(BEGIN_RSA_PRIVATE_KEY_PREFIX, "").replace(END_RSA_PRIVATE_KEY_SUFFIX, "")
-			.trim();
-
-		final byte[] decoded = new Base64().decode(privateKeyAsString);
-
-		return readPrivateKey(decoded, securityProvider);
-	}
-
-	/**
-	 * Read private key.
-	 *
-	 * @param privateKeyBytes
-	 *            the private key bytes
-	 * @param securityProvider
-	 *            the security provider
-	 * @return the private key
-	 * @throws NoSuchAlgorithmException
-	 *             the no such algorithm exception
-	 * @throws InvalidKeySpecException
-	 *             is thrown if generation of the SecretKey object fails.
-	 * @throws NoSuchProviderException
-	 *             is thrown if the specified provider is not registered in the security provider
-	 *             list.
-	 */
-	public static PrivateKey readPrivateKey(final byte[] privateKeyBytes,
-		final SecurityProvider securityProvider)
-		throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException
-	{
-		return readPrivateKey(privateKeyBytes, securityProvider.name());
-	}
-
-	/**
-	 * reads a public key from a file.
-	 *
-	 * @param file
-	 *            the file
-	 * @param securityProvider
-	 *            the security provider
-	 * @return the public key
-	 * @throws Exception
-	 *             is thrown if if a security error occur
-	 */
-	public static PublicKey readPemPublicKey(final File file,
-		final SecurityProvider securityProvider) throws Exception
-	{
-		final byte[] keyBytes = Files.readAllBytes(file.toPath());
-		final String publicKeyAsString = new String(keyBytes).replace(BEGIN_PUBLIC_KEY_PREFIX, "")
-			.replace(END_PUBLIC_KEY_SUFFIX, "");
-		final byte[] decoded = Base64.decodeBase64(publicKeyAsString);
-		return readPublicKey(decoded, securityProvider);
-	}
-
-	/**
-	 * reads a public key from a file.
-	 *
-	 * @param file
-	 *            the file
-	 * @return the public key
-	 * @throws Exception
-	 *             is thrown if if a security error occur
-	 */
-	public static PublicKey readPemPublicKey(final File file) throws Exception
-	{
-		return readPemPublicKey(file, SecurityProvider.BC);
-	}
-
 }

crypt-core/src/test/java/de/alpharogroup/crypto/key/KeyExtensionsTest.java

@@ -26,7 +26,9 @@
 
 import java.io.File;
 import java.security.PrivateKey;
+import java.security.Security;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
@@ -52,6 +54,7 @@ public void testReadPemPrivateKey() throws Exception
 		final File privatekeyPemDir = new File(PathFinder.getSrcTestResourcesDir(), "pem");
 		final File privatekeyPemFile = new File(privatekeyPemDir, "private.pem");
 
+		Security.addProvider(new BouncyCastleProvider());
 		final PrivateKey privateKey = PrivateKeyReader.readPemPrivateKey(privatekeyPemFile,
 			SecurityProvider.BC);
 		AssertJUnit.assertNotNull(privateKey);
@@ -74,10 +77,4 @@ public void testReadDerPrivateKey() throws Exception
 		AssertJUnit.assertNotNull(privateKey);
 	}
 
-	@Test
-	public void testConvertToBase64() throws Exception
-	{
-
-	}
-
 }

crypt-data/src/main/java/de/alpharogroup/crypto/factories/KeyPairFactory.java

@@ -32,6 +32,7 @@
 import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
 
 import de.alpharogroup.crypto.algorithm.Algorithm;
@@ -143,4 +144,26 @@ public static KeyPairGenerator newKeyPairGenerator(final String algorithm, final
 		return generator;
 	}
 
+	/**
+	 * Factory method for creating a new {@link KeyPairGenerator} from the given parameters.
+	 *
+	 * @param algorithm
+	 *            the algorithm
+	 * @param keySize
+	 *            the key size
+	 * @param secureRandom
+	 *            the secure random
+	 * @return the new {@link KeyPairGenerator} from the given parameters.
+	 * @throws NoSuchAlgorithmException
+	 *             is thrown if no Provider supports a KeyPairGeneratorSpi implementation for the
+	 *             specified algorithm.
+	 */
+	public static KeyPairGenerator newKeyPairGenerator(final String algorithm, final int keySize,
+		final SecureRandom secureRandom) throws NoSuchAlgorithmException
+	{
+		final KeyPairGenerator generator = KeyPairGenerator.getInstance(algorithm);
+		generator.initialize(keySize, secureRandom);
+		return generator;
+	}
+
 }

crypt-data/src/main/java/de/alpharogroup/crypto/key/PrivateKeyExtensions.java

@@ -24,6 +24,7 @@
  */
 package de.alpharogroup.crypto.key;
 
+import java.io.IOException;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
@@ -34,12 +35,18 @@
 import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.RSAPublicKeySpec;
-import java.util.List;
+
+import javax.xml.bind.DatatypeConverter;
 
 import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.asn1.ASN1Encodable;
+import org.bouncycastle.asn1.ASN1Primitive;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.util.io.pem.PemObject;
 
 import de.alpharogroup.crypto.algorithm.KeyPairGeneratorAlgorithm;
 import de.alpharogroup.crypto.hex.HexExtensions;
+import de.alpharogroup.crypto.key.reader.PemObjectReader;
 import de.alpharogroup.crypto.key.reader.PrivateKeyReader;
 import lombok.experimental.UtilityClass;
 
@@ -120,6 +127,20 @@ public static String toBase64(final PrivateKey privateKey)
 		return privateKeyAsBase64String;
 	}
 
+	/**
+	 * Transform the given {@link PrivateKey} to a base64 encoded {@link String} value.
+	 *
+	 * @param privateKey
+	 *            the private key
+	 * @return the new base64 encoded {@link String} value.
+	 */
+	public static String toBase64Binary(final PrivateKey privateKey)
+	{
+		final byte[] encoded = privateKey.getEncoded();
+		final String privateKeyAsBase64String = DatatypeConverter.printBase64Binary(encoded);
+		return privateKeyAsBase64String;
+	}
+
 	/**
 	 * Generate the corresponding {@link PublicKey} object from the given {@link PrivateKey} object.
 	 *
@@ -149,28 +170,25 @@ public static PublicKey generatePublicKey(final PrivateKey privateKey)
 	}
 
 
-
 	/**
-	 * Transform the public key in pem format.
+	 * Transform the given private key that is in PKCS1 format and returns a {@link String} object
+	 * in pem format.
 	 *
-	 * @param publicKey
-	 *            the public key
-	 * @return the public key in pem format
+	 * @param privateKey
+	 *            the private key
+	 * @return the {@link String} object in pem format generated from the given private key.
+	 * @throws IOException
+	 *             Signals that an I/O exception has occurred.
 	 */
-	public static String toPemFormat(final PrivateKey privateKey)
+	public static String toPemFormat(final PrivateKey privateKey) throws IOException
 	{
-		final String publicKeyAsBase64String =  toBase64(privateKey);
-		final List<String> parts = PublicKeyExtensions.splitByFixedLength(publicKeyAsBase64String, 64);
-
-		final StringBuilder sb = new StringBuilder();
-		sb.append(PrivateKeyReader.BEGIN_RSA_PRIVATE_KEY_PREFIX);
-		for(final String part : parts) {
-			sb.append(part);
-			sb.append(System.lineSeparator());
-		}
-		sb.append(PrivateKeyReader.END_RSA_PRIVATE_KEY_SUFFIX);
-		sb.append(System.lineSeparator());
-		return sb.toString();
+		final byte[] encoded = privateKey.getEncoded();
+		final PrivateKeyInfo privateKeyInfo = PrivateKeyInfo.getInstance(encoded);
+		final ASN1Encodable asn1Encodable = privateKeyInfo.parsePrivateKey();
+		final ASN1Primitive asn1Primitive = asn1Encodable.toASN1Primitive();
+		final byte[] privateKeyPKCS1Formatted = asn1Primitive.getEncoded();
+		return PemObjectReader
+			.toPemFormat(new PemObject(PrivateKeyReader.RSA_PRIVATE_KEY, privateKeyPKCS1Formatted));
 	}
 
 }

crypt-data/src/main/java/de/alpharogroup/crypto/key/PublicKeyExtensions.java

@@ -35,7 +35,6 @@
 
 import de.alpharogroup.crypto.hex.HexExtensions;
 import de.alpharogroup.crypto.key.reader.PublicKeyReader;
-import de.alpharogroup.string.StringExtensions;
 import lombok.experimental.UtilityClass;
 
 /**
@@ -145,7 +144,7 @@ public static String toHexString(final PublicKey publicKey, final boolean lowerC
 	 * @param input the input
 	 * @param fixedLength the fixed length
 	 * @return the list with the splitted {@link String} objects
-	 * @deprecated use instead the same name method from {@link StringExtensions}
+	 * @deprecated use instead the same name method from  StringExtensions
 	 */
 	@Deprecated
 	public static List<String> splitByFixedLength(final String input, final int fixedLength) {

crypt-data/src/main/java/de/alpharogroup/crypto/key/reader/PemObjectReader.java

@@ -28,9 +28,11 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.StringWriter;
 
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
+import org.bouncycastle.util.io.pem.PemWriter;
 
 /**
  * The class {@link PemObjectReader} is a utility class for reading {@link PemObject} from a file.
@@ -61,4 +63,23 @@ public static PemObject getPemObject(final File file) throws IOException
 		}
 		return pemObject;
 	}
+
+
+	/**
+	 * Transform the given {@link PemObject} object in pem format {@link String} object.
+	 *
+	 * @return the pem object
+	 * @return the {@link String} object in pem format
+	 * @throws IOException
+	 *             Signals that an I/O exception has occurred.
+	 */
+	public static String toPemFormat(final PemObject pemObject) throws IOException
+	{
+		final StringWriter stringWriter = new StringWriter();
+		final PemWriter pemWriter = new PemWriter(stringWriter);
+		pemWriter.writeObject(pemObject);
+		pemWriter.close();
+		final String pemString = stringWriter.toString();
+		return pemString;
+	}
 }