The CMCRevoke.PR_INTERNAL_TOKEN_NAME has been replaced with CryptoUtil.INTERNAL_TOKEN_NAME since they are identical.
https://fedorahosted.org/pki/ticket/2556 Pushed to master under trivial rule. -- Endi S. Dewata
>From 3152facfbaa0d915cb35671c3a17307e54e40b90 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Sat, 21 Jan 2017 02:07:14 +0100 Subject: [PATCH] Refactored CMCRevoke.PR_INTERNAL_TOKEN_NAME. The CMCRevoke.PR_INTERNAL_TOKEN_NAME has been replaced with CryptoUtil.INTERNAL_TOKEN_NAME since they are identical. https://fedorahosted.org/pki/ticket/2556 --- base/java-tools/src/com/netscape/cmstools/CMCRevoke.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java index 45c3f07cc72a807b71b7fa239b06eef3183bb5f2..b238321acd4c256aeac906cb45bdc828e84a1b5f 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java @@ -58,6 +58,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.util.Password; +import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.Utils; /** @@ -76,7 +77,6 @@ public class CMCRevoke { pValue = null, cValue = null; public static final String CMS_BASE_CA_SIGNINGCERT_NOT_FOUND = "CA signing certificate not found"; - public static final String PR_INTERNAL_TOKEN_NAME = "internal"; public static final String PR_REQUEST_CMC = "CMC"; static String cleanArgs(String s) { @@ -185,7 +185,7 @@ public class CMCRevoke { CryptoToken token = null; if ((hValue == null) || (hValue.equals(""))) { token = cm.getInternalKeyStorageToken(); - hValue = PR_INTERNAL_TOKEN_NAME; + hValue = CryptoUtil.INTERNAL_TOKEN_NAME; } else { token = cm.getTokenByName(hValue); } @@ -259,7 +259,7 @@ public class CMCRevoke { Exception, TokenException { CryptoToken token = null; - if (tokenname.equals(PR_INTERNAL_TOKEN_NAME)) { + if (tokenname.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) { token = manager.getInternalKeyStorageToken(); } else { token = manager.getTokenByName(tokenname); -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
