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 Pushed to master under one-liner/trivial rule. -- Endi S. Dewata
>From 5be68e38fd77f171331d27ca52a291f06f7c686c Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <edew...@redhat.com> Date: Wed, 12 Oct 2016 03:26:41 +0200 Subject: [PATCH] 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 --- .../cms/servlet/csadmin/ConfigurationUtils.java | 2 +- .../com/netscape/cmsutil/crypto/CryptoUtil.java | 23 +++++++++++++--------- 2 files changed, 15 insertions(+), 10 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 001b6ab83624b97c3113575eba91b46333ee94cf..038afe8c5eb48be68585e2a0ead2762c405533c5 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("") && diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index b02c363e2af150cb4c74d394dd00d6d8650b0c58..b6b5e6af30cc48d11fd3603b6eb4252b85e1e1b6 100644 --- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -135,6 +135,9 @@ import netscape.security.x509.X509Key; @SuppressWarnings("serial") public class CryptoUtil { + public final static String INTERNAL_TOKEN_NAME = "internal"; + public final static String INTERNAL_TOKEN_FULL_NAME = "Internal Key Storage Token"; + public static final String CERTREQ_BEGIN_HEADING = "-----BEGIN CERTIFICATE REQUEST-----"; public static final String CERTREQ_END_HEADING = "-----END CERTIFICATE REQUEST-----"; public static final int LINE_COUNT = 76; @@ -472,21 +475,23 @@ public class CryptoUtil { return true; } + public static boolean isInternalToken(String name) { + return name.equalsIgnoreCase(INTERNAL_TOKEN_NAME) || name.equalsIgnoreCase(INTERNAL_TOKEN_FULL_NAME); + } + /** * Retrieves handle to a JSS token. */ - public static CryptoToken getTokenByName(String token) - throws CryptoManager.NotInitializedException, - NoSuchTokenException { + public static CryptoToken getTokenByName(String name) + throws NotInitializedException, NoSuchTokenException { + CryptoManager cm = CryptoManager.getInstance(); - CryptoToken t = null; - if (token.equals("internal")) { - t = cm.getInternalKeyStorageToken(); - } else { - t = cm.getTokenByName(token); + if (isInternalToken(name)) { + return cm.getInternalKeyStorageToken(); } - return t; + + return cm.getTokenByName(name); } /** -- 2.7.4
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel
