1 files changed, 3 insertions, 1 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/tks/SecureChannelProtocol.java b/base/server/cms/src/com/netscape/cms/servlet/tks/SecureChannelProtocol.java
index db42cab77..6dfd1d2a2 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/tks/SecureChannelProtocol.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/tks/SecureChannelProtocol.java
@@ -31,6 +31,7 @@ import sun.security.pkcs11.wrapper.PKCS11Constants;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 
 public class SecureChannelProtocol {
 
@@ -688,10 +689,11 @@ public class SecureChannelProtocol {
 
     public CryptoToken returnTokenByName(String name, CryptoManager manager) throws NoSuchTokenException {
 
+        CMS.debug("returnTokenByName: requested name: " + name);
         if (name == null || manager == null)
             throw new NoSuchTokenException();
 
-        if (name.equals("internal") || name.equals("Internal KeyStorage Token")) {
+        if(CryptoUtil.isInternalToken(name)) {
             return manager.getInternalKeyStorageToken();
         } else {
             return manager.getTokenByName(name);