diff options
Diffstat (limited to 'base/util')
| -rw-r--r-- | base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index b02c363e2..b6b5e6af3 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); } /** |