Added a single class for loading keys.

Author: claudius108

src/main/java/ro/kuberam/libs/java/crypto/encrypt/AsymmetricEncryption.java

@@ -37,8 +37,7 @@
 import javax.crypto.NoSuchPaddingException;
 
 import ro.kuberam.libs.java.crypto.CryptoException;
-import ro.kuberam.libs.java.crypto.keyManagement.LoadPrivateKey;
-import ro.kuberam.libs.java.crypto.keyManagement.LoadPublicKey;
+import ro.kuberam.libs.java.crypto.keyManagement.Load;
 import ro.kuberam.libs.java.crypto.utils.Buffer;
 
 /**
@@ -109,7 +108,7 @@ public static String encryptBinary(InputStream data, String base64PublicKey, Str
 		Cipher cipher;
 		try {
 			cipher = Cipher.getInstance(transformationName);
-			PublicKey publicKey = LoadPublicKey.run(base64PublicKey, algorithm, provider);
+			PublicKey publicKey = Load.publicKey(base64PublicKey, algorithm, provider);
 			cipher.init(Cipher.ENCRYPT_MODE, publicKey);
 
 			byte[] buf = new byte[Buffer.TRANSFER_SIZE];
@@ -136,7 +135,7 @@ public static String decryptBinary(InputStream data, String base64PrivateKey, St
 		Cipher cipher;
 		try {
 			cipher = Cipher.getInstance(transformationName);
-			PrivateKey privateKey = LoadPrivateKey.run(base64PrivateKey, algorithm, provider);
+			PrivateKey privateKey = Load.privateKey(base64PrivateKey, algorithm, provider);
 			cipher.init(Cipher.DECRYPT_MODE, privateKey);
 
 			byte[] buf = new byte[Buffer.TRANSFER_SIZE];
@@ -179,7 +178,6 @@ public static byte[] getBytes(String str) throws IOException {
 	}
 }
 // add providers to loadPublicKey() and loadPrivateKey()
-// test AsymmetricEncryption with ad-hoc generated keys
 // add AsymmetricEncryption for binaries
 // change the output of symmetric encryption to base64Binary string (and tests, too)
 // add / improve error message for AsymmetricEncryption when the text to be encrypted is larger that the key

src/main/java/ro/kuberam/libs/java/crypto/keyManagement/Load.java

@@ -0,0 +1,42 @@
+package ro.kuberam.libs.java.crypto.keyManagement;
+
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+public class Load {
+	private static Pattern pattern = Pattern.compile("(?m)(?s)^---*BEGIN.*---*$(.*)^---*END.*---*$.*");
+
+	public static PublicKey publicKey(String base64PublicKey, String algorithm, String provider)
+			throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
+		provider = Optional.ofNullable(provider).filter(str -> !str.isEmpty()).orElse("SunRsaSign");
+		String cleanedKey = pattern.matcher(base64PublicKey).replaceFirst("$1");
+
+		X509EncodedKeySpec spec = new X509EncodedKeySpec(Base64.getMimeDecoder().decode(cleanedKey));
+		KeyFactory kf = KeyFactory.getInstance(algorithm, provider);
+
+		return kf.generatePublic(spec);
+	}
+	
+	public static PrivateKey privateKey(String base64PrivateKey, String algorithm, String provider)
+			throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
+		provider = Optional.ofNullable(provider).filter(str -> !str.isEmpty()).orElse("SunRsaSign");
+		String cleanedKey = pattern.matcher(base64PrivateKey).replaceFirst("$1");
+		
+		PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(
+				Base64.getMimeDecoder().decode(cleanedKey));
+
+		KeyFactory kf = KeyFactory.getInstance(algorithm, provider);
+
+		return kf.generatePrivate(keySpec);
+	}
+
+}

src/main/java/ro/kuberam/libs/java/crypto/keyManagement/LoadPrivateKey.java

@@ -26,27 +26,43 @@
 import java.nio.file.Paths;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.util.Map;
 
 import org.junit.Test;
 
 import ro.kuberam.libs.java.crypto.CryptoModuleTests;
-import ro.kuberam.libs.java.crypto.keyManagement.LoadPrivateKey;
-import ro.kuberam.libs.java.crypto.keyManagement.LoadPublicKey;
+import ro.kuberam.libs.java.crypto.keyManagement.GenerateKeyPair;
+import ro.kuberam.libs.java.crypto.keyManagement.Load;
 
 public class AsymmetricEncryptionTest extends CryptoModuleTests {
 
 	@Test
-	public void encryptStringWithRsaAsymmetricKey() throws Exception {
+	public void encryptAndDecryptStringWithRsaAsymmetricKey() throws Exception {
 		String transformation = "RSA/ECB/PKCS1Padding";
 		String algorithm = "RSA";
-		
+
 		String base64PublicKey = new String(
 				Files.readAllBytes(Paths.get(getClass().getResource("../rsa-public-key.key").toURI())), UTF_8);
-		PublicKey publicKey = LoadPublicKey.run(base64PublicKey, algorithm, null);
-		
+		PublicKey publicKey = Load.publicKey(base64PublicKey, algorithm, null);
+
 		String base64PrivateKey = new String(
 				Files.readAllBytes(Paths.get(getClass().getResource("../rsa-private-key.key").toURI())), UTF_8);
-		PrivateKey privateKey = LoadPrivateKey.run(base64PrivateKey, algorithm, null);
+		PrivateKey privateKey = Load.privateKey(base64PrivateKey, algorithm, null);
+
+		String encryptedText = AsymmetricEncryption.encryptString(longString, publicKey, transformation);
+		String decryptedText = AsymmetricEncryption.decryptString(encryptedText, privateKey, transformation);
+
+		assertEquals(longString, decryptedText);
+	}
+
+	@Test
+	public void encryptAndDecryptStringWithAdHocGeneratedKey() throws Exception {
+		String transformation = "RSA/ECB/PKCS1Padding";
+		String algorithm = "RSA";
+		Map<String, String> keys = GenerateKeyPair.run("RSA");
+
+		PublicKey publicKey = Load.publicKey(keys.get("public-key"), algorithm, null);
+		PrivateKey privateKey = Load.privateKey(keys.get("private-key"), algorithm, null);
 
 		String encryptedText = AsymmetricEncryption.encryptString(longString, publicKey, transformation);
 		String decryptedText = AsymmetricEncryption.decryptString(encryptedText, privateKey, transformation);