The CMCRequest.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 aeba34289ecda6064fedde0f9c83ca4d996fd173 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Sat, 21 Jan 2017 02:05:20 +0100 Subject: [PATCH] Refactored CMCRequest.PR_INTERNAL_TOKEN_NAME. The CMCRequest.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/CMCRequest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index 1f508c3c769784695e1224b17c20a0b09991f2ba..865d410ed539347e737423bb87a78a2a9f019142 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -79,6 +79,7 @@ import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; +import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.HMACDigest; import com.netscape.cmsutil.util.Utils; @@ -94,8 +95,6 @@ public class CMCRequest { public static final String PR_REQUEST_CMC = "CMC"; public static final String PR_REQUEST_CRMF = "CRMF"; - public static final String PR_INTERNAL_TOKEN_NAME = "internal"; - public static final int ARGC = 1; public static final String HEADER = "-----BEGIN"; public static final String TRAILER = "-----END"; @@ -109,7 +108,7 @@ public class CMCRequest { CryptoManager manager = CryptoManager.getInstance(); 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); @@ -1022,7 +1021,7 @@ public class CMCRequest { if ((tokenName == null) || (tokenName.equals(""))) { token = cm.getInternalKeyStorageToken(); - tokenName = PR_INTERNAL_TOKEN_NAME; + tokenName = CryptoUtil.INTERNAL_TOKEN_NAME; } else { token = cm.getTokenByName(tokenName); } -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
