summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src/com
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-10-12 03:26:41 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-10-14 03:47:41 +0200
commit5be68e38fd77f171331d27ca52a291f06f7c686c (patch)
treef6f9fba0f56a1bc123f01b2eea2c652d7259c91f /base/server/cms/src/com
parentb123909c7aaaa7fba7493c7f74a50bbfe84dbfdf (diff)
Fixed CryptoUtil.getTokenName().
The CryptoUtil.getTokenName() has been modified to check both the short name and full name of the internal token. The ConfigurationUtils.deleteCert() has also been modified to call CryptoUtil.getTokenName(). https://fedorahosted.org/pki/ticket/2500
Diffstat (limited to 'base/server/cms/src/com')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java2
1 files changed, 1 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 001b6ab83..038afe8c5 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
@@ -3435,7 +3435,7 @@ public class ConfigurationUtils {
NoSuchTokenException, TokenException {
CryptoManager cm = CryptoManager.getInstance();
- CryptoToken tok = cm.getTokenByName(tokenname);
+ CryptoToken tok = CryptoUtil.getTokenByName(tokenname);
CryptoStore store = tok.getCryptoStore();
String fullnickname = nickname;
if (!tokenname.equals("") &&