Merge pull request #10391 from vespa-engine/bjorncs/security-utils

Bjorncs/security utils MERGEOK

1 files changed, 2 insertions, 1 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/KeyUtils.java b/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
index 416d05d6ea2..f847e78f3c5 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
@@ -96,7 +96,8 @@ public class KeyUtils {
                 if (pemObject instanceof PrivateKeyInfo) {
                     PrivateKeyInfo keyInfo = (PrivateKeyInfo) pemObject;
                     PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyInfo.getEncoded());
-                    return createKeyFactory(RSA).generatePrivate(keySpec);
+                    return createKeyFactory(keyInfo.getPrivateKeyAlgorithm())
+                            .generatePrivate(keySpec);
                 } else if (pemObject instanceof PEMKeyPair) {
                     PEMKeyPair pemKeypair = (PEMKeyPair) pemObject;
                     PrivateKeyInfo keyInfo = pemKeypair.getPrivateKeyInfo();