diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-01-21 01:04:17 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-01-21 03:34:36 +0100 |
| commit | d9f49ef7049ac0542daf1d1c06d8e60e58788952 (patch) | |
| tree | 074ffdf39f0298953065fd656a63b52537e72446 /base/java-tools | |
| parent | 5e39d36196f06ebaa8dcf943ec4c19bcbb9c25b0 (diff) | |
| download | pki-d9f49ef7049ac0542daf1d1c06d8e60e58788952.tar.gz pki-d9f49ef7049ac0542daf1d1c06d8e60e58788952.tar.xz pki-d9f49ef7049ac0542daf1d1c06d8e60e58788952.zip | |
Refactored KRATool.INTERNAL_TOKEN.
The KRATool.INTERNAL_TOKEN has been replaced with
CryptoUtil.INTERNAL_TOKEN_FULL_NAME since they are identical.
https://fedorahosted.org/pki/ticket/2556
Diffstat (limited to 'base/java-tools')
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/KRATool.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/KRATool.java b/base/java-tools/src/com/netscape/cmstools/KRATool.java index 2cff383ff..63afe8776 100644 --- a/base/java-tools/src/com/netscape/cmstools/KRATool.java +++ b/base/java-tools/src/com/netscape/cmstools/KRATool.java @@ -65,6 +65,7 @@ import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.util.Password; +import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.Utils; /** @@ -518,9 +519,6 @@ public class KRATool { private static final String DATE_OF_MODIFY_PATTERN = "yyyyMMddHHmmss'Z'"; private static final String LOGGING_DATE_PATTERN = "dd/MMM/yyyy:HH:mm:ss z"; - // Constants: PKCS #11 Information - private static final String INTERNAL_TOKEN = "Internal Key Storage Token"; - // Constants: Command-line Options private static final int ID_OFFSET_NAME_VALUE_PAIRS = 1; private static final int PWDFILE_NAME_VALUE_PAIRS = 1; @@ -1622,7 +1620,7 @@ public class KRATool { + "'." + NEWLINE, true); - if (mSourceStorageTokenName.equals(INTERNAL_TOKEN)) { + if (mSourceStorageTokenName.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) { mSourceToken = cm.getInternalKeyStorageToken(); } else { mSourceToken = cm.getTokenByName(mSourceStorageTokenName); @@ -1677,7 +1675,7 @@ public class KRATool { // Retrieve the source storage cert by its nickname try { - if (mSourceStorageTokenName.equals(INTERNAL_TOKEN)) { + if (mSourceStorageTokenName.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) { log("Retrieving source storage cert with nickname of '" + mSourceStorageCertNickname + "'." @@ -1702,7 +1700,7 @@ public class KRATool { return FAILURE; } } catch (ObjectNotFoundException exUnwrapObjectNotFound) { - if (mSourceStorageTokenName.equals(INTERNAL_TOKEN)) { + if (mSourceStorageTokenName.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) { log("ERROR: No internal " + "source storage cert named '" + mSourceStorageCertNickname @@ -1723,7 +1721,7 @@ public class KRATool { } System.exit(0); } catch (TokenException exUnwrapToken) { - if (mSourceStorageTokenName.equals(INTERNAL_TOKEN)) { + if (mSourceStorageTokenName.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) { log("ERROR: No internal " + "source storage cert named '" + mSourceStorageCertNickname |