Replaced internal token short name literals.

The internal token short name literals have been replaced with
CryptoUtil.INTERNAL_TOKEN_NAME.

https://fedorahosted.org/pki/ticket/2556

3 files changed, 18 insertions, 14 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index dc4b191c5..edf6e1335 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -33,10 +33,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
 import java.util.Date;
 
-import netscape.security.pkcs.PKCS10;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.X509CertImpl;
-
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.ANY;
 import org.mozilla.jss.asn1.INTEGER;
@@ -64,8 +60,13 @@ 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;
 
+import netscape.security.pkcs.PKCS10;
+import netscape.security.x509.X500Name;
+import netscape.security.x509.X509CertImpl;
+
 /**
  * Tool for signing PKCS #10 , return CMC enrollment request
  *
@@ -94,7 +95,7 @@ public class CMCEnroll {
         CryptoManager manager = CryptoManager.getInstance();
         CryptoToken token = null;
 
-        if (tokenname.equals("internal")) {
+        if (tokenname.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) {
             token = manager.getInternalKeyStorageToken();
         } else {
             token = manager.getTokenByName(tokenname);
@@ -134,7 +135,7 @@ public class CMCEnroll {
     static String getCMCBlob(X509Certificate signerCert, CryptoManager manager, String nValue, String rValue) {
 
         String asciiBASE64Blob = rValue; // input pkcs10 blob
-        String tokenname = "internal";
+        String tokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
 
         try {
 
diff --git a/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
index 0f41e0fc7..24a51f8ee 100644
--- a/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
+++ b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
@@ -22,17 +22,19 @@ import java.security.KeyPair;
 import java.util.Date;
 import java.util.Hashtable;
 
-import netscape.security.x509.RevokedCertImpl;
-import netscape.security.x509.RevokedCertificate;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.X509CRLImpl;
-
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.crypto.CryptoToken;
 import org.mozilla.jss.crypto.KeyPairAlgorithm;
 import org.mozilla.jss.crypto.KeyPairGenerator;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.crypto.CryptoUtil;
+
+import netscape.security.x509.RevokedCertImpl;
+import netscape.security.x509.RevokedCertificate;
+import netscape.security.x509.X500Name;
+import netscape.security.x509.X509CRLImpl;
+
 /**
  * Tool used to test out signing a CRL
  *
@@ -61,7 +63,7 @@ public class TestCRLSigning {
 
         // Login to token
         CryptoToken token = null;
-        if (tokenname.equals("internal")) {
+        if (tokenname.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) {
             token = cm.getInternalKeyStorageToken();
         } else {
             token = cm.getTokenByName(tokenname);
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
index ed1e26bc2..21d16b537 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
@@ -55,6 +55,7 @@ import com.netscape.cmstools.key.KeyCLI;
 import com.netscape.cmstools.pkcs12.PKCS12CLI;
 import com.netscape.cmstools.system.SecurityDomainCLI;
 import com.netscape.cmstools.user.UserCLI;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 
 /**
  * @author Endi S. Dewata
@@ -234,7 +235,7 @@ public class MainCLI extends CLI {
                     // Check for undefined 'token'
                     if (tokenPassword[0].isEmpty()) {
                         // Set default 'token'
-                        tokenPassword[0] = "internal";
+                        tokenPassword[0] = CryptoUtil.INTERNAL_TOKEN_NAME;
                     }
 
                     // Check for undefined 'password'
@@ -243,7 +244,7 @@ public class MainCLI extends CLI {
                     }
                 } else {
                     // Set default 'token'
-                    tokenPassword[0] = "internal";
+                    tokenPassword[0] = CryptoUtil.INTERNAL_TOKEN_NAME;
 
                     // Set simple 'password' (do not trim leading/trailing whitespace)
                     tokenPassword[1] = line;