The Constants.PR_FULL_INTERNAL_TOKEN_NAME has been replaced with CryptoUtil.INTERNAL_TOKEN_FULL_NAME since they are identical.
https://fedorahosted.org/pki/ticket/2556 Pushed to master under trivial rule. -- Endi S. Dewata
>From 6ba7d68c7474e5000c6fbdc4d6cd97d0b291033b Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Sat, 21 Jan 2017 00:43:53 +0100 Subject: [PATCH] Refactored Constants.PR_FULL_INTERNAL_TOKEN_NAME. The Constants.PR_FULL_INTERNAL_TOKEN_NAME has been replaced with CryptoUtil.INTERNAL_TOKEN_FULL_NAME since they are identical. https://fedorahosted.org/pki/ticket/2556 --- base/common/src/com/netscape/certsrv/common/Constants.java | 1 - .../cmscore/src/com/netscape/cmscore/security/JssSubsystem.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/common/Constants.java b/base/common/src/com/netscape/certsrv/common/Constants.java index 3e941683aed3678462024ac7e1f76a415336e1a0..743efc4dfebfe10b21bca7bc7eeadb2cf36145fe 100644 --- a/base/common/src/com/netscape/certsrv/common/Constants.java +++ b/base/common/src/com/netscape/certsrv/common/Constants.java @@ -489,7 +489,6 @@ public interface Constants { //public final static String PR_CA_SIGNING_CERT = "cacert"; //public final static String PR_SERVER_CERT = "servercert"; public final static String PR_CLIENT_CERT = "clientcert"; - public final static String PR_FULL_INTERNAL_TOKEN_NAME = "Internal Key Storage Token"; public final static String PR_TOKEN_NAME = "tokenName"; public final static String PR_TOKEN_PASSWD = "tokenPwd"; public final static String PR_KEY_LENGTH = "keyLength"; diff --git a/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java index d8166d889db67c8a8e60201670b2661b7f2b70c5..ec6611167dcc8e2ebfcc0a0ec44e99ebdaae4adf 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java @@ -541,7 +541,7 @@ public final class JssSubsystem implements ICryptoSubsystem { public boolean isTokenLoggedIn(String name) throws EBaseException { try { if (name.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) - name = Constants.PR_FULL_INTERNAL_TOKEN_NAME; + name = CryptoUtil.INTERNAL_TOKEN_FULL_NAME; CryptoToken ctoken = mCryptoManager.getTokenByName(name); return ctoken.isLoggedIn(); @@ -795,7 +795,7 @@ public final class JssSubsystem implements ICryptoSubsystem { String t = tokenName; if (tokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) - t = Constants.PR_FULL_INTERNAL_TOKEN_NAME; + t = CryptoUtil.INTERNAL_TOKEN_FULL_NAME; CryptoToken token = null; try { @@ -1237,7 +1237,7 @@ public final class JssSubsystem implements ICryptoSubsystem { CryptoManager.getInstance().findPrivKeyByCert(list[i]); // check for errors String nickname = list[i].getNickname(); if (tokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME) || - tokenName.equals(Constants.PR_FULL_INTERNAL_TOKEN_NAME)) { + tokenName.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) { nickname = CryptoUtil.INTERNAL_TOKEN_NAME + ":" + nickname; } X509CertImpl impl = null; -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
