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

2 files changed, 11 insertions, 10 deletions

diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index f05aa471f..d07a972db 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
@@ -324,7 +324,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
             if (mStorageKeyUnit.getToken() != null) {
                 try {
                     String storageToken = mStorageKeyUnit.getToken().getName();
-                    if (!storageToken.equals("internal")) {
+                    if (!storageToken.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) {
                         CMS.debug("Auto set serverKeygenTokenName to " + storageToken);
                         serverKeygenTokenName = storageToken;
                     }
@@ -333,7 +333,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
             }
         }
         if (serverKeygenTokenName == null) {
-            serverKeygenTokenName = "internal";
+            serverKeygenTokenName = CryptoUtil.INTERNAL_TOKEN_NAME;
         }
         if (serverKeygenTokenName.equalsIgnoreCase(CryptoUtil.INTERNAL_TOKEN_NAME))
             serverKeygenTokenName = CryptoUtil.INTERNAL_TOKEN_NAME;
diff --git a/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java
index 771445d66..a5e9e78df 100644
--- a/base/kra/src/com/netscape/kra/RecoveryService.java
+++ b/base/kra/src/com/netscape/kra/RecoveryService.java
@@ -29,12 +29,6 @@ import java.security.cert.X509Certificate;
 import java.util.Hashtable;
 import java.util.Random;
 
-import netscape.security.util.BigInt;
-import netscape.security.util.DerInputStream;
-import netscape.security.util.DerValue;
-import netscape.security.x509.X509CertImpl;
-import netscape.security.x509.X509Key;
-
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.ASN1Util;
 import org.mozilla.jss.asn1.ASN1Value;
@@ -70,6 +64,13 @@ import com.netscape.certsrv.security.IStorageKeyUnit;
 import com.netscape.certsrv.util.IStatsSubsystem;
 import com.netscape.cmscore.dbs.KeyRecord;
 import com.netscape.cmscore.util.Debug;
+import com.netscape.cmsutil.crypto.CryptoUtil;
+
+import netscape.security.util.BigInt;
+import netscape.security.util.DerInputStream;
+import netscape.security.util.DerValue;
+import netscape.security.x509.X509CertImpl;
+import netscape.security.x509.X509Key;
 
 /**
  * A class represents recovery request processor. There
@@ -137,8 +138,8 @@ public class RecoveryService implements IService {
         try {
             cm = CryptoManager.getInstance();
             config = CMS.getConfigStore();
-            tokName = config.getString("kra.storageUnit.hardware", "internal");
-            if (tokName.equals("internal")) {
+            tokName = config.getString("kra.storageUnit.hardware", CryptoUtil.INTERNAL_TOKEN_NAME);
+            if (tokName.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) {
                 CMS.debug("RecoveryService: serviceRequest: use internal token ");
                 ct = cm.getInternalCryptoToken();
             } else {