Refactored Constants.PR_INTERNAL_TOKEN_NAME.

The Constants.PR_INTERNAL_TOKEN_NAME has been replaced with
CryptoUtil.INTERNAL_TOKEN_NAME since they are identical.

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

16 files changed, 39 insertions, 25 deletions

diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
index 8c413ca01..b9fa0c9ab 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 
 /**
@@ -73,7 +74,7 @@ class WICAKeyPage extends WIKeyPage implements IWizardPanel {
             if (caTokenName == null || caTokenName.equals("")) {
                 mTokenBox.setSelectedIndex(0);
             } else {
-                if (caTokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME))
+                if (caTokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME))
                     mTokenBox.setSelectedIndex(0);
                 else
                     mTokenBox.setSelectedItem(caTokenName);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
index 8f2ee32af..5846531e5 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
@@ -25,6 +25,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -125,7 +126,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel {
 
     public boolean concludePanel(WizardInfo info) {
         String canickname = (String)mCANicknameBox.getSelectedItem();
-        mCATokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mCATokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         int index = canickname.indexOf(":");
         if (index > -1) {
             mCATokenname = canickname.substring(0, index);
@@ -133,7 +134,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_CA_TOKEN_NAME, mCATokenname);
 
         String ocspnickname = (String)mOCSPNicknameBox.getSelectedItem();
-        mOCSPTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mOCSPTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = ocspnickname.indexOf(":");
         if (index > -1) {
             mOCSPTokenname = ocspnickname.substring(0, index);
@@ -141,7 +142,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_OCSP_TOKEN_NAME, mOCSPTokenname);
 
         String sslnickname = (String)mSSLNicknameBox.getSelectedItem();
-        mSSLTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mSSLTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = sslnickname.indexOf(":");
         if (index > -1) {
             mSSLTokenname = sslnickname.substring(0, index);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
index e32c367a2..3399bf260 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
@@ -25,6 +25,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -126,7 +127,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel {
 
     public boolean concludePanel(WizardInfo info) {
         String kranickname = (String)mKRANicknameBox.getSelectedItem();
-        mKRATokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mKRATokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         int index = kranickname.indexOf(":");
         if (index > -1) {
             mKRATokenname = kranickname.substring(0, index);
@@ -134,7 +135,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_KRA_TOKEN_NAME, mKRATokenname);
 
         String storagenickname = (String)mStorageNicknameBox.getSelectedItem();
-        mStorageTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mStorageTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = storagenickname.indexOf(":");
         if (index > -1) {
             mStorageTokenname = storagenickname.substring(0, index);
@@ -142,7 +143,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_STORAGE_TOKEN_NAME, mStorageTokenname);
 
         String sslnickname = (String)mSSLNicknameBox.getSelectedItem();
-        mSSLTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mSSLTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = sslnickname.indexOf(":");
         if (index > -1) {
             mSSLTokenname = sslnickname.substring(0, index);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
index 94aee9a08..288f2edc7 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
@@ -25,6 +25,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -109,7 +110,7 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel {
 
     public boolean concludePanel(WizardInfo info) {
         String ocspnickname = (String)mOCSPNicknameBox.getSelectedItem();
-        mOCSPTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mOCSPTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         int index = ocspnickname.indexOf(":");
         if (index > -1) {
             mOCSPTokenname = ocspnickname.substring(0, index);
@@ -117,7 +118,7 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_OCSP_TOKEN_NAME, mOCSPTokenname);
 
         String sslnickname = (String)mSSLNicknameBox.getSelectedItem();
-        mSSLTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mSSLTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = sslnickname.indexOf(":");
         if (index > -1) {
             mSSLTokenname = sslnickname.substring(0, index);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
index 63cffdea0..7ae4f2606 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
@@ -25,6 +25,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -111,7 +112,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel {
 
     public boolean concludePanel(WizardInfo info) {
         String ranickname = (String)mRANicknameBox.getSelectedItem();
-        mRATokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mRATokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         int index = ranickname.indexOf(":");
         if (index > -1) {
             mRATokenname = ranickname.substring(0, index);
@@ -119,7 +120,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel {
         mWizardInfo.put(ConfigConstants.PR_CLONE_RA_TOKEN_NAME, mRATokenname);
 
         String sslnickname = (String)mSSLNicknameBox.getSelectedItem();
-        mSSLTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mSSLTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         index = sslnickname.indexOf(":");
         if (index > -1) {
             mSSLTokenname = sslnickname.substring(0, index);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
index 52c103521..811e40ebc 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
@@ -25,6 +25,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -95,7 +96,7 @@ class WICloneTKSKeyCertPage extends WizardBasePanel implements IWizardPanel {
 
     public boolean concludePanel(WizardInfo info) {
         String sslnickname = (String)mSSLNicknameBox.getSelectedItem();
-        mSSLTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+        mSSLTokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         int index = sslnickname.indexOf(":");
         if (index > -1) {
             mSSLTokenname = sslnickname.substring(0, index);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
index ca180ad42..b6c2f828c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
@@ -26,6 +26,7 @@ import com.netscape.admin.certsrv.connection.*;
 import com.netscape.management.client.util.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -81,7 +82,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel {
 	  }
 	}
 	if ((tokenName != null) &&
-		!(tokenName.equalsIgnoreCase(Constants.PR_INTERNAL_TOKEN_NAME))) {
+		!(tokenName.equalsIgnoreCase(CryptoUtil.INTERNAL_TOKEN_NAME))) {
 		Debug.println("tokenName="+tokenName);
         	mCertNameField.setText(tokenName+":"+wizardInfo.getNickname());
 	} else {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
index ff2adab5d..79ca5a208 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
@@ -24,6 +24,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -55,12 +56,12 @@ class WIInternalTokenLogonPage extends WITokenLogonPage implements IWizardPanel
     public boolean initializePanel(WizardInfo info) {
         InstallWizardInfo wizardInfo = (InstallWizardInfo)info;
         String pwd =
-          (String)wizardInfo.get("TOKEN:"+Constants.PR_INTERNAL_TOKEN_NAME);
+          (String)wizardInfo.get("TOKEN:"+CryptoUtil.INTERNAL_TOKEN_NAME);
         if (pwd != null)
             return false;
 
         mTokenName = "Internal";
-        mTokenText.setText(Constants.PR_INTERNAL_TOKEN_NAME);
+        mTokenText.setText(CryptoUtil.INTERNAL_TOKEN_NAME);
         return super.initializePanel(info);
     }
 }
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
index 00b12d43c..b910d9ef8 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 
 /**
@@ -70,7 +71,7 @@ class WIKRAKeyPage extends WIKeyPage implements IWizardPanel {
             if (kraTokenName == null || kraTokenName.equals("")) {
                 mTokenBox.setSelectedIndex(0);
             } else {
-                if (kraTokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME))
+                if (kraTokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME))
                     mTokenBox.setSelectedIndex(0);
                 else
                     mTokenBox.setSelectedItem(kraTokenName);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
index c45b93cdc..217704c2a 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
@@ -40,7 +40,6 @@ import com.netscape.admin.certsrv.wizard.IWizardPanel;
 import com.netscape.admin.certsrv.wizard.WizardBasePanel;
 import com.netscape.admin.certsrv.wizard.WizardInfo;
 import com.netscape.certsrv.common.ConfigConstants;
-import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.TaskId;
 import com.netscape.cmsutil.crypto.CryptoUtil;
@@ -542,7 +541,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
         mWizardInfo = (InstallWizardInfo)info;
         String name = (String)mTokenBox.getSelectedItem();
         if (name.equalsIgnoreCase(CryptoUtil.INTERNAL_TOKEN_NAME))
-            name = Constants.PR_INTERNAL_TOKEN_NAME;
+            name = CryptoUtil.INTERNAL_TOKEN_NAME;
         mWizardInfo.put(ConfigConstants.PR_TOKEN_NAME, name);
         if (mPassword.isEditable()) {
             // this is used for single signon. The key is the token name with
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
index 68faf10d0..10e19e735 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
@@ -26,6 +26,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.task.*;
 import com.netscape.management.client.console.*;
 
@@ -232,12 +233,12 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe
         String caTokenName = "";
         String sslTokenName = "";
         if (mCATokenBox.getSelectedIndex() == 0) {
-            caTokenName = Constants.PR_INTERNAL_TOKEN_NAME;
+            caTokenName = CryptoUtil.INTERNAL_TOKEN_NAME;
         } else {
             caTokenName = (String)mCATokenBox.getSelectedItem();
         }
         if (mSSLTokenBox.getSelectedIndex() == 0) {
-            sslTokenName = Constants.PR_INTERNAL_TOKEN_NAME;
+            sslTokenName = CryptoUtil.INTERNAL_TOKEN_NAME;
         } else {
             sslTokenName = (String)mSSLTokenBox.getSelectedItem();
         }
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
index 63746e448..a48e03557 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 import com.netscape.management.client.util.*;
 
@@ -67,7 +68,7 @@ class WIOCSPKeyPage extends WIKeyPage implements IWizardPanel {
             if (ocspTokenName == null || ocspTokenName.equals("")) {
                 mTokenBox.setSelectedIndex(0);
             } else {
-                if (ocspTokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME))
+                if (ocspTokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME))
                     mTokenBox.setSelectedIndex(0);
                 else
                     mTokenBox.setSelectedItem(ocspTokenName);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
index 619f40593..54007abc6 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 
 /**
@@ -69,7 +70,7 @@ class WIRAKeyPage extends WIKeyPage implements IWizardPanel {
             if (raTokenName == null || raTokenName.equals("")) {
                 mTokenBox.setSelectedIndex(0);
             } else {
-                if (raTokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME))
+                if (raTokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME))
                     mTokenBox.setSelectedIndex(0);
                 else
                     mTokenBox.setSelectedItem(raTokenName);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
index dcf93aa83..83c98e52d 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 
 /**
@@ -68,7 +69,7 @@ class WIServerKeyPage extends WIKeyPage implements IWizardPanel {
             if (sslTokenName == null || sslTokenName.equals("")) {
                 mTokenBox.setSelectedIndex(0);
             } else {
-                if (sslTokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME))
+                if (sslTokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME))
                     mTokenBox.setSelectedIndex(0);
                 else
                     mTokenBox.setSelectedItem(sslTokenName);
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
index 6c9038ffa..6c9c981ef 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
@@ -27,6 +27,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.admin.certsrv.config.*;
 import javax.swing.text.*;
 
@@ -302,7 +303,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
             if (mNewKeyBtn.isSelected()) {
                 String tokenName = (String)mTokenBox.getSelectedItem();
                 if (tokenName.equals("internal"))
-                    tokenName = Constants.PR_INTERNAL_TOKEN_NAME;
+                    tokenName = CryptoUtil.INTERNAL_TOKEN_NAME;
                 nvps.clear();
                 nvps.put(Constants.PR_TOKEN_NAME, tokenName);
                 response = connection.process(DestDef.DEST_SERVER_ADMIN,
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
index b1fd2031c..46c9b61df 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
@@ -24,6 +24,7 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 
 /**
  * This panel asks for the user to logon to the keycert token  .
@@ -88,7 +89,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel {
         String tokenname = mTokenNameText.getText().trim();
 
         if (tokenname.equals("internal")) {
-            tokenname = Constants.PR_INTERNAL_TOKEN_NAME;
+            tokenname = CryptoUtil.INTERNAL_TOKEN_NAME;
         }
 
         String pwd = mPasswordText.getText().trim();