Allow output of PEM private keys using PKCS#8

1 files changed, 26 insertions, 4 deletions

diff --git a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
index dc0c0a126ea..58d72043ca5 100644
--- a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
@@ -32,9 +32,9 @@ public class KeyUtilsTest {
     }
 
     @Test
-    public void can_serialize_and_deserialize_rsa_privatekey_using_pem_format() {
+    public void can_serialize_and_deserialize_rsa_privatekey_using_pkcs1_pem_format() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA);
-        String pem = KeyUtils.toPem(keyPair.getPrivate());
+        String pem = KeyUtils.toPem(keyPair.getPrivate(), KeyFormat.PKCS1);
         assertThat(pem, containsString("BEGIN RSA PRIVATE KEY"));
         assertThat(pem, containsString("END RSA PRIVATE KEY"));
         PrivateKey deserializedKey = KeyUtils.fromPemEncodedPrivateKey(pem);
@@ -43,9 +43,20 @@ public class KeyUtilsTest {
     }
 
     @Test
-    public void can_serialize_and_deserialize_ec_privatekey_using_pem_format() {
+    public void can_serialize_and_deserialize_rsa_privatekey_using_pkcs8_pem_format() {
+        KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA);
+        String pem = KeyUtils.toPem(keyPair.getPrivate(), KeyFormat.PKCS8);
+        assertThat(pem, containsString("BEGIN PRIVATE KEY"));
+        assertThat(pem, containsString("END PRIVATE KEY"));
+        PrivateKey deserializedKey = KeyUtils.fromPemEncodedPrivateKey(pem);
+        assertEquals(keyPair.getPrivate(), deserializedKey);
+        assertEquals(KeyAlgorithm.RSA.getAlgorithmName(), deserializedKey.getAlgorithm());
+    }
+
+    @Test
+    public void can_serialize_and_deserialize_ec_privatekey_using_pkcs1_pem_format() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC);
-        String pem = KeyUtils.toPem(keyPair.getPrivate());
+        String pem = KeyUtils.toPem(keyPair.getPrivate(), KeyFormat.PKCS1);
         assertThat(pem, containsString("BEGIN EC PRIVATE KEY"));
         assertThat(pem, containsString("END EC PRIVATE KEY"));
         PrivateKey deserializedKey = KeyUtils.fromPemEncodedPrivateKey(pem);
@@ -54,6 +65,17 @@ public class KeyUtilsTest {
     }
 
     @Test
+    public void can_serialize_and_deserialize_ec_privatekey_using_pkcs8_pem_format() {
+        KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC);
+        String pem = KeyUtils.toPem(keyPair.getPrivate(), KeyFormat.PKCS8);
+        assertThat(pem, containsString("BEGIN PRIVATE KEY"));
+        assertThat(pem, containsString("END PRIVATE KEY"));
+        PrivateKey deserializedKey = KeyUtils.fromPemEncodedPrivateKey(pem);
+        assertEquals(keyPair.getPrivate(), deserializedKey);
+        assertEquals(KeyAlgorithm.EC.getAlgorithmName(), deserializedKey.getAlgorithm());
+    }
+
+    @Test
     public void can_serialize_and_deserialize_rsa_publickey_using_pem_format() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA);
         String pem = KeyUtils.toPem(keyPair.getPublic());