diff options
Diffstat (limited to 'base/server/cms/src/com')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index c0f0ce1f4..527ed826e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -2268,12 +2268,17 @@ public class ConfigurationUtils { certObj.setCertChain(certChainStr); } - public static KeyPair loadKeyPair(String nickname) throws Exception { + public static KeyPair loadKeyPair(String nickname, String token) throws Exception { CMS.debug("ConfigurationUtils: loadKeyPair(" + nickname + ")"); CryptoManager cm = CryptoManager.getInstance(); + if (token != null) { + if (!token.equals("internal") && !token.equals("Internal Key Storage Token")) + nickname = token + ":" + nickname; + } + X509Certificate cert = cm.findCertByNickname(nickname); PublicKey publicKey = cert.getPublicKey(); PrivateKey privateKey = cm.findPrivKeyByCert(cert); |