diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-01-21 01:12:39 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-01-24 16:17:43 +0100 |
| commit | c57875a84e61d6e0a71da5b74a3c2ce0e13132a6 (patch) | |
| tree | 5a3fb2ea405706438c1396d3fcf6b62b5c8f5e87 /base/tps/src/org | |
| parent | f0ac4d8d8a013eff907970734337f60d6b41c372 (diff) | |
| download | pki-c57875a84e61d6e0a71da5b74a3c2ce0e13132a6.tar.gz pki-c57875a84e61d6e0a71da5b74a3c2ce0e13132a6.tar.xz pki-c57875a84e61d6e0a71da5b74a3c2ce0e13132a6.zip | |
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
Diffstat (limited to 'base/tps/src/org')
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java | 3 | ||||
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java index ea765da02..013e9984d 100644 --- a/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java +++ b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java @@ -55,6 +55,7 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cmscore.base.FileConfigStore; import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmsutil.crypto.CryptoUtil; /** * @author Endi S. Dewata <edewata@redhat.com> @@ -366,7 +367,7 @@ public class TPSSubsystem implements IAuthority, ISubsystem { IConfigStore cs = CMS.getConfigStore(); String nickname = cs.getString("tps.subsystem.nickname", ""); String tokenname = cs.getString("tps.subsystem.tokenname", ""); - if (!tokenname.equals("internal") && !tokenname.equals("Internal Key Storage Token")) + if (!tokenname.equals("internal") && !tokenname.equals(CryptoUtil.INTERNAL_TOKEN_FULL_NAME)) nickname = tokenname + ":" + nickname; CryptoManager cm = CryptoManager.getInstance(); diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java index 9530dd544..d8f9c4f18 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -96,6 +96,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cms.servlet.tks.SecureChannelProtocol; +import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.symkey.SessionKey; import netscape.security.x509.RevocationReason; @@ -681,7 +682,7 @@ public class TPSProcessor { SecureChannelProtocol protocol = new SecureChannelProtocol(); - String tokenName = "Internal Key Storage Token"; + String tokenName = CryptoUtil.INTERNAL_TOKEN_FULL_NAME; CryptoManager cm = null; CryptoToken token = null; @@ -2880,7 +2881,7 @@ public class TPSProcessor { } // We know for now that shared secret is on this token - String tokenName = "Internal Key Storage Token"; + String tokenName = CryptoUtil.INTERNAL_TOKEN_FULL_NAME; PK11SymKey sharedSecret = SessionKey.GetSymKeyByName(tokenName, sharedSecretName); CMS.debug("TPSProcessor.getSharedSecret: SymKey returns: " + sharedSecret); |