diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-08-23 13:33:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-23 13:33:51 +0200 |
commit | 55b7a3da78176dfef0b0b6da7e25fa69e716611e (patch) | |
tree | c7e8c45a1b87b7d36ef7a3f72181afca4c2f8fdf | |
parent | 47e665c14670b193fafab3ec47e5e6ed3e13bf5e (diff) | |
parent | efa973077cb80c9592dada9ab24dee1cf5877703 (diff) |
Merge pull request #10391 from vespa-engine/bjorncs/security-utils
Bjorncs/security utils MERGEOK
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/KeyUtils.java | 3 |
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(); |