Replaced internal token full name literals.

The internal token full name literals have been replaced with
CryptoUtil.INTERNAL_TOKEN_FULL_NAME.

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

1 files changed, 33 insertions, 33 deletions

diff --git a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
index 0416853da..f77ca4d43 100644
--- a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
+++ b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
@@ -290,7 +290,7 @@ public class ConfigurationTest {
         cert1.setNickname("signingCert testca");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=CA Signing Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         systemCerts.add(cert1);
 
@@ -302,7 +302,7 @@ public class ConfigurationTest {
         cert2.setNickname("ocspSigningCert testca");
         cert2.setSigningAlgorithm("SHA256withRSA");
         cert2.setSubjectDN("CN= CA OCSP Signing Certificate");
-        cert2.setToken("Internal Key Storage Token");
+        cert2.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert2);
 
         SystemCertData cert3 = new SystemCertData();
@@ -312,7 +312,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testca");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -322,7 +322,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testca");
         cert4.setSubjectDN("CN=CA Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -333,7 +333,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testca");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=CA Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -394,7 +394,7 @@ public class ConfigurationTest {
         cert1.setNickname("signingCert testsubca");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=SubCA Signing Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         systemCerts.add(cert1);
 
@@ -406,7 +406,7 @@ public class ConfigurationTest {
         cert2.setNickname("ocspSigningCert testsubca");
         cert2.setSigningAlgorithm("SHA256withRSA");
         cert2.setSubjectDN("CN= SubCA OCSP Signing Certificate");
-        cert2.setToken("Internal Key Storage Token");
+        cert2.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert2);
 
         SystemCertData cert3 = new SystemCertData();
@@ -416,7 +416,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testsubca");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -426,7 +426,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testsubca");
         cert4.setSubjectDN("CN=SubCA Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -437,7 +437,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testsubca");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=SubCA Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -496,7 +496,7 @@ public class ConfigurationTest {
         cert1.setNickname("signingCert testexternalca");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=External CA Signing Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         systemCerts.add(cert1);
 
@@ -508,7 +508,7 @@ public class ConfigurationTest {
         cert2.setNickname("ocspSigningCert testexternalca");
         cert2.setSigningAlgorithm("SHA256withRSA");
         cert2.setSubjectDN("CN= External CA OCSP Signing Certificate");
-        cert2.setToken("Internal Key Storage Token");
+        cert2.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert2);
 
         SystemCertData cert3 = new SystemCertData();
@@ -518,7 +518,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testexternalca");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -528,7 +528,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testexternalca");
         cert4.setSubjectDN("CN=External CA Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -539,7 +539,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testexternalca");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=SubCA Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -599,7 +599,7 @@ public class ConfigurationTest {
         cert1.setNickname("signingCert testexternalca");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=External CA Signing Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         String extCert = "";
         BufferedReader in = new BufferedReader(new FileReader(extCertFile));
@@ -627,7 +627,7 @@ public class ConfigurationTest {
         cert2.setNickname("ocspSigningCert testexternalca");
         cert2.setSigningAlgorithm("SHA256withRSA");
         cert2.setSubjectDN("CN= External CA OCSP Signing Certificate");
-        cert2.setToken("Internal Key Storage Token");
+        cert2.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert2);
 
         SystemCertData cert3 = new SystemCertData();
@@ -637,7 +637,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testexternalca");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -647,7 +647,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testexternalca");
         cert4.setSubjectDN("CN=External CA Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -658,7 +658,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testexternalca");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=SubCA Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -705,7 +705,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testca");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         data.setSystemCerts(systemCerts);
@@ -765,7 +765,7 @@ public class ConfigurationTest {
         cert1.setNickname("transportCert testkra");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=KRA Transport Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         systemCerts.add(cert1);
 
@@ -777,7 +777,7 @@ public class ConfigurationTest {
         cert2.setNickname("storageCert testkra");
         cert2.setSigningAlgorithm("SHA256withRSA");
         cert2.setSubjectDN("CN= KRA Storage Certificate");
-        cert2.setToken("Internal Key Storage Token");
+        cert2.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert2);
 
         SystemCertData cert3 = new SystemCertData();
@@ -787,7 +787,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testkra");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -797,7 +797,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testkra");
         cert4.setSubjectDN("CN=KRA Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -808,7 +808,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testkra");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=KRA Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -868,7 +868,7 @@ public class ConfigurationTest {
         cert1.setNickname("ocspSigningCert testocsp");
         cert1.setSigningAlgorithm("SHA256withRSA");
         cert1.setSubjectDN("CN=OCSP Signing Certificate");
-        cert1.setToken("Internal Key Storage Token");
+        cert1.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
 
         systemCerts.add(cert1);
 
@@ -879,7 +879,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testocsp");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -889,7 +889,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testocsp");
         cert4.setSubjectDN("CN=OCSP Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -900,7 +900,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testocsp");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=OCSP Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);
@@ -960,7 +960,7 @@ public class ConfigurationTest {
         cert3.setKeyType("rsa");
         cert3.setNickname("sslServerCert testtks");
         cert3.setSubjectDN("CN=" + host);
-        cert3.setToken("Internal Key Storage Token");
+        cert3.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert3);
 
         SystemCertData cert4 = new SystemCertData();
@@ -970,7 +970,7 @@ public class ConfigurationTest {
         cert4.setKeyType("rsa");
         cert4.setNickname("subsystemCert testtks");
         cert4.setSubjectDN("CN=TKS Subsystem Certificate");
-        cert4.setToken("Internal Key Storage Token");
+        cert4.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert4);
 
         SystemCertData cert5 = new SystemCertData();
@@ -981,7 +981,7 @@ public class ConfigurationTest {
         cert5.setNickname("auditSigningCert testtks");
         cert5.setSigningAlgorithm("SHA256withRSA");
         cert5.setSubjectDN("CN=TKS Audit Signing Certificate");
-        cert5.setToken("Internal Key Storage Token");
+        cert5.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         systemCerts.add(cert5);
 
         data.setSystemCerts(systemCerts);