diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-01-21 02:05:20 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-01-21 03:44:10 +0100 |
| commit | aeba34289ecda6064fedde0f9c83ca4d996fd173 (patch) | |
| tree | fbb5812a92426073537376662556d066f80c541a /base/java-tools/src/com | |
| parent | d9f49ef7049ac0542daf1d1c06d8e60e58788952 (diff) | |
| download | pki-aeba34289ecda6064fedde0f9c83ca4d996fd173.tar.gz pki-aeba34289ecda6064fedde0f9c83ca4d996fd173.tar.xz pki-aeba34289ecda6064fedde0f9c83ca4d996fd173.zip | |
Refactored CMCRequest.PR_INTERNAL_TOKEN_NAME.
The CMCRequest.PR_INTERNAL_TOKEN_NAME has been replaced with
CryptoUtil.INTERNAL_TOKEN_NAME since they are identical.
https://fedorahosted.org/pki/ticket/2556
Diffstat (limited to 'base/java-tools/src/com')
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/CMCRequest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index 1f508c3c7..865d410ed 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -79,6 +79,7 @@ import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; +import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.HMACDigest; import com.netscape.cmsutil.util.Utils; @@ -94,8 +95,6 @@ public class CMCRequest { public static final String PR_REQUEST_CMC = "CMC"; public static final String PR_REQUEST_CRMF = "CRMF"; - public static final String PR_INTERNAL_TOKEN_NAME = "internal"; - public static final int ARGC = 1; public static final String HEADER = "-----BEGIN"; public static final String TRAILER = "-----END"; @@ -109,7 +108,7 @@ public class CMCRequest { CryptoManager manager = CryptoManager.getInstance(); CryptoToken token = null; - if (tokenName.equals(PR_INTERNAL_TOKEN_NAME)) { + if (tokenName.equals(CryptoUtil.INTERNAL_TOKEN_NAME)) { token = manager.getInternalKeyStorageToken(); } else { token = manager.getTokenByName(tokenName); @@ -1022,7 +1021,7 @@ public class CMCRequest { if ((tokenName == null) || (tokenName.equals(""))) { token = cm.getInternalKeyStorageToken(); - tokenName = PR_INTERNAL_TOKEN_NAME; + tokenName = CryptoUtil.INTERNAL_TOKEN_NAME; } else { token = cm.getTokenByName(tokenName); } |