Updated CryptoUtil.

The CryptoUtil has been modified to provide two separate methods
to obtain a token given the token name:
 - getCryptoToken() returns crypto token
 - getKeyStorageToken() returns key storage token

The getKeyStorageToken() was renamed from the existing
getTokenByName(). All codes using the old method have been updated
accordingly.

If the provided token name matches internal token name the methods
will return the corresponding internal crypto/key storage token.

The isInternalToken() was modified to check for empty string in
addition to the short and full name of the internal token.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index 65bd371eb..105ae6ee9 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -3434,7 +3434,7 @@ public class ConfigurationUtils {
             NoSuchTokenException, TokenException {
 
         CryptoManager cm = CryptoManager.getInstance();
-        CryptoToken tok = CryptoUtil.getTokenByName(tokenname);
+        CryptoToken tok = CryptoUtil.getKeyStorageToken(tokenname);
         CryptoStore store = tok.getCryptoStore();
         String fullnickname = nickname;
         if (!tokenname.equals("") &&