summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/ca/src/com/netscape/ca/CMSCRLExtensions.java3
-rw-r--r--base/ca/src/com/netscape/ca/CRLIssuingPoint.java11
-rw-r--r--base/ca/src/com/netscape/ca/SigningUnit.java3
-rw-r--r--base/common/src/com/netscape/certsrv/base/ASubsystem.java1
-rw-r--r--base/common/src/com/netscape/certsrv/request/ARequestNotifier.java1
-rw-r--r--base/common/src/com/netscape/cms/authentication/AVAPattern.java2
-rw-r--r--base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java5
-rw-r--r--base/common/src/com/netscape/cms/authentication/HashAuthentication.java7
-rw-r--r--base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java6
-rw-r--r--base/common/src/com/netscape/cms/authentication/TokenAuthentication.java7
-rw-r--r--base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java3
-rw-r--r--base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java6
-rw-r--r--base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java2
-rw-r--r--base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java1
-rw-r--r--base/common/src/com/netscape/cms/listeners/PinRemovalListener.java4
-rw-r--r--base/common/src/com/netscape/cms/logging/LogFile.java2
-rw-r--r--base/common/src/com/netscape/cms/logging/RollingLogFile.java10
-rw-r--r--base/common/src/com/netscape/cms/ocsp/LDAPStore.java1
-rw-r--r--base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java7
-rw-r--r--base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java3
-rw-r--r--base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java3
-rw-r--r--base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java1
-rw-r--r--base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java11
-rw-r--r--base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java6
-rw-r--r--base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java1
-rw-r--r--base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java1
-rw-r--r--base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java11
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java5
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java7
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java5
-rw-r--r--base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java8
-rw-r--r--base/common/src/com/netscape/cms/servlet/base/CMSServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java7
-rw-r--r--base/common/src/com/netscape/cms/servlet/base/IndexServlet.java8
-rw-r--r--base/common/src/com/netscape/cms/servlet/base/PortsServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java3
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java3
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java6
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java9
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java4
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/GetInfo.java4
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java25
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/Monitor.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java3
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java6
-rw-r--r--base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/common/CMSGateway.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java11
-rw-r--r--base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java3
-rw-r--r--base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java4
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java10
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java3
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/GetPk12.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java7
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java9
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java5
-rw-r--r--base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java2
-rw-r--r--base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java13
-rw-r--r--base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java1
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/CertReqParser.java6
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/CheckRequest.java5
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java5
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/ProcessReq.java7
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/QueryReq.java21
-rw-r--r--base/common/src/com/netscape/cms/servlet/request/SearchReqs.java9
-rw-r--r--base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java18
-rw-r--r--base/common/src/com/netscape/cmscore/apps/CMSEngine.java4
-rw-r--r--base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java1
-rw-r--r--base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java4
-rw-r--r--base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java2
-rw-r--r--base/common/src/com/netscape/cmscore/base/SimpleProperties.java7
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java9
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpConnector.java1
-rw-r--r--base/common/src/com/netscape/cmscore/connector/RequestTransfer.java2
-rw-r--r--base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java5
-rw-r--r--base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java17
-rw-r--r--base/common/src/com/netscape/cmscore/dbs/Repository.java1
-rw-r--r--base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java3
-rw-r--r--base/common/src/com/netscape/cmscore/extensions/KeyUsage.java7
-rw-r--r--base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java3
-rw-r--r--base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java3
-rw-r--r--base/common/src/com/netscape/cmscore/registry/PluginRegistry.java3
-rw-r--r--base/common/src/com/netscape/cmscore/request/RequestSubsystem.java3
-rw-r--r--base/common/src/com/netscape/cmscore/security/JssSubsystem.java6
-rw-r--r--base/common/src/com/netscape/cmscore/security/KRATransportCert.java6
-rw-r--r--base/common/src/com/netscape/cmscore/security/KeyCertUtil.java4
-rw-r--r--base/common/src/com/netscape/cmscore/security/RASigningCert.java6
-rw-r--r--base/common/src/com/netscape/cmscore/security/SSLCert.java6
-rw-r--r--base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java6
-rw-r--r--base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java3
-rw-r--r--base/common/src/com/netscape/cmscore/usrgrp/Group.java3
-rw-r--r--base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java4
-rw-r--r--base/common/src/com/netscape/cmscore/usrgrp/User.java3
-rw-r--r--base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java2
-rw-r--r--base/java-tools/src/com/netscape/cmstools/CMCEnroll.java2
-rw-r--r--base/java-tools/src/com/netscape/cmstools/CMCRequest.java2
-rw-r--r--base/java-tools/src/com/netscape/cmstools/CMCRevoke.java2
-rw-r--r--base/java-tools/src/com/netscape/cmstools/DRMTool.java6
-rw-r--r--base/java-tools/src/com/netscape/cmstools/PasswordCache.java3
-rw-r--r--base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java1
-rw-r--r--base/kra/src/com/netscape/kra/EncryptionUnit.java1
-rw-r--r--base/kra/src/com/netscape/kra/EnrollmentService.java33
-rw-r--r--base/kra/src/com/netscape/kra/KRANotify.java3
-rw-r--r--base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java1
-rw-r--r--base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java2
-rw-r--r--base/ocsp/src/com/netscape/ocsp/SigningUnit.java3
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java2
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/CMSTask.java1
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/ComCrypto.java6
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/Con2Agent.java7
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/DirEnroll.java9
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/Request.java32
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/ServerInfo.java1
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/TestClient.java2
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/UserEnroll.java2
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/checkRequest.java5
-rw-r--r--base/tks/src/com/netscape/tks/TKSAuthority.java1
-rw-r--r--base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java4
-rw-r--r--base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java3
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/RadiusConn.java3
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/StateAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java2
-rw-r--r--base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java6
-rw-r--r--base/util/src/netscape/security/extensions/PresenceServerExtension.java1
-rw-r--r--base/util/src/netscape/security/provider/DSA.java1
-rw-r--r--base/util/src/netscape/security/provider/DSAKeyPairGenerator.java8
-rwxr-xr-xbase/util/src/netscape/security/provider/DSAParameterGenerator.java1
-rw-r--r--base/util/src/netscape/security/provider/MD5.java2
-rw-r--r--base/util/src/netscape/security/util/CertPrettyPrint.java1
-rw-r--r--base/util/src/netscape/security/util/ExtPrettyPrint.java1
-rw-r--r--base/util/src/netscape/security/x509/AlgorithmId.java3
-rw-r--r--base/util/src/netscape/security/x509/X500Signer.java2
193 files changed, 134 insertions, 624 deletions
diff --git a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index bbb4e5f19..507faa8e8 100644
--- a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
@@ -65,7 +65,8 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
private ICRLIssuingPoint mCRLIssuingPoint = null;
- private IConfigStore mConfig = null;
+ @SuppressWarnings("unused")
+ private IConfigStore mConfig;
private IConfigStore mCRLExtConfig = null;
private Vector<String> mCRLExtensionNames = new Vector<String>();
diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index f2ca2026c..f93e6e31b 100644
--- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -277,7 +277,6 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
*/
private Date mLastUpdate;
private Date mLastFullUpdate;
- private long mLastScheduledUpdate = 0;
/**
* Next scheduled CRL update date
@@ -1904,7 +1903,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
Debug.trace("recoverCRLCache size=" + list.getSize() + " index=" + list.getCurrentIndex());
}
- CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+ CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
boolean includeCert = true;
int s = list.getSize() - list.getCurrentIndex();
@@ -2117,7 +2116,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
public void addRevokedCert(BigInteger serialNumber, RevokedCertImpl revokedCert,
String requestId) {
- CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+ CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
boolean includeCert = true;
if (cp != null)
includeCert = cp.checkRevokedCertExtensions(revokedCert.getExtensions());
@@ -2405,7 +2404,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
if (statsSub != null) {
statsSub.startTiming("generation");
}
- CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+ CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
processRevokedCerts(cp);
if (statsSub != null) {
@@ -2956,17 +2955,15 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
class CertRecProcessor implements IElementProcessor {
private Hashtable<BigInteger, RevokedCertificate> mCRLCerts = null;
private boolean mAllowExtensions = false;
- private ILogger mLogger;
private CRLIssuingPoint mIP = null;
private boolean mIssuingDistPointAttempted = false;
private boolean mIssuingDistPointEnabled = false;
private BitArray mOnlySomeReasons = null;
- public CertRecProcessor(Hashtable<BigInteger, RevokedCertificate> crlCerts, CRLIssuingPoint ip, ILogger logger,
+ public CertRecProcessor(Hashtable<BigInteger, RevokedCertificate> crlCerts, CRLIssuingPoint ip,
boolean allowExtensions) {
mCRLCerts = crlCerts;
- mLogger = logger;
mIP = ip;
mAllowExtensions = allowExtensions;
mIssuingDistPointAttempted = false;
diff --git a/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java
index 85ee1d482..2466fb652 100644
--- a/base/ca/src/com/netscape/ca/SigningUnit.java
+++ b/base/ca/src/com/netscape/ca/SigningUnit.java
@@ -77,7 +77,8 @@ public final class SigningUnit implements ISigningUnit {
private ILogger mLogger = CMS.getLogger();
private IConfigStore mConfig;
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private String mDefSigningAlgname = null;
private SignatureAlgorithm mDefSigningAlgorithm = null;
diff --git a/base/common/src/com/netscape/certsrv/base/ASubsystem.java b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
index 275108926..dfaba5a61 100644
--- a/base/common/src/com/netscape/certsrv/base/ASubsystem.java
+++ b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
@@ -26,6 +26,7 @@ package com.netscape.certsrv.base;
*/
public abstract class ASubsystem implements ISubsystem {
+ @SuppressWarnings("unused")
private ISubsystem mParent;
private IConfigStore mCfg;
private String mId;
diff --git a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index ac57c1313..ba3d9f293 100644
--- a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
@@ -45,7 +45,6 @@ public class ARequestNotifier implements IRequestNotifier {
private ICertificateAuthority mCA = null;
private boolean mIsPublishingQueueEnabled = false;
private int mPublishingQueuePriority = 0;
- private int mMaxPublishingQueuePageSize = 1;
private IRequestQueue mRequestQueue = null;
private String mPublishingStatus = null;
private int mSavePublishingStatus = 0;
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
index 823b396e9..3e984c0cc 100644
--- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
@@ -130,8 +130,6 @@ class AVAPattern {
public static final String TYPE_RDN = "$rdn";
public static final String TYPE_CONSTANT = "constant";
- private static final char[] endChars = new char[] { '+', ',' };
-
private static final LdapV3DNStrConverter mLdapDNStrConverter =
new LdapV3DNStrConverter();
diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
index b8216d6bc..c65dd3971 100644
--- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
@@ -35,7 +35,6 @@ import com.netscape.certsrv.authentication.ISSLClientCertProvider;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.profile.EProfileException;
import com.netscape.certsrv.profile.IProfile;
import com.netscape.certsrv.profile.IProfileAuthenticator;
@@ -78,10 +77,6 @@ public class AgentCertAuthentication implements IAuthManager,
private IUGSubsystem mUGSub = null;
private ICertUserLocator mCULocator = null;
- private ILogger mLogger = CMS.getLogger();
-
- private IConfigStore mRevocationChecking = null;
- private String mRequestor = null;
public AgentCertAuthentication() {
}
diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
index b9808e639..9ebf8a7c0 100644
--- a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
@@ -55,12 +55,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
protected static String[] mRequiredCreds = { CRED_UID,
CRED_PAGEID, CRED_FINGERPRINT, CRED_HOST };
public static final long DEFAULT_TIMEOUT = 600000;
- private boolean mEnable = false;
- private long mTimeout = DEFAULT_TIMEOUT; // in milliseconds
- private String mSecret;
- private int mPageID;
- private String mHost;
- private long mLastLogin = 0;
+
private MessageDigest mSHADigest = null;
private Hashtable<String, IAuthToken> mData = null;
private IConfigStore mConfig;
diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
index dbae4a1ca..2bec1b68d 100644
--- a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
@@ -38,7 +38,6 @@ import com.netscape.certsrv.authentication.ISSLClientCertProvider;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.profile.EProfileException;
import com.netscape.certsrv.profile.IProfile;
import com.netscape.certsrv.profile.IProfileAuthenticator;
@@ -73,11 +72,6 @@ public class SSLclientCertAuthentication implements IAuthManager,
private String mImplName = null;
private IConfigStore mConfig = null;
- private ILogger mLogger = CMS.getLogger();
-
- private IConfigStore mRevocationChecking = null;
- private String mRequestor = null;
-
public SSLclientCertAuthentication() {
}
diff --git a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
index 10cb94299..923b05019 100644
--- a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
@@ -32,13 +32,11 @@ import com.netscape.certsrv.authentication.IAuthToken;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.profile.EProfileException;
import com.netscape.certsrv.profile.IProfile;
import com.netscape.certsrv.profile.IProfileAuthenticator;
import com.netscape.certsrv.property.IDescriptor;
import com.netscape.certsrv.request.IRequest;
-import com.netscape.certsrv.usrgrp.IUGSubsystem;
import com.netscape.cmsutil.http.HttpClient;
import com.netscape.cmsutil.http.HttpRequest;
import com.netscape.cmsutil.http.HttpResponse;
@@ -70,9 +68,6 @@ public class TokenAuthentication implements IAuthManager,
private String mImplName = null;
private IConfigStore mConfig = null;
- private IUGSubsystem mUGSub = null;
- private ILogger mLogger = CMS.getLogger();
-
public TokenAuthentication() {
}
@@ -90,8 +85,6 @@ public class TokenAuthentication implements IAuthManager,
mName = name;
mImplName = implName;
mConfig = config;
-
- mUGSub = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG);
}
/**
diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
index 65cf75651..9e551966c 100644
--- a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
@@ -133,9 +133,6 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication
protected MessageDigest mSHADigest = null;
protected MessageDigest mMD5Digest = null;
- private String mBindDN = null;
- private String mBindPassword = null;
-
private ILdapConnFactory removePinLdapFactory = null;
private LDAPConnection removePinLdapConnection = null;
private IConfigStore removePinLdapConfigStore = null;
diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
index dae24678d..729b017d8 100644
--- a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
@@ -47,6 +47,7 @@ public class BasicAclAuthz extends AAclAuthz
private String mImplName = null;
/* configuration store */
+ @SuppressWarnings("unused")
private IConfigStore mConfig;
/* the system logger */
@@ -54,8 +55,6 @@ public class BasicAclAuthz extends AAclAuthz
protected static final String PROP_BASEDN = "basedn";
- private static boolean needsFlush = false;
-
static {
mExtendedPluginInfo.add("nothing for now");
}
@@ -174,10 +173,7 @@ public class BasicAclAuthz extends AAclAuthz
try {
super.updateACLs(id, rights, strACLs, desc);
// flushResourceACLs();
- needsFlush = false;
} catch (EACLsException ex) {
- // flushing failed, set flag
- needsFlush = true;
log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_FLUSH_RESOURCES", ex.toString()));
diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
index d3f004619..65032608c 100644
--- a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
+++ b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
@@ -21,7 +21,6 @@ import com.netscape.certsrv.apps.CMS;
import com.netscape.certsrv.authentication.IAuthToken;
import com.netscape.certsrv.base.SessionContext;
import com.netscape.certsrv.evaluators.IAccessEvaluator;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.usrgrp.IUser;
import com.netscape.cmsutil.util.Utils;
@@ -38,7 +37,6 @@ import com.netscape.cmsutil.util.Utils;
public class UserOrigReqAccessEvaluator implements IAccessEvaluator {
private String mType = "user_origreq";
private String mDescription = "user origreq matching evaluator";
- private ILogger mLogger = CMS.getLogger();
private final static String ANYBODY = "anybody";
private final static String EVERYBODY = "everybody";
diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
index 2f1d479a4..37c0e918b 100644
--- a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
+++ b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
@@ -191,7 +191,6 @@ public class RenewalNotificationJob
private long mPreMS = 0;
private int mPostDays = 0;
private long mPostMS = 0;
- private int mMaxNotifyCount = 1;
private String[] mProfileId = null;
/**
diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
index 2f82307f2..21d69e29d 100644
--- a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
+++ b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
@@ -33,7 +33,6 @@ import com.netscape.certsrv.ldap.ILdapConnFactory;
import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.request.IRequest;
import com.netscape.certsrv.request.IRequestListener;
-import com.netscape.certsrv.request.RequestId;
/**
* This represnets a listener that removes pin from LDAP directory.
@@ -56,7 +55,6 @@ public class PinRemovalListener implements IRequestListener {
private IConfigStore mConfig = null;
private IConfigStore mLdapConfig = null;
- private RequestId mReqId = null;
private ILdapConnFactory mConnFactory = null;
private LDAPConnection mRemovePinLdapConnection = null;
@@ -111,8 +109,6 @@ public class PinRemovalListener implements IRequestListener {
if (mEnabled != true)
return;
- mReqId = r.getRequestId();
-
String rs = r.getRequestStatus().toString();
CMS.debug("PinRemovalListener: Request status: " + rs);
diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java
index 95d4b34bf..caada0bf5 100644
--- a/base/common/src/com/netscape/cms/logging/LogFile.java
+++ b/base/common/src/com/netscape/cms/logging/LogFile.java
@@ -685,8 +685,6 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
return mFileName;
}
- private boolean firstOpen = true;
-
/**
* Record that the signed audit log has been signed
* <P>
diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
index d420f547d..0a7a9f098 100644
--- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
@@ -83,11 +83,6 @@ public class RollingLogFile extends LogFile {
private Thread mRolloverThread = null;
/**
- * The incrementing backup number for the log file names
- */
- private int mFileNumber = 1;
-
- /**
* The amount of time before a backed up log is removed in milliseconds
*/
protected long mExpirationTime = 0;
@@ -211,13 +206,11 @@ public class RollingLogFile extends LogFile {
}
/**
- * Rotate the log file to a backup file with a incrementing integer
- * extension
+ * Rotate the log file to a backup file with timestamp
**/
public synchronized void rotate()
throws IOException {
- //File backupFile = new File(mFileName + "." + mFileNumber);
File backupFile = new File(mFileName + "." + mLogFileDateFormat.format(mDate));
// close, backup, and reopen the log file zeroizing its contents
@@ -273,7 +266,6 @@ public class RollingLogFile extends LogFile {
+ backupFile.toString());
}
super.open(); // will reset mBytesWritten
- mFileNumber++;
}
/**
diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
index c9f97c541..e2e5fc493 100644
--- a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
+++ b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
@@ -83,7 +83,6 @@ public class LDAPStore implements IDefStore, IExtendedPluginInfo {
private static final int DEF_REFRESH_IN_SEC = 60 * 60 * 24;
private static final String PROP_BASE_DN = "baseDN";
private static final String PROP_BY_NAME = "byName";
- private static final String PROP_CONN_INFO = "connInfo";
private static final String PROP_CRL_ATTR = "crlAttr";
private static final String DEF_CRL_ATTR = "certificateRevocationList;binary";
private static final String PROP_CA_CERT_ATTR = "caCertAttr";
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
index 06f94d599..e12b8220f 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
@@ -30,7 +30,6 @@ import netscape.ldap.LDAPSearchResults;
import netscape.ldap.LDAPv2;
import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.authority.ICertAuthority;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.IExtendedPluginInfo;
@@ -40,7 +39,6 @@ import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.policy.IEnrollmentPolicy;
import com.netscape.certsrv.request.IRequest;
import com.netscape.certsrv.request.PolicyResult;
-import com.netscape.certsrv.request.RequestId;
import com.netscape.cms.policy.APolicyRule;
/**
@@ -63,13 +61,10 @@ public class AttributePresentConstraints extends APolicyRule
protected String mName = null;
protected String mImplName = null;
- private boolean mEnabled = false;
private ILogger mLogger = CMS.getLogger();
- private ICertAuthority mSub = null;
private IConfigStore mConfig = null;
private IConfigStore mLdapConfig = null;
- private RequestId mReqId = null;
private ILdapConnFactory mConnFactory = null;
private LDAPConnection mCheckAttrLdapConnection = null;
@@ -271,8 +266,6 @@ public class AttributePresentConstraints extends APolicyRule
public PolicyResult apply(IRequest r) {
PolicyResult res = PolicyResult.ACCEPTED;
- mReqId = r.getRequestId();
-
String requestType = r.getRequestType();
if (requestType.equals(IRequest.ENROLLMENT_REQUEST) ||
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
index b586c8bdf..7f44c8eb0 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
@@ -42,7 +42,8 @@ import com.netscape.cms.policy.APolicyRule;
*/
public class PresenceExt extends APolicyRule {
private static Vector<String> mDefParams = new Vector<String>();
- private IConfigStore mConfig = null;
+ @SuppressWarnings("unused")
+ private IConfigStore mConfig;
private String mOID = null;
private boolean mCritical;
private int mVersion = 0;
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
index b7588aa4d..eaec5e50f 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
@@ -54,9 +54,6 @@ public class ValidityConstraint extends EnrollConstraint {
public static final String CONFIG_CHECK_NOT_AFTER = "notAfterCheck";
public final static long SECS_IN_MS = 1000L;
- private Date mDefNotBefore = null;
- private Date mDefNotAfter = null;
-
public ValidityConstraint() {
super();
addConfigName(CONFIG_RANGE);
diff --git a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
index cba06023f..2c176593a 100644
--- a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
@@ -47,7 +47,6 @@ public class InhibitAnyPolicyExtDefault extends EnrollExtDefault {
public static final String VAL_SKIP_CERTS = "skipCerts";
private static final String SKIP_CERTS = "Skip Certs";
- private static final String GN_PATTERN = "Pattern";
public InhibitAnyPolicyExtDefault() {
super();
diff --git a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
index cfe35df39..b703f5b47 100644
--- a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
+++ b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
@@ -40,7 +40,6 @@ import com.netscape.certsrv.request.RequestStatus;
import com.netscape.certsrv.usrgrp.IGroup;
import com.netscape.certsrv.usrgrp.IUGSubsystem;
import com.netscape.certsrv.usrgrp.IUser;
-import com.netscape.cms.profile.common.EnrollProfile;
/**
* This updater class will create the new user to the subsystem group and
@@ -50,19 +49,14 @@ import com.netscape.cms.profile.common.EnrollProfile;
*/
public class SubsystemGroupUpdater implements IProfileUpdater {
- private IProfile mProfile = null;
- private EnrollProfile mEnrollProfile = null;
+ @SuppressWarnings("unused")
+ private IProfile mProfile;
private IConfigStore mConfig = null;
private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
private Vector<String> mConfigNames = new Vector<String>();
- private Vector<String> mValueNames = new Vector<String>();
private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
"LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
- private final static String SIGNED_AUDIT_PASSWORD_VALUE = "********";
- private final static String SIGNED_AUDIT_EMPTY_NAME_VALUE_PAIR = "Unknown";
- private final static String SIGNED_AUDIT_NAME_VALUE_DELIMITER = ";;";
- private final static String SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER = "+";
public SubsystemGroupUpdater() {
}
@@ -71,7 +65,6 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
throws EProfileException {
mConfig = config;
mProfile = profile;
- mEnrollProfile = (EnrollProfile) profile;
}
public Enumeration<String> getConfigNames() {
diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
index 0dff1da6b..e612c339a 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
@@ -38,7 +38,6 @@ import netscape.security.x509.Extension;
import netscape.security.x509.GeneralName;
import netscape.security.x509.GeneralNameInterface;
import netscape.security.x509.GeneralNames;
-import netscape.security.x509.LdapV3DNStrConverter;
import netscape.security.x509.OIDMap;
import netscape.security.x509.SubjectAlternativeNameExtension;
import netscape.security.x509.X500Name;
@@ -103,11 +102,6 @@ class AVAPattern {
"IPAddress",
"OIDName" };
- private static final char[] endChars = new char[] { '+', ',' };
-
- private static final LdapV3DNStrConverter mLdapDNStrConverter =
- new LdapV3DNStrConverter();
-
/* the list of request attributes needed by this AVA */
protected String[] mReqAttrs = null;
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
index cd298bc3b..ea69cc5a1 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
@@ -121,7 +121,6 @@ class MapAVAPattern {
"URIName",
"IPAddress",
"OIDName" };
- private static final char[] endChars = new char[] { '+', ',' };
private static final LdapV3DNStrConverter mLdapDNStrConverter =
new LdapV3DNStrConverter();
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
index cbc77560f..06050480e 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
@@ -61,7 +61,6 @@ public class LdapCaCertPublisher
private ILogger mLogger = CMS.getLogger();
private boolean mInited = false;
protected IConfigStore mConfig = null;
- private String mcrlIssuingPointId;
/**
* constructor constructs default values.
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
index 68b1205ad..41a15f93a 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
@@ -63,7 +63,6 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin
private ILogger mLogger = CMS.getLogger();
private IConfigStore mConfig = null;
private boolean mInited = false;
- private boolean mRevokeCert;
public LdapEncryptCertPublisher() {
}
@@ -113,7 +112,6 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin
return;
mConfig = config;
mCertAttr = mConfig.getString("certAttr", LDAP_USERCERT_ATTR);
- mRevokeCert = mConfig.getBoolean(PROP_REVOKE_CERT, true);
mInited = true;
}
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 22c979f28..1244da12c 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
@@ -39,7 +39,6 @@ import com.netscape.certsrv.common.OpDef;
import com.netscape.certsrv.common.ScopeDef;
import com.netscape.certsrv.evaluators.IAccessEvaluator;
import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.usrgrp.IUGSubsystem;
/**
* Manage Access Control List configuration
@@ -52,8 +51,6 @@ public class ACLAdminServlet extends AdminServlet {
*
*/
private static final long serialVersionUID = -322237202045924779L;
- private IUGSubsystem mUG = null;
- private static final String PROP_ACLS = "acls";
private static final String PROP_EVAL = "accessEvaluator";
private final static String INFO = "ACLAdminServlet";
private IAuthzManager mAuthzMgr = null;
@@ -62,14 +59,6 @@ public class ACLAdminServlet extends AdminServlet {
"LOGGING_SIGNED_AUDIT_CONFIG_ACL_3";
/**
- * Constructs servlet.
- */
- public ACLAdminServlet() {
- super();
- mUG = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG);
- }
-
- /**
* initialize the servlet.
* <ul>
* <li>http.param OP_TYPE = OP_SEARCH,
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index ee1b53ed5..abb6048eb 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -92,7 +92,6 @@ public class AdminServlet extends HttpServlet {
private static final long serialVersionUID = 7740464244137421542L;
private final static String HDR_AUTHORIZATION = "Authorization";
private final static String HDR_LANG = "accept-language";
- private final static String HDR_CONTENT_LEN = "Content-Length";
protected ILogger mLogger = CMS.getLogger();
protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index 24e701d7a..71cf8a2ac 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -64,7 +64,6 @@ public class AuthAdminServlet extends AdminServlet {
private final static String PW_PASSWORD_CACHE_ADD =
"PASSWORD_CACHE_ADD";
- private final static String VIEW = ";" + Constants.VIEW;
private final static String EDIT = ";" + Constants.EDIT;
private final static String LOGGING_SIGNED_AUDIT_CONFIG_AUTH =
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index a47c7ae0d..f0aeb2295 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -100,8 +100,6 @@ public final class CMSAdminServlet extends AdminServlet {
private final static String PROP_DB = "dbs";
private final static String PROP_SMTP = "smtp";
- private final static String PROP_RADM = "radm";
- private final static String PROP_GATEWAY = "cmsgateway";
private final static String PROP_INTERNAL_DB = "internaldb";
private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index 47eeebe92..314a4072f 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
@@ -53,7 +53,6 @@ public class JobsAdminServlet extends AdminServlet {
*/
private static final long serialVersionUID = 561767449283982015L;
// ... remove later
- private final static String EDIT = ";edit";
private final static String VISIBLE = ";visible";
private final static String ENABLED = ";enabled";
private final static String DISABLED = ";disabled";
diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index 9600c5e56..a9661eedb 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -63,16 +63,11 @@ public class LogAdminServlet extends AdminServlet {
private ILogSubsystem mSys = null;
- private final static String VIEW = ";" + Constants.VIEW;
- private final static String EDIT = ";" + Constants.EDIT;
-
private final static String SIGNED_AUDIT_LOG_TYPE = "SignedAudit";
private final static String LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT =
"LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3";
private final static String LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE =
"LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE_4";
- private final static String LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE =
- "LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE_4";
/**
* Constructs Log servlet.
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index 19677e748..b459d8ad2 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.authority.IAuthority;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.ISubsystem;
@@ -70,11 +69,8 @@ public class ProfileAdminServlet extends AdminServlet {
public final static String PROP_AUTHORITY = "authority";
private final static String INFO = "ProfileAdminServlet";
- private final static String PW_PASSWORD_CACHE_ADD =
- "PASSWORD_CACHE_ADD";
public final static String PROP_PREDICATE = "predicate";
- private IAuthority mAuthority = null;
private IPluginRegistry mRegistry = null;
private IProfileSubsystem mProfileSub = null;
@@ -109,10 +105,7 @@ public class ProfileAdminServlet extends AdminServlet {
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
- String authority = config.getInitParameter(PROP_AUTHORITY);
- if (authority != null)
- mAuthority = (IAuthority) CMS.getSubsystem(authority);
mRegistry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY);
mProfileSub = (IProfileSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_PROFILE);
}
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index adbdc8279..0d1ab7eb5 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -83,15 +83,10 @@ public class PublisherAdminServlet extends AdminServlet {
public final static String PROP_AUTHORITY = "authority";
private final static String INFO = "PublisherAdminServlet";
- private final static String PW_TAG_CA_LDAP_PUBLISHING =
- "CA LDAP Publishing";
public final static String NOMAPPER = "<NONE>";
private IPublisherProcessor mProcessor = null;
private IAuthority mAuth = null;
- private final static String VIEW = ";" + Constants.VIEW;
- private final static String EDIT = ";" + Constants.EDIT;
-
public PublisherAdminServlet() {
super();
}
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
index 487fd9f2e..4d47d318f 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.authority.IAuthority;
import com.netscape.certsrv.common.Constants;
import com.netscape.certsrv.common.NameValuePairs;
import com.netscape.certsrv.common.OpDef;
@@ -52,11 +51,8 @@ public class RegistryAdminServlet extends AdminServlet {
public final static String PROP_AUTHORITY = "authority";
private final static String INFO = "RegistryAdminServlet";
- private final static String PW_PASSWORD_CACHE_ADD =
- "PASSWORD_CACHE_ADD";
public final static String PROP_PREDICATE = "predicate";
- private IAuthority mAuthority = null;
private IPluginRegistry mRegistry = null;
// These will be moved to PolicyResources
@@ -85,10 +81,6 @@ public class RegistryAdminServlet extends AdminServlet {
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
- String authority = config.getInitParameter(PROP_AUTHORITY);
-
- if (authority != null)
- mAuthority = (IAuthority) CMS.getSubsystem(authority);
mRegistry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY);
}
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index 97573d877..1c610996f 100644
--- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -129,7 +129,6 @@ public abstract class CMSServlet extends HttpServlet {
public final static String PROP_ACL = "ACLinfo";
public final static String AUTHZ_MGR_BASIC = "BasicAclAuthz";
public final static String AUTHZ_MGR_LDAP = "DirAclAuthz";
- private final static String FAILED = "1";
private final static String HDR_LANG = "accept-language";
// final error message - if error and exception templates don't work
diff --git a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
index ceba2fc72..357c901c3 100644
--- a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
@@ -71,25 +71,24 @@ public class DynamicVariablesServlet extends CMSServlet {
private static final String VAR_HTTP_STRING = "http()";
private static final Integer VAR_HTTP = Integer.valueOf(3);
- private String VAR_HTTP_VALUE = null;
private static final String VAR_AUTHMGRS_STRING = "authmgrs()";
private static final Integer VAR_AUTHMGRS = Integer.valueOf(4);
- private String VAR_AUTHMGRS_VALUE = null;
private static final String VAR_CLA_CRL_URL_STRING = "clacrlurl()";
private static final Integer VAR_CLA_CRL_URL = Integer.valueOf(6);
- private String VAR_CLA_CRL_URL_VALUE = null;
private String mAuthMgrCacheString = "";
private long mAuthMgrCacheTime = 0;
private final int AUTHMGRCACHE = 10; //number of seconds to cache list of
// authmanagers for
private Hashtable<Integer, String> dynvars = null;
+ @SuppressWarnings("unused")
private String mGetClientCert = "false";
private String mAuthMgr = null;
- private ServletConfig mServletCfg = null;
+ @SuppressWarnings("unused")
+ private ServletConfig mServletCfg;
private ServletContext mServletCtx = null;
private static String mCrlurl = "";
static {
diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
index b5f94bd19..bdb02cae3 100644
--- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
@@ -47,14 +47,6 @@ public class IndexServlet extends CMSServlet {
private final static String INFO = "indexServlet";
- // input parameters
-
- // output parameters
- private final static String OUT_TYPE = "type";
- private final static String OUT_ID = "id";
- private final static String OUT_TOTAL_COUNT = "totalCount";
- private final static String OUT_ERROR = "errorDetails";
-
private String mTemplateName = null;
public IndexServlet() {
diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
index a0587229a..1e4f0913e 100644
--- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
@@ -42,7 +42,6 @@ public class PortsServlet extends CMSServlet {
*
*/
private static final long serialVersionUID = -3750153734073658934L;
- private final static String INFO = "ports";
public PortsServlet() {
}
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index 1e1ee44f1..1b7524e19 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
@@ -81,7 +81,6 @@ public class DisplayBySerial extends CMSServlet {
*
*/
private static final long serialVersionUID = -4143700762995036597L;
- private final static String INFO = "DisplayBySerial";
private final static String TPL_FILE1 = "displayBySerial.template";
private final static BigInteger MINUS_ONE = new BigInteger("-1");
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index af91b1cb3..c3a268d14 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -61,7 +61,6 @@ public class DisplayCRL extends CMSServlet {
*
*/
private static final long serialVersionUID = 1152016798229054027L;
- private final static String INFO = "DisplayCRL";
private final static String TPL_FILE = "displayCRL.template";
//private final static String E_TPL_FILE = "error.template";
//private final static String OUT_ERROR = "errorDetails";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index 8e5df2c14..aac4315e7 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
@@ -18,13 +18,13 @@
package com.netscape.cms.servlet.cert;
import java.io.IOException;
+import java.math.BigInteger;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Date;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Vector;
-import java.math.BigInteger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -82,7 +82,6 @@ public class DoRevoke extends CMSServlet {
*
*/
private static final long serialVersionUID = 1693115906265904238L;
- private final static String INFO = "DoRevoke";
private final static String TPL_FILE = "revocationResult.template";
private ICertificateRepository mCertDB = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index f16ce2526..35bdd5c8c 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
@@ -19,11 +19,11 @@ package com.netscape.cms.servlet.cert;
import java.io.IOException;
import java.io.OutputStream;
+import java.math.BigInteger;
import java.util.Date;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Vector;
-import java.math.BigInteger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -73,7 +73,6 @@ public class DoRevokeTPS extends CMSServlet {
*
*/
private static final long serialVersionUID = -2980600514636454836L;
- private final static String INFO = "DoRevoke";
private final static String TPL_FILE = "revocationResult.template";
private ICertificateRepository mCertDB = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index 6f1346c68..5605acf6d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
@@ -67,11 +67,11 @@ public class DoUnrevoke extends CMSServlet {
*
*/
private static final long serialVersionUID = -7978703730006036625L;
- private final static String INFO = "DoUnrevoke";
private final static String TPL_FILE = "unrevocationResult.template";
- private final static BigInteger MINUS_ONE = new BigInteger("-1");
- private ICertificateRepository mCertDB = null;
+ @SuppressWarnings("unused")
+ private ICertificateRepository mCertDB;
+
private String mFormPath = null;
private IRequestQueue mQueue = null;
private IPublisherProcessor mPublisherProcessor = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index de5f075ba..7916887f8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
@@ -64,12 +64,10 @@ public class DoUnrevokeTPS extends CMSServlet {
*
*/
private static final long serialVersionUID = -6245049221697655642L;
- private final static String INFO = "DoUnrevoke";
- private final static String TPL_FILE = "unrevocationResult.template";
- private final static BigInteger MINUS_ONE = new BigInteger("-1");
- private ICertificateRepository mCertDB = null;
- private String mFormPath = null;
+ @SuppressWarnings("unused")
+ private ICertificateRepository mCertDB;
+
private IRequestQueue mQueue = null;
private IPublisherProcessor mPublisherProcessor = null;
private String errorString = "error=";
@@ -93,7 +91,6 @@ public class DoUnrevokeTPS extends CMSServlet {
*/
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
- mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE;
if (mAuthority instanceof ICertificateAuthority) {
mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository();
}
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 90d37f15a..a0f73d33b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -112,7 +112,6 @@ public class EnrollServlet extends CMSServlet {
private static final String CERT_AUTH_SINGLE = "single";
private static final String CLIENT_ISSUER = "clientIssuer";
- private boolean mAuthTokenOverride = true;
private String mEnrollSuccessTemplate = null;
private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller();
@@ -1698,7 +1697,8 @@ public class EnrollServlet extends CMSServlet {
// key usage extension always ends up being digital signature only
// and for rsa-ex ends up having no bits set.
- private boolean mIsTestBed = false;
+ @SuppressWarnings("unused")
+ private boolean mIsTestBed;
private void init_testbed_hack(IConfigStore config)
throws EBaseException {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
index 6c7aefa4d..51b7f783f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
@@ -69,8 +69,6 @@ public class GetBySerial extends CMSServlet {
*/
private static final long serialVersionUID = -2276677839178370838L;
- private final static String INFO = "GetBySerial";
-
private final static String IMPORT_CERT_TEMPLATE = "ImportCert.template";
private String mImportTemplate = null;
private String mIETemplate = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
index 30f0b0c40..bc9f09976 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
@@ -60,9 +60,6 @@ public class GetInfo extends CMSServlet {
*/
private static final long serialVersionUID = 1909881831730252799L;
- private final static String INFO = "GetInfo";
-
- private String mFormPath = null;
private ICertificateAuthority mCA = null;
/**
@@ -80,7 +77,6 @@ public class GetInfo extends CMSServlet {
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
- mFormPath = "";
if (mAuthority instanceof ICertificateAuthority)
mCA = (ICertificateAuthority) mAuthority;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 58ff2383c..66d3b4979 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -117,7 +117,6 @@ public class HashEnrollServlet extends CMSServlet {
private static final String CLIENT_ISSUER = "clientIssuer";
public static final String TPL_ERROR_FILE = "/ra/GenErrorHashDirEnroll.template";
- private boolean mAuthTokenOverride = true;
private String mEnrollSuccessTemplate = null;
private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller();
@@ -139,7 +138,7 @@ public class HashEnrollServlet extends CMSServlet {
mTemplates.remove(CMSRequest.SUCCESS);
try {
mEnrollSuccessTemplate = sc.getInitParameter(
- CMSServlet.PROP_SUCCESS_TEMPLATE);
+ CMSServlet.PROP_SUCCESS_TEMPLATE);
if (mEnrollSuccessTemplate == null)
mEnrollSuccessTemplate = ENROLL_SUCCESS_TEMPLATE;
String fillername =
@@ -334,7 +333,7 @@ public class HashEnrollServlet extends CMSServlet {
try {
authzToken = authorize(mAclMethod, token,
- mAuthzResourceName, "import");
+ mAuthzResourceName, "import");
} catch (Exception e) {
// do nothing for now
}
@@ -442,12 +441,9 @@ public class HashEnrollServlet extends CMSServlet {
// first, make sure the client cert is indeed a
// signing only cert
- if ((CMS.isSigningCert(sslClientCert) ==
- false) ||
- ((CMS.isSigningCert(sslClientCert) ==
- true) &&
- (CMS.isEncryptionCert(sslClientCert) ==
- true))) {
+ if ((CMS.isSigningCert(sslClientCert) == false) ||
+ ((CMS.isSigningCert(sslClientCert) == true) &&
+ (CMS.isEncryptionCert(sslClientCert) == true))) {
// either it's not a signing cert, or it's a dual cert
log(ILogger.LL_FAILURE,
CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE"));
@@ -478,7 +474,7 @@ public class HashEnrollServlet extends CMSServlet {
+ "))(certStatus=VALID))";
ICertRecordList list =
mCa.getCertificateRepository().findCertRecordsInList(filter,
- null, 10);
+ null, 10);
int size = list.getSize();
Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1);
boolean gotEncCert = false;
@@ -547,12 +543,9 @@ public class HashEnrollServlet extends CMSServlet {
} else if (certauthEnrollType.equals(CERT_AUTH_ENCRYPTION)) {
// first, make sure the client cert is indeed a
// signing only cert
- if ((CMS.isSigningCert(sslClientCert) ==
- false) ||
- ((CMS.isSigningCert(sslClientCert) ==
- true) &&
- (CMS.isEncryptionCert(sslClientCert) ==
- true))) {
+ if ((CMS.isSigningCert(sslClientCert) == false) ||
+ ((CMS.isSigningCert(sslClientCert) == true) &&
+ (CMS.isEncryptionCert(sslClientCert) == true))) {
// either it's not a signing cert, or it's a dual cert
log(ILogger.LL_FAILURE,
CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE"));
diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
index 884616fe9..814bd4209 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
@@ -62,7 +62,6 @@ public class Monitor extends CMSServlet {
*/
private static final long serialVersionUID = -8492837942132357692L;
private final static String TPL_FILE = "monitor.template";
- private final static String INFO = "Monitor";
private ICertificateRepository mCertDB = null;
private IRequestQueue mQueue = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 2783656ae..c76181aa1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
@@ -62,7 +62,6 @@ public class RemoteAuthConfig extends CMSServlet {
*
*/
private static final long serialVersionUID = -5803015919915253940L;
- private final static String INFO = "RemoteAuthConfig";
private final static String TPL_FILE = "remoteAuthConfig.template";
private final static String ENABLE_REMOTE_CONFIG = "enableRemoteConfiguration";
private final static String REMOTELY_SET_INSTANCES = "remotelySetInstances";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
index 45b02969d..d538ce675 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
@@ -18,7 +18,6 @@
package com.netscape.cms.servlet.cert;
import java.io.IOException;
-import java.math.BigInteger;
import java.security.PublicKey;
import java.util.Calendar;
import java.util.Date;
@@ -72,8 +71,6 @@ public class SrchCerts extends CMSServlet {
*/
private static final long serialVersionUID = -5876805830088921643L;
private final static String TPL_FILE = "srchCert.template";
- private final static String INFO = "SrchCerts";
- private final static BigInteger MINUS_ONE = new BigInteger("-1");
private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReturns";
private final static String CURRENT_TIME = "currentTime";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
index 6be6d506c..bd12bcfd8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
@@ -70,7 +70,6 @@ public class UpdateCRL extends CMSServlet {
*
*/
private static final long serialVersionUID = -1182106454856991246L;
- private final static String INFO = "UpdateCRL";
private final static String TPL_FILE = "updateCRL.template";
private static Vector<String> mTesting = new Vector<String>();
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index 3dae379a1..6e580896e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -68,7 +68,6 @@ public class UpdateDir extends CMSServlet {
*
*/
private static final long serialVersionUID = 3063889978908136789L;
- private final static String INFO = "UpdateDir";
private final static String TPL_FILE = "updateDir.template";
private final static int UPDATE_ALL = 0;
private final static int UPDATE_CRL = 1;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index e56651ed8..dc0b0c474 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -171,8 +171,6 @@ public class CRSEnrollment extends HttpServlet {
private static final String PROP_SUBSTORENAME = "substorename";
private static final String PROP_AUTHORITY = "authority";
- private static final String PROP_CRS = "crs";
- private static final String PROP_CRSCA = "casubsystem";
private static final String PROP_CRSAUTHMGR = "authName";
private static final String PROP_APPENDDN = "appendDN";
private static final String PROP_CREATEENTRY = "createEntry";
@@ -1938,7 +1936,9 @@ public class CRSEnrollment extends HttpServlet {
private Enumeration<?> externalTokens = null;
private org.mozilla.jss.crypto.X509Certificate signingCert;
private org.mozilla.jss.crypto.PrivateKey signingCertPrivKey;
- private int signingCertKeySize = 0;
+
+ @SuppressWarnings("unused")
+ private int signingCertKeySize;
class CryptoContextException extends Exception {
/**
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
index e0716cb70..a27a3dd43 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
@@ -53,6 +53,7 @@ public class CMSFileLoader {
private int mClearSize = CLEAR_SIZE;
// whether to cache templates and forms only.
+ @SuppressWarnings("unused")
private boolean mCacheTemplatesOnly = true;
public CMSFileLoader() {
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
index 157d5e3d1..8d03ca37c 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
@@ -49,7 +49,6 @@ public class CMSGateway {
public final static String PROP_CMSGATEWAY = "cmsgateway";
private final static String PROP_ENABLE_ADMIN_ENROLL = "enableAdminEnroll";
- private final static String PROP_SERVER_XML = "server.xml";
public static final String CERT_ATTR =
"javax.servlet.request.X509Certificate";
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
index 6d51c8d4c..0188b781a 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
@@ -28,7 +28,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
-import java.util.Date;
import java.util.Enumeration;
import javax.servlet.ServletOutputStream;
@@ -55,11 +54,6 @@ public class CMSTemplate extends CMSFile {
* variables
*==========================================================*/
- /* private variables */
- private String mTemplateFileName = "";
- private ILogger mLogger = CMS.getLogger();
- private long mTimeStamp;
-
/* public vaiables */
public String mPreOutput;
public String mPostOutput;
@@ -120,11 +114,6 @@ public class CMSTemplate extends CMSFile {
CMS.getLogMessage("CMSGW_TEMPLATE_NO_CONTENT_1", mAbsPath));
}
- /* time stamp */
- Date now = CMS.getCurrentDate();
-
- mTimeStamp = now.getTime();
-
/* if template file, find template tag substring and set
* pre/post output string
*/
diff --git a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
index ced916541..53ddc4c88 100644
--- a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
@@ -37,15 +37,12 @@ import com.netscape.certsrv.base.ISubsystem;
*/
public class IndexTemplateFiller implements ICMSTemplateFiller {
- private final static String INFO = "index";
-
// input parameters
// output parameters
private final static String OUT_TYPE = "type";
private final static String OUT_ID = "id";
private final static String OUT_TOTAL_COUNT = "totalCount";
- private final static String OUT_ERROR = "errorDetails";
public IndexTemplateFiller() {
}
diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index e8b8f12f8..63a078a84 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -94,8 +94,6 @@ public class ConnectorServlet extends CMSServlet {
protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
private final static String SIGNED_AUDIT_PROTECTION_METHOD_SSL = "ssl";
- private final static String SIGNED_AUDIT_PROTECTION_METHOD_UNKNOWN =
- "unknown";
private final static String LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS =
"LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS_5";
private final static String LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST =
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 634be8748..74d1069eb 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
@@ -55,7 +55,9 @@ import com.netscape.cmsutil.crypto.CryptoUtil;
public class CertRequestPanel extends WizardPanelBase {
private Vector<Cert> mCerts = null;
- private WizardServlet mServlet = null;
+
+ @SuppressWarnings("unused")
+ private WizardServlet mServlet;
public CertRequestPanel() {
}
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
index 9a780cca8..046fb111d 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
@@ -42,7 +42,6 @@ public class CheckIdentity extends CMSServlet {
*/
private static final long serialVersionUID = 1647682040815275807L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public CheckIdentity() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
index 808cfa523..57a1e6202 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
@@ -40,8 +40,6 @@ public class DownloadPKCS12 extends CMSServlet {
*
*/
private static final long serialVersionUID = -7770226137155537526L;
- private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
public DownloadPKCS12() {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
index c956e733a..8cc0f85d6 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
@@ -46,7 +46,6 @@ public class GetCertChain extends CMSServlet {
*/
private static final long serialVersionUID = -356806997334418285L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public GetCertChain() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
index e16f99f4f..c0a57c3d7 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
@@ -52,7 +52,6 @@ public class GetCookie extends CMSServlet {
*/
private static final long serialVersionUID = 2466968231929541707L;
private static Random mRandom = null;
- private final static int SESSION_MAX_AGE = 3600;
private String mErrorFormPath = null;
private String mFormPath = null;
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
index 21baefcb0..998a4b162 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
@@ -41,8 +41,6 @@ public class GetStatus extends CMSServlet {
*
*/
private static final long serialVersionUID = -2852842030221659847L;
- private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public GetStatus() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
index 85f274404..b894971b1 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
@@ -45,7 +45,6 @@ public class GetSubsystemCert extends CMSServlet {
*/
private static final long serialVersionUID = -5720342238234153488L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public GetSubsystemCert() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
index 28c3b242d..2f44ca1b0 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
@@ -43,7 +43,6 @@ public class GetTokenInfo extends CMSServlet {
*/
private static final long serialVersionUID = -8416582986909026263L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public GetTokenInfo() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
index 847ca3486..ae5edf617 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
@@ -52,7 +52,6 @@ public class GetTransportCert extends CMSServlet {
*/
private static final long serialVersionUID = 2495152202191979339L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
public GetTransportCert() {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
index dd648e8c5..859ba845e 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
@@ -51,7 +51,6 @@ public class ImportTransportCert extends CMSServlet {
*/
private static final long serialVersionUID = 7490067757951541235L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
public ImportTransportCert() {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
index 1d833ca9b..db70d7729 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
@@ -42,8 +42,6 @@ public class MainPageServlet extends CMSServlet {
*
*/
private static final long serialVersionUID = 2425301522251239666L;
- private static final String PROP_AUTHORITY_ID = "authorityId";
- private String mAuthorityId = null;
private String mFormPath = null;
public MainPageServlet() {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 4ea150ea2..d2cf540c3 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
@@ -63,7 +63,6 @@ public class RegisterUser extends CMSServlet {
*/
private static final long serialVersionUID = -699307373400031138L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
private String mGroupName = null;
private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
index 4c6338751..745962c72 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
@@ -43,7 +43,6 @@ public class TokenAuthenticate extends CMSServlet {
*/
private static final long serialVersionUID = -9098593390260940853L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
public TokenAuthenticate() {
super();
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
index 2698da7d9..240468d03 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
@@ -51,7 +51,6 @@ public class UpdateConnector extends CMSServlet {
*/
private static final long serialVersionUID = 972871860008509849L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
public UpdateConnector() {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
index ff3666f2a..eb88a1c31 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
@@ -51,7 +51,6 @@ public class UpdateNumberRange extends CMSServlet {
*/
private static final long serialVersionUID = -1584171713024263331L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
private final static String LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER =
"LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER_1";
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
index 30e0b0fce..e1b33ea6a 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
@@ -47,7 +47,6 @@ public class UpdateOCSPConfig extends CMSServlet {
*/
private static final long serialVersionUID = 42812270761684404L;
private final static String SUCCESS = "0";
- private final static String FAILED = "1";
private final static String AUTH_FAILURE = "2";
public UpdateOCSPConfig() {
diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
index 4ee751f1a..008b372e2 100644
--- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
@@ -59,18 +59,8 @@ public class ExamineRecovery extends CMSServlet {
private final static String INFO = "examineRecovery";
private final static String TPL_FILE = "examineRecovery.template";
- private final static String IN_SERIALNO = "serialNumber";
- private final static String IN_UID = "uid";
- private final static String IN_PWD = "pwd";
- private final static String IN_PASSWORD = "p12Password";
- private final static String IN_DELIVERY = "p12Delivery";
- private final static String IN_CERT = "cert";
-
private final static String OUT_OP = "op";
- private final static String OUT_SERIALNO = IN_SERIALNO;
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_SERVICE_URL = "serviceURL";
- private final static String OUT_ERROR = "errorDetails";
private IKeyService mService = null;
private String mFormPath = null;
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
index 4989c1245..5926a5672 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
@@ -59,9 +59,6 @@ public class GetApprovalStatus extends CMSServlet {
private final static String TPL_FILE = "getApprovalStatus.template";
private final static String TPL_FINISH = "finishRecovery.template";
- private final static String IN_DELIVERY = "p12Delivery";
-
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_ERROR = "errorDetails";
private final static String OUT_STATUS = "status";
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
index dfc7d4d3b..65f8d2936 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
@@ -59,11 +59,9 @@ public class GetAsyncPk12 extends CMSServlet {
private final static String IN_PASSWORD = "p12Password";
private final static String IN_PASSWORD_AGAIN = "p12PasswordAgain";
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_ERROR = "errorDetails";
private com.netscape.certsrv.kra.IKeyService mService = null;
- private final static String OUT_STATUS = "status";
private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS =
"LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS_4";
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
index fdcbf40bc..e22a19b82 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
@@ -58,11 +58,9 @@ public class GetPk12 extends CMSServlet {
private final static String TPL_FILE = "finishRecovery.template";
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_ERROR = "errorDetails";
private com.netscape.certsrv.kra.IKeyService mService = null;
- private final static String OUT_STATUS = "status";
private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS =
"LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS_4";
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
index fee739f29..5b5aaaf8e 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
@@ -53,14 +53,7 @@ public class GrantAsyncRecovery extends CMSServlet {
private final static String INFO = "grantAsyncRecovery";
private final static String TPL_FILE = "grantAsyncRecovery.template";
- private final static String IN_SERIALNO = "serialNumber";
- private final static String IN_REQ_ID = "reqID";
- private final static String IN_UID = "uid";
- private final static String IN_CERT = "cert";
-
private final static String OUT_OP = "op";
- private final static String OUT_SERIALNO = IN_SERIALNO;
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_SERVICE_URL = "serviceURL";
private final static String OUT_ERROR = "errorDetails";
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
index 9c4ccc8be..e75e334ba 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
@@ -55,16 +55,7 @@ public class GrantRecovery extends CMSServlet {
private final static String INFO = "grantRecovery";
private final static String TPL_FILE = "grantRecovery.template";
- private final static String IN_SERIALNO = "serialNumber";
- private final static String IN_UID = "uid";
- private final static String IN_PWD = "pwd";
- private final static String IN_PASSWORD = "p12Password";
- private final static String IN_DELIVERY = "p12Delivery";
- private final static String IN_CERT = "cert";
-
private final static String OUT_OP = "op";
- private final static String OUT_SERIALNO = IN_SERIALNO;
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_SERVICE_URL = "serviceURL";
private final static String OUT_ERROR = "errorDetails";
diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
index bedfa911d..97ae1f4fb 100644
--- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
@@ -73,7 +73,6 @@ public class RecoverBySerial extends CMSServlet {
private final static String OUT_OP = "op";
private final static String OUT_SERIALNO = IN_SERIALNO;
- private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess";
private final static String OUT_SERVICE_URL = "serviceURL";
private final static String OUT_ERROR = "errorDetails";
diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
index c3e6bba53..adb201c75 100644
--- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
@@ -71,7 +71,6 @@ public class SrchKeyForRecovery extends CMSServlet {
private final static String OUT_MAXCOUNT = IN_MAXCOUNT;
private final static String OUT_SENTINEL = IN_SENTINEL;
private final static String OUT_OP = "op";
- private final static String OUT_ERROR = "errorDetails";
private final static String OUT_ARCHIVER = "archiverName";
private final static String OUT_SERVICE_URL = "serviceURL";
private final static String OUT_TOTAL_COUNT = "totalRecordCount";
diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
index 4d46e8a75..2fbd55460 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
@@ -63,6 +63,7 @@ import com.netscape.cms.servlet.common.ECMSGWException;
*/
public class CRMFProcessor extends PKIProcessor {
+ @SuppressWarnings("unused")
private CMSRequest mRequest;
private boolean enforcePop = false;
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
index fed0b1ee2..6acc1634c 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
@@ -49,10 +49,6 @@ public class ProfileListServlet extends ProfileServlet {
*/
private static final long serialVersionUID = -5118812083812548395L;
- private static final String PROP_AUTHORITY_ID = "authorityId";
-
- private String mAuthorityId = null;
-
public ProfileListServlet() {
super();
}
@@ -65,7 +61,6 @@ public class ProfileListServlet extends ProfileServlet {
*/
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
- mAuthorityId = sc.getInitParameter(PROP_AUTHORITY_ID);
}
/**
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
index 9eac8eebd..e975161da 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
@@ -128,7 +128,6 @@ public class ProfileServlet extends CMSServlet {
public final static String ARG_OUTPUT_VAL = "outputVal";
private static final String PROP_TEMPLATE = "templatePath";
- private static final String PROP_AUTH_MGR_ID = "authMgrId";
private final static String PROP_AUTHMGR = "AuthMgr";
private final static String PROP_CLIENTAUTH = "GetClientCert";
private static final String PROP_PROFILE_SUB_ID = "profileSubId";
@@ -146,7 +145,6 @@ public class ProfileServlet extends CMSServlet {
private final static String HDR_LANG = "accept-language";
private String mTemplate = null;
- private String mAuthMgrId = null;
protected String mId = null;
protected String mGetClientCert = "false";
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index 93e5b6a4b..16fa2a394 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
@@ -77,22 +77,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
private static final long serialVersionUID = -8017841111435988197L;
private static final String ARG_AUTH_TOKEN = "auth_token";
private static final String PROP_PROFILE_ID = "profileId";
- private static final String PROP_AUTHORITY_ID = "authorityId";
- private String mOutputTemplateClassName = null;
private String mProfileId = null;
private String mProfileSubId = null;
- private String mReqType = null;
- private String mAuthorityId = null;
- private String requestBinary = null;
private String requestB64 = null;
- private final static String[] SIGNED_AUDIT_AUTOMATED_REJECTION_REASON = new String[] {
-
- /* 0 */"automated profile cert request rejection: "
- + "indeterminate reason for inability to process "
- + "cert request due to an EBaseException"
- };
private final static String LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED =
"LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED_5";
@@ -111,9 +100,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
*/
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
- mAuthorityId = sc.getInitParameter(PROP_AUTHORITY_ID);
mProfileId = sc.getInitParameter(PROP_PROFILE_ID);
- mOutputTemplateClassName = sc.getInitParameter("outputTemplateClass");
mRenderResult = false;
}
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index 7292be519..85ef4fa0f 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
@@ -92,7 +92,6 @@ public class ProfileSubmitServlet extends ProfileServlet {
private String mProfileId = null;
private String mProfileSubId = null;
- private String mReqType = null;
private String mAuthorityId = null;
private final static String[] SIGNED_AUDIT_AUTOMATED_REJECTION_REASON = new String[] {
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
index 1733998aa..11716115f 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
@@ -92,16 +92,10 @@ public class CertReqParser extends ReqParser {
private static final String EXT_PRETTYPRINT = "ext_prettyprint";
- private static final String DOT = ".";
private static final String LB = "[";
private static final String RB = "]";
private static final String EQ = " = ";
- private static final String HTTP_PARAMS_COUNTER = IRequest.HTTP_PARAMS + LB + "httpParamsCount++" + RB;
- private static final String HTTP_HEADERS_COUNTER = IRequest.HTTP_HEADERS + LB + "httpHeadersCount++" + RB;
- private static final String AUTH_TOKEN_COUNTER = IRequest.AUTH_TOKEN + LB + "authTokenCount++" + RB;
- private static final String SERVER_ATTRS_COUNTER = IRequest.SERVER_ATTRS + LB + "serverAttrsCount++" + RB;
-
/**
* Fills in certificate specific request attributes.
*/
diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
index 41e6523a5..fd305add2 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
@@ -21,12 +21,12 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.util.Locale;
import java.util.StringTokenizer;
-import java.math.BigInteger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -92,13 +92,10 @@ public class CheckRequest extends CMSServlet {
private static final long serialVersionUID = 2791195859767119636L;
// constants
public static String FULL_RESPONSE = "cmcFullEnrollmentResponse";
- private final static String INFO = "CheckRequest";
private final static String REQ_ID = "requestId";
- private final static String REQ_TYPE = "requestType";
private final static String STATUS = "status";
private final static String CREATE_ON = "createdOn";
private final static String UPDATE_ON = "updatedOn";
- private final static String UPDATE_BY = "updatedBy";
private final static String TPL_FILE = "requestStatus.template";
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index c324e4a1f..fa33f3eb1 100644
--- a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
@@ -77,7 +77,6 @@ import com.netscape.cms.servlet.common.CMSRequest;
import com.netscape.cms.servlet.common.CMSTemplate;
import com.netscape.cms.servlet.common.CMSTemplateParams;
import com.netscape.cms.servlet.common.ECMSGWException;
-import com.netscape.cms.servlet.common.ICMSTemplateFiller;
import com.netscape.cmsutil.util.Utils;
/**
@@ -93,9 +92,7 @@ public class ProcessCertReq extends CMSServlet {
*
*/
private static final long serialVersionUID = 812464895240811318L;
- private final static String INFO = "processReq";
private final static String SEQNUM = "seqNum";
- private final static String TO_DO = "toDo";
private final static String TPL_FILE = "processCertReq.template";
private IRequestQueue mQueue = null;
@@ -108,9 +105,7 @@ public class ProcessCertReq extends CMSServlet {
private final static String REQ_COMPLETED_TEMPLATE = "ra/RequestCompleted.template";
private final static String PROP_REQ_COMPLETED_TEMPLATE = "requestCompletedTemplate";
private final static String PROP_EXTRA_AGENT_PARAMS = "extraAgentParams";
- private static ICMSTemplateFiller REQ_COMPLETED_FILLER = new RAReqCompletedFiller();
private String mReqCompletedTemplate = null;
- private final static String CERT_TYPE = "certType";
private String auditServiceID = ILogger.UNIDENTIFIED;
private final static String AGENT_CA_CLONE_ENROLLMENT_SERVLET =
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
index bf8decd69..dc61e1e02 100644
--- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
@@ -18,8 +18,8 @@
package com.netscape.cms.servlet.request;
import java.io.IOException;
-import java.util.Locale;
import java.math.BigInteger;
+import java.util.Locale;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -61,11 +61,9 @@ public class ProcessReq extends CMSServlet {
*
*/
private static final long serialVersionUID = -6941843162486565610L;
- private final static String INFO = "processReq";
private final static String SEQNUM = "seqNum";
private final static String DO_ASSIGN = "doAssign";
private final static String TPL_FILE = "processReq.template";
- private final static String OUT_ERROR = "errorDetails";
private final static String PROP_PARSER = "parser";
private IRequestQueue mQueue = null;
@@ -73,9 +71,6 @@ public class ProcessReq extends CMSServlet {
private IReqParser mParser = null;
private String[] mSigningAlgorithms = null;
- private static String[] DEF_SIGNING_ALGORITHMS = new String[]
- { "SHA1withRSA", "SHA256withRSA", "SHA512withRSA", "SHA1withDSA", "MD5withRSA", "MD2withRSA" };
-
/**
* Process request.
*/
diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
index f18fabc6a..f1e8ec8b1 100644
--- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
@@ -18,10 +18,10 @@
package com.netscape.cms.servlet.request;
import java.io.IOException;
+import java.math.BigInteger;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Vector;
-import java.math.BigInteger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -56,7 +56,6 @@ public class QueryReq extends CMSServlet {
*/
private static final long serialVersionUID = -8729364426329835378L;
// constants
- private final static String INFO = "QueryReq";
private final static String IN_SHOW_ALL = "showAll";
private final static String IN_SHOW_WAITING = "showWaiting";
private final static String IN_SHOW_IN_SERVICE = "showInService";
@@ -66,35 +65,17 @@ public class QueryReq extends CMSServlet {
private final static String IN_SHOW_COMPLETED = "showCompleted";
private final static String IN_MAXCOUNT = "maxCount";
private final static String IN_TOTALCOUNT = "totalRecordCount";
- private final static String ON = "on";
private final static String PROP_PARSER = "parser";
private final static String TPL_FILE = "queryReq.template";
- private final static String OUT_SERVICE_URL = "serviceURL";
- private final static String OUT_OP = "op";
- private final static String OUT_MAXCOUNT = IN_MAXCOUNT;
private final static String OUT_TOTALCOUNT = IN_TOTALCOUNT;
private final static String OUT_CURRENTCOUNT = "currentRecordCount";
- private final static String OUT_SENTINEL_DOWN = "querySentinelDown";
- private final static String OUT_SHOW_COMPLETED = IN_SHOW_COMPLETED;
- private final static String OUT_SEQNUM = "seqNum";
- private final static String OUT_STATUS = "status";
- private final static String OUT_CREATE_ON = "createdOn";
- private final static String OUT_UPDATE_ON = "updatedOn";
- private final static String OUT_UPDATE_BY = "updatedBy";
private final static String OUT_REQUESTING_USER = "requestingUser";
//keeps track of where to begin if page down
private final static String OUT_FIRST_ENTRY_ON_PAGE = "firstEntryOnPage";
//keeps track of where to begin if page up
private final static String OUT_LAST_ENTRY_ON_PAGE = "lastEntryOnPage";
- private final static String OUT_SUBJECT = "subject";
- private final static String OUT_REQUEST_TYPE = "requestType";
- private final static String OUT_COMMENTS = "requestorComments";
- private final static String OUT_SERIALNO = "serialNumber";
- private final static String OUT_OWNER_NAME = "ownerName";
- private final static String OUT_PUBLIC_KEY_INFO =
- "subjectPublicKeyInfo";
private final static String OUT_ERROR = "error";
private final static String OUT_AUTHORITY_ID = "authorityid";
diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
index 02dac53f9..10daeeb08 100644
--- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
@@ -18,7 +18,6 @@
package com.netscape.cms.servlet.request;
import java.io.IOException;
-import java.math.BigInteger;
import java.util.Date;
import java.util.Locale;
@@ -59,19 +58,11 @@ public class SearchReqs extends CMSServlet {
*/
private static final long serialVersionUID = 2449481964851735051L;
private final static String TPL_FILE = "queryReq.template";
- private final static String INFO = "QueryReq";
private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReqReturns";
private final static String PROP_PARSER = "parser";
private final static String CURRENT_TIME = "currentTime";
- private final static BigInteger MINUS_ONE = new BigInteger("-1");
- private final static String OUT_AUTHORITY_ID = "authorityid";
- private final static String OUT_REQUESTING_USER = "requestingUser";
- private final static String OUT_SEQNUM_FROM = "seqNumFrom";
- private final static String OUT_MAXCOUNT = "maxCount";
private final static String OUT_TOTALCOUNT = "totalRecordCount";
private final static String OUT_CURRENTCOUNT = "currentRecordCount";
- private final static String OUT_SENTINEL = "querySentinel";
- private final static String OUT_ERROR = "error";
private final static int MAX_RESULTS = 1000;
private IRequestQueue mQueue = null;
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index ea0b10a67..ee6913acc 100644
--- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
@@ -44,7 +44,6 @@ import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.IPrettyPrintFormat;
import com.netscape.certsrv.base.SessionContext;
import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.tks.ITKSAuthority;
import com.netscape.cms.servlet.base.CMSServlet;
import com.netscape.cms.servlet.common.CMSRequest;
import com.netscape.symkey.SessionKey;
@@ -66,13 +65,8 @@ public class TokenServlet extends CMSServlet {
protected static final String TRANSPORT_KEY_NAME = "sharedSecret";
private final static String INFO = "TokenServlet";
public static int ERROR = 1;
- private ITKSAuthority mTKS = null;
- private String mSelectedToken = null;
- private String mNewSelectedToken = null;
String mKeyNickName = null;
String mNewKeyNickName = null;
- private final static String LOGGING_SIGNED_AUDIT_CONFIG_DRM =
- "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3";
IPrettyPrintFormat pp = CMS.getPrettyPrintFormat(":");
private final static String LOGGING_SIGNED_AUDIT_COMPUTE_SESSION_KEY_REQUEST =
@@ -177,9 +171,6 @@ public class TokenServlet extends CMSServlet {
}
CMS.debug("keySet selected: " + keySet);
- mNewSelectedToken = null;
-
- mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot");
String masterKeyPrefix = CMS.getConfigStore().getString("tks.master_key_prefix", null);
String temp = req.getParameter("KeyInfo"); //#xx#xx
String keyInfoMap = "tks." + keySet + ".mk_mappings." + temp;
@@ -190,9 +181,7 @@ public class TokenServlet extends CMSServlet {
while (st.hasMoreTokens()) {
String currentToken = st.nextToken();
- if (tokenNumber == 0)
- mSelectedToken = currentToken;
- else if (tokenNumber == 1)
+ if (tokenNumber == 1)
mKeyNickName = currentToken;
tokenNumber++;
@@ -208,9 +197,7 @@ public class TokenServlet extends CMSServlet {
int tokenNumber = 0;
while (st.hasMoreTokens()) {
String currentToken = st.nextToken();
- if (tokenNumber == 0)
- mNewSelectedToken = currentToken;
- else if (tokenNumber == 1)
+ if (tokenNumber == 1)
mNewKeyNickName = currentToken;
tokenNumber++;
@@ -1314,7 +1301,6 @@ public class TokenServlet extends CMSServlet {
}
String temp = req.getParameter("card_challenge");
- mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot");
setDefaultSlotAndKeyName(req);
if (temp != null) {
processComputeSessionKey(req, resp);
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index 4c808132c..19fc5162b 100644
--- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -188,7 +188,8 @@ public class CMSEngine implements ICMSEngine {
private int pid;
private IConfigStore mConfig = null;
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private long mStartupTime = 0;
private boolean isStarted = false;
private StringBuffer mWarning = new StringBuffer();
@@ -239,6 +240,7 @@ public class CMSEngine implements ICMSEngine {
private static final int IP = 0;
private static final int PORT = 1;
+ @SuppressWarnings("unused")
private static final int HOST = 2;
private static final int AGENT = 0;
private static final int ADMIN = 1;
diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
index d8db16ad0..fab9c1812 100644
--- a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
@@ -71,7 +71,6 @@ public class CertUserDBAuthentication implements IAuthManager {
private boolean mRevocationCheckingEnabled = false;
private IConfigStore mRevocationChecking = null;
- private String mRequestor = null;
public CertUserDBAuthentication() {
}
diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index 1040e6034..f5bde0b54 100644
--- a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
@@ -40,7 +40,6 @@ import com.netscape.certsrv.ra.IRegistrationAuthority;
import com.netscape.certsrv.request.IRequest;
import com.netscape.certsrv.request.IRequestQueue;
import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.certsrv.usrgrp.ICertUserLocator;
import com.netscape.cmscore.base.SubsystemRegistry;
import com.netscape.cmscore.dbs.CertRecord;
import com.netscape.cmscore.util.Debug;
@@ -75,9 +74,7 @@ public class ChallengePhraseAuthentication implements IAuthManager {
private String mImplName = null;
private IConfigStore mConfig = null;
- private ICertUserLocator mCULocator = null;
private ILogger mLogger = CMS.getLogger();
- private String mRequestor = null;
private MessageDigest mSHADigest = null;
// request attributes hacks
@@ -390,7 +387,6 @@ public class ChallengePhraseAuthentication implements IAuthManager {
if (ra != null) {
queue = ra.getRequestQueue();
- mRequestor = IRequest.REQUESTOR_RA;
}
} catch (Exception e) {
log(ILogger.LL_FAILURE,
diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
index 4906d5c50..235362395 100644
--- a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
@@ -67,7 +67,6 @@ public class SSLClientCertAuthentication implements IAuthManager {
private String mName = null;
private String mImplName = null;
private IConfigStore mConfig = null;
- private String mRequestor = null;
/* Holds configuration parameters accepted by this implementation.
* This list is passed to the configuration console so configuration
@@ -256,7 +255,6 @@ public class SSLClientCertAuthentication implements IAuthManager {
if (ra != null) {
queue = ra.getRequestQueue();
- mRequestor = IRequest.REQUESTOR_RA;
}
} catch (Exception e) {
log(ILogger.LL_FAILURE,
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
index cc1bd6201..f8a5cf4d0 100644
--- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
+++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
@@ -92,8 +92,6 @@ public class SimpleProperties extends Hashtable<String, String> {
private static final String strictKeyValueSeparators = "=:";
- private static final String specialSaveChars = "=: \t\r\n\f#!";
-
private static final String whiteSpaceChars = " \t\r\n\f";
/**
@@ -455,9 +453,4 @@ public class SimpleProperties extends Hashtable<String, String> {
h.put(key, get(key));
}
}
-
- /** A table of hex digits */
- private static final char[] hexDigit = {
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
- };
}
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
index 6e4ec113f..c5e3312e1 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
@@ -38,19 +38,14 @@ public class HttpConnFactory {
private int mNumConns = 0; // number of available conns in array
private int mTotal = 0; // total num conns
- private IHttpConnection mMasterConn = null; // master connection object.
private IHttpConnection mConns[];
- private IAuthority mSource = null;
+ @SuppressWarnings("unused")
+ private IAuthority mSource;
private IRemoteAuthority mDest = null;
private String mNickname = "";
private int mTimeout = 0;
/**
- * default value for the above at init time.
- */
- private boolean mDefErrorIfDown = false;
-
- /**
* Constructor for initializing from the config store.
* must be followed by init(IConfigStore)
*/
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
index 90979f870..f947164d9 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
@@ -45,6 +45,7 @@ public class HttpConnector implements IConnector {
protected IHttpConnection mConn = null;
private Thread mResendThread = null;
private IResender mResender = null;
+ @SuppressWarnings("unused")
private int mTimeout;
private HttpConnFactory mConnFactory = null;
diff --git a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
index 33a2d7d71..baf076422 100644
--- a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
+++ b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
@@ -26,8 +26,6 @@ import com.netscape.cmscore.authentication.ChallengePhraseAuthentication;
public class RequestTransfer {
- private static final String DOT = ".";
-
private static String[] transferAttributes = {
IRequest.HTTP_PARAMS,
IRequest.AGENT_PARAMS,
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
index 0df563cad..f3b93fbdb 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -77,9 +77,10 @@ public class CertificateRepository extends Repository
private String mBaseDN;
private String mRequestBaseDN;
private boolean mConsistencyCheck = false;
- private boolean mSkipIfInconsistent = false;
- private int mCertStatusUpdateInterval = 0;
+ @SuppressWarnings("unused")
+ private boolean mSkipIfInconsistent;
+
private Hashtable<String, ICRLIssuingPoint> mCRLIssuingPoints = new Hashtable<String, ICRLIssuingPoint>();
private int mTransitMaxRecords = 1000000;
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index ece755fc3..304f5aa94 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -79,23 +79,6 @@ public class DBSubsystem implements IDBSubsystem {
private BigInteger mNextSerialConfig = null;
private boolean mEnableSerialMgmt = false;
- private static final String PEOPLE_DN = "ou=people";
- private static final String GROUPS_DN = "ou=groups";
- private static final String REQUESTS_DN = "ou=requests";
- private static final String XCERTS_DN = "cn=crossCerts";
- private static final String BASEDN = "o=netscapeCertificateServer";
- private static final String DEFAULT_DATABASE = "userRoot";
- private static final String AT_OC = "objectclass";
- private static final String AT_O = "o";
- private static final String AT_OU = "ou";
- private static final String CA_DN = "ou=ca";
- private static final String CR_DN = "ou=certificateRepository, ou=ca";
- private static final String CRL_DN = "ou=crlIssuingPoints, ou=ca";
- private static final String CA_REQUESTS_DN = "ou=ca, ou=requests";
- private static final String KRA_DN = "ou=kra";
- private static final String KR_DN = "ou=keyRepository, ou=kra";
- private static final String KRA_REQUESTS_DN = "ou=kra, ou=requests";
- private static final String REPLICA_DN = "ou=replica";
private static final String PROP_ENABLE_SERIAL_NUMBER_RECOVERY =
"enableSerialNumberRecovery";
// This value is only equal to the next Serial number that the CA's
diff --git a/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/common/src/com/netscape/cmscore/dbs/Repository.java
index 2cfe320f6..4a438c07c 100644
--- a/base/common/src/com/netscape/cmscore/dbs/Repository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/Repository.java
@@ -51,7 +51,6 @@ public abstract class Repository implements IRepository {
private static final BigInteger BI_ONE = new BigInteger("1");
private BigInteger BI_INCREMENT = null;
- private static final BigInteger BI_ZERO = new BigInteger("0");
// (the next serialNo to be issued) - 1
private BigInteger mSerialNo = null;
// the serialNo attribute stored in db
diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
index 0d3ab35f7..3322ca9b0 100644
--- a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
+++ b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
@@ -49,7 +49,8 @@ public class CMSExtensionsMap implements ISubsystem {
private Hashtable<String, ICMSExtension> mName2Ext = new Hashtable<String, ICMSExtension>();
private Hashtable<String, ICMSExtension> mOID2Ext = new Hashtable<String, ICMSExtension>();
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private IConfigStore mConfig = null;
/**
diff --git a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
index dc4423357..41038d898 100644
--- a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
+++ b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
@@ -31,21 +31,18 @@ import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.ISubsystem;
import com.netscape.certsrv.extensions.EExtensionsException;
import com.netscape.certsrv.extensions.ICMSExtension;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.cmscore.util.Debug;
public class KeyUsage implements ICMSExtension {
private final static String NAME = "KeyUsageExtension";
private final static ObjectIdentifier OID = PKIXExtensions.KeyUsage_Id;
- private IConfigStore mConfig = null;
+ @SuppressWarnings("unused")
+ private IConfigStore mConfig;
private boolean mSetDefault = false;
- private ILogger mLogger;
-
public KeyUsage(boolean setDefault) {
mSetDefault = setDefault;
- mLogger = CMS.getLogger();
}
public void init(ISubsystem owner, IConfigStore config)
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
index ca4bb440c..1ce2eeefb 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
@@ -43,7 +43,8 @@ public class LdapBoundConnection extends LDAPConnection {
private static final long serialVersionUID = -2242077674357271559L;
// LDAPConnection calls authenticate so must set this for first
// authenticate call.
- private boolean mAuthenticated = false;
+ @SuppressWarnings("unused")
+ private boolean mAuthenticated;
/**
* Instantiates a connection to a ldap server, secure or non-secure
diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
index 6fecf8810..c5a12447a 100644
--- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
@@ -43,7 +43,8 @@ public class ProfileSubsystem implements IProfileSubsystem {
private static final String PROP_ENABLE_BY = "enableBy";
private IConfigStore mConfig = null;
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private Vector<String> mProfileIds = new Vector<String>();
private Hashtable<String, IProfile> mProfiles = new Hashtable<String, IProfile>();
private Hashtable<String, String> mProfileClassIds = new Hashtable<String, String>();
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
index 747fe9ce7..1c0146222 100644
--- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
+++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
@@ -41,7 +41,8 @@ public class PluginRegistry implements IPluginRegistry {
private IConfigStore mConfig = null;
private IConfigStore mFileConfig = null;
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private Hashtable<String, Hashtable<String, IPluginInfo>> mTypes =
new Hashtable<String, Hashtable<String, IPluginInfo>>();
diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
index 69c0d0ce9..78d312851 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
@@ -139,7 +139,6 @@ public class RequestSubsystem
}
public void shutdown() {
- mRequestQueue = null;
if (mLogger != null) {
mLogger.log(ILogger.EV_SYSTEM, ILogger.S_REQQUEUE, ILogger.LL_INFO,
@@ -179,9 +178,9 @@ public class RequestSubsystem
// Instance variables
private IConfigStore mConfig;
+ @SuppressWarnings("unused")
private ISubsystem mParent;
private String mId = IRequestSubsystem.SUB_ID;
- private IRequestQueue mRequestQueue;
protected ILogger mLogger;
}
diff --git a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 7c16c6f43..42249e324 100644
--- a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -110,15 +110,9 @@ public final class JssSubsystem implements ICryptoSubsystem {
public static final String ID = "jss";
private static final String CONFIG_DIR = "configDir";
- private static final String CERTPREFIX_ALIAS = "certPrefix";
- private static final String KEYPREFIX_ALIAS = "keyPrefix";
- private static final String CONFIGDIR_ALIAS = "configDir";
- private static final String SECMODNAME_ALIAS = "secmodName";
private static final String PROP_ENABLE = "enable";
- private static final String PROP_OCSP_ENABLE = "ocspcheck.enable";
private static final String PASSWORD_ALIAS = "password";
private static final String mId = ID;
- private IConfigStore mSSLSubStore;
protected IConfigStore mConfig = null;
private boolean mInited = false;
private ILogger mLogger = null;
diff --git a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
index 7f6632e09..7e2e2f90d 100644
--- a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
+++ b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
public class KRATransportCert extends CertificateInfo {
public static final String SUBJECT_NAME =
"CN=Data Recovery Manager, O=Netscape Communications, C=US";
- private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
public KRATransportCert(KeyCertData properties) {
this(properties, null);
@@ -45,11 +44,6 @@ public class KRATransportCert extends CertificateInfo {
public KRATransportCert(KeyCertData properties, KeyPair pair) {
super(properties, pair);
- String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
- if ((tmp != null) &&
- (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
- mTokenname = tmp;
mProperties.put(Constants.PR_AKI, Constants.TRUE);
}
diff --git a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 2bb31ba1a..ccbb004ce 100644
--- a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -125,10 +125,6 @@ import com.netscape.cmsutil.util.Utils;
public class KeyCertUtil {
public static final String CA_SIGNINGCERT_NICKNAME = "caSigningCert";
- private static final int MAX_DOMESTIC_SSL_KEY_LEN = 4096;
- private static final int MAX_EXPORT_SSL_KEY_LEN = 512;
- private static final int MIN_DSA_KEY_LEN = 512;
- private static final int MAX_DSA_KEY_LEN = 1024;
public static void checkCertificateExt(String ext) throws EBaseException {
byte[] b = null;
diff --git a/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
index ac47055b6..cf1de4203 100644
--- a/base/common/src/com/netscape/cmscore/security/RASigningCert.java
+++ b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
public class RASigningCert extends CertificateInfo {
public static final String SUBJECT_NAME =
"CN=Registration Authority, O=Netscape Communications, C=US";
- private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
public RASigningCert(KeyCertData properties) {
this(properties, null);
@@ -45,11 +44,6 @@ public class RASigningCert extends CertificateInfo {
public RASigningCert(KeyCertData properties, KeyPair pair) {
super(properties, pair);
- String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
- if ((tmp != null) &&
- (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
- mTokenname = tmp;
try {
if (mProperties.get(Constants.PR_AKI) == null) {
mProperties.put(Constants.PR_AKI, Constants.FALSE);
diff --git a/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/common/src/com/netscape/cmscore/security/SSLCert.java
index b4fea7f89..9dbec8abb 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
public class SSLCert extends CertificateInfo {
public static final String SUBJECT_NAME =
"CN=SSL, O=Netscape Communications, C=US";
- private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
public SSLCert(KeyCertData properties) {
this(properties, null);
@@ -45,11 +44,6 @@ public class SSLCert extends CertificateInfo {
public SSLCert(KeyCertData properties, KeyPair pair) {
super(properties, pair);
- String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
- if ((tmp != null) &&
- (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
- mTokenname = tmp;
try {
if (mProperties.get(Constants.PR_AKI) == null) {
mProperties.put(Constants.PR_AKI, Constants.FALSE);
diff --git a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
index 8d8e7dfcc..328f6a86c 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
public class SSLSelfSignedCert extends CertificateInfo {
public static final String SUBJECT_NAME =
"CN=SSL, O=Netscape Communications, C=US";
- private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
public SSLSelfSignedCert(KeyCertData properties) {
this(properties, null);
@@ -45,11 +44,6 @@ public class SSLSelfSignedCert extends CertificateInfo {
public SSLSelfSignedCert(KeyCertData properties, KeyPair pair) {
super(properties, pair);
- String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
- if ((tmp != null) &&
- (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
- mTokenname = tmp;
mProperties.remove(Constants.PR_AKI);
// 020599: This SSL server bit has to be turned on. Otherwise, it
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index c51aa0d46..0ae6af0c3 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
@@ -74,7 +74,8 @@ public class SelfTestSubsystem
// SelfTestSubsystem parameters //
//////////////////////////////////
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private IConfigStore mConfig = null;
private ILogEventListener mLogger = null;
private ILogger mErrorLogger = CMS.getLogger();
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
index 608348dfb..25917e901 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/Group.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
@@ -36,7 +36,8 @@ public class Group implements IGroup {
*
*/
private static final long serialVersionUID = -1264387079578766750L;
- private IUsrGrp mBase = null;
+ @SuppressWarnings("unused")
+ private IUsrGrp mBase;
private String mName = null;
private Vector<String> mMembers = new Vector<String>();
private String mDescription = null;
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
index ee9fa575e..e48fd620a 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
@@ -64,7 +64,6 @@ import com.netscape.cmscore.util.Debug;
public final class UGSubsystem implements IUGSubsystem {
public static final String ID = "usrgrp";
- private ICertUserLocator mCertUserLocator = null;
private String mId = ID;
protected static final String OBJECTCLASS_ATTR = "objectclass";
@@ -81,9 +80,6 @@ public final class UGSubsystem implements IUGSubsystem {
protected LdapBoundConnFactory mLdapConnFactory = null;
protected String mBaseDN = null;
protected static UGSubsystem mUG = null;
- private static final String PROP_IMPL = "impl";
- private static final String PROP_CLASS = "class";
- private static final String PROP_PASSWORD_CHECKER = "PasswordChecker";
private ILogger mLogger = null;
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/common/src/com/netscape/cmscore/usrgrp/User.java
index 77f9bade4..533477501 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/User.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/User.java
@@ -39,7 +39,8 @@ public class User implements IUser {
*/
private static final long serialVersionUID = -7407288327775546979L;
public static final String ATTR_X509_CERTIFICATES = "userCertificates";
- private IUsrGrp mBase = null;
+ @SuppressWarnings("unused")
+ private IUsrGrp mBase;
private String mUserid = null;
private String mUserDN = null;
private String mFullName = null;
diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
index 9e9d9fc6c..5822542a3 100644
--- a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.Vector;
-import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -58,7 +57,6 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable {
private TextArea mTextArea = null;
private JScrollPane mThreads = null;
private JTable mThreadTable = null;
- private JButton mGC = null;
private ThreadTableModel mThreadModel = null;
/**
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index b7955d70b..bed5d8334 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -79,8 +79,6 @@ public class CMCEnroll {
public static final String PR_REQUEST_PKCS10 = "PKCS10";
public static final int ARGC = 4;
- private static final String CERTDB = "cert8.db";
- private static final String KEYDB = "key3.db";
public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 1dfb36fb2..f2205ed5c 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -97,8 +97,6 @@ public class CMCRequest {
public static final String PR_REQUEST_CRMF = "CRMF";
public static final int ARGC = 1;
- private static final String CERTDB = "cert8.db";
- private static final String KEYDB = "key3.db";
public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index d0cc3077e..8dffa13e3 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
@@ -69,8 +69,6 @@ import com.netscape.cmsutil.util.Utils;
*/
public class CMCRevoke {
public static final int ARGC = 7;
- private static final String CERTDB = "cert8.db";
- private static final String KEYDB = "key3.db";
public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
static String dValue = null, nValue = null, iValue = null, sValue = null, mValue = null, hValue = null,
diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index be6b10afc..c6b2c575f 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -507,7 +507,6 @@ public class DRMTool {
private static final String COMMA = ",";
private static final String DOT = ".";
private static final String EQUAL_SIGN = "=";
- private static final String HASH = "#";
private static final String LEFT_BRACE = "[";
private static final String NEWLINE = "\n";
private static final String PLUS = "+";
@@ -862,7 +861,6 @@ public class DRMTool {
// Constants: Target Certificate Information
private static final String HEADER = "-----BEGIN";
private static final String TRAILER = "-----END";
- private static final String X509_INFO = "x509.INFO";
// Constants: DRM LDIF Record Fields
private static final String DRM_LDIF_ARCHIVED_BY = "archivedBy:";
@@ -925,7 +923,6 @@ public class DRMTool {
private static String mDateOfModify = null;
// Variables: Command-Line Options
- private static boolean mMandatoryFlag = false;
private static boolean mRewrapFlag = false;
private static boolean mPwdfileFlag = false;
private static boolean mAppendIdOffsetFlag = false;
@@ -4582,9 +4579,6 @@ public class DRMTool {
printUsage();
System.exit(0);
}
-
- // Mark the 'Mandatory' flag true
- mMandatoryFlag = true;
}
// Check to see that if the 'Rewrap' command-line options were
diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index dbd8a21f3..c9e36585e 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -59,9 +59,6 @@ public class PasswordCache {
*/
public static final String PROP_PWC_NICKNAME = "sso_key";
public static final String PW_TAG_INTERNAL_LDAP_DB = "Internal LDAP Database";
- private static final String WRONG_NUM_ARGS = "Error: wrong number of arguments";
- private static final String CERTDB = "cert8.db";
- private static final String KEYDB = "key3.db";
private static void usage() {
System.out.println(
diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
index ee6668a25..e1d5124fa 100644
--- a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
@@ -38,7 +38,6 @@ import org.mozilla.jss.util.Password;
import com.netscape.cmsutil.crypto.CryptoUtil;
import com.netscape.cmsutil.util.Utils;
-@SuppressWarnings("deprecation")
public class GeneratePKIArchiveOptions {
public static void usage(Options options) {
diff --git a/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
index 7d67a7b12..c6023e6c5 100644
--- a/base/kra/src/com/netscape/kra/EncryptionUnit.java
+++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java
@@ -54,7 +54,6 @@ import com.netscape.cmscore.util.Debug;
* @author thomask
* @version $Revision$, $Date$
*/
-@SuppressWarnings("deprecation")
public abstract class EncryptionUnit implements IEncryptionUnit {
/* Establish one constant IV for base class, to be used for
diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
index 2f3e1dd7a..22400cf67 100644
--- a/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.math.BigInteger;
import java.security.InvalidKeyException;
-import java.security.cert.CertificateException;
import java.security.PublicKey;
+import java.security.cert.CertificateException;
import java.util.Arrays;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -37,15 +37,11 @@ import netscape.security.x509.CertificateX509Key;
import netscape.security.x509.X509CertInfo;
import netscape.security.x509.X509Key;
-import org.mozilla.jss.CryptoManager;
import org.mozilla.jss.asn1.ASN1Util;
import org.mozilla.jss.asn1.ASN1Value;
import org.mozilla.jss.asn1.InvalidBERException;
import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
import org.mozilla.jss.asn1.SEQUENCE;
-import org.mozilla.jss.crypto.PrivateKey;
-import org.mozilla.jss.pkcs11.PK11ECPublicKey;
-import org.mozilla.jss.pkcs11.PK11ParameterSpec;
import org.mozilla.jss.pkix.crmf.CertReqMsg;
import org.mozilla.jss.pkix.crmf.CertRequest;
import org.mozilla.jss.pkix.crmf.PKIArchiveOptions;
@@ -57,8 +53,8 @@ import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.MetaInfo;
import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.dbs.keydb.IKeyRepository;
import com.netscape.certsrv.dbs.keydb.IKeyRecord;
+import com.netscape.certsrv.dbs.keydb.IKeyRepository;
import com.netscape.certsrv.kra.EKRAException;
import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
import com.netscape.certsrv.kra.ProofOfArchival;
@@ -73,7 +69,6 @@ import com.netscape.certsrv.util.IStatsSubsystem;
import com.netscape.cms.servlet.key.KeyRecordParser;
import com.netscape.cmscore.crmf.CRMFParser;
import com.netscape.cmscore.crmf.PKIArchiveOptionsContainer;
-import com.netscape.kra.ArchiveOptions;
import com.netscape.cmscore.dbs.KeyRecord;
import com.netscape.cmsutil.util.Utils;
@@ -106,15 +101,10 @@ public class EnrollmentService implements IService {
private IStorageKeyUnit mStorageUnit = null;
private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
- private final static byte EOL[] = { Character.LINE_SEPARATOR };
private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST =
"LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_4";
private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED =
"LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED_3";
- private final static String LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST =
- "LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_4";
- private final static String LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED =
- "LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED_4";
/**
* Constructs request processor.
@@ -151,12 +141,10 @@ public class EnrollmentService implements IService {
*/
public boolean serviceRequest(IRequest request)
throws EBaseException {
- CryptoManager cm = null;
IConfigStore config = null;
Boolean allowEncDecrypt_archival = false;
try {
- cm = CryptoManager.getInstance();
config = CMS.getConfigStore();
allowEncDecrypt_archival = config.getBoolean("kra.allowEncDecrypt.archival", false);
} catch (Exception e) {
@@ -307,7 +295,7 @@ public class EnrollmentService implements IService {
opts.getSymmAlgOID(),
opts.getSymmAlgParams(),
opts.getEncValue(),
- (PublicKey) pubkey);
+ pubkey);
} // !allowEncDecrypt_archival
/* Bugscape #54948 - verify public and private key before archiving key */
@@ -398,19 +386,6 @@ public class EnrollmentService implements IService {
privateKeyData, owner,
publicKey.getAlgorithmId().getOID().toString(), agentId);
- if (rec == null) {
-
- auditMessage = CMS.getLogMessage(
- LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST,
- auditSubjectID,
- ILogger.FAILURE,
- auditRequesterID,
- auditArchiveID);
-
- audit(auditMessage);
- throw new EKRAException(CMS.getUserMessage("CMS_KRA_INVALID_KEYRECORD"));
- }
-
if (keyAlg.equals("RSA")) {
try {
RSAPublicKey rsaPublicKey = new RSAPublicKey(publicKeyData);
@@ -458,7 +433,7 @@ public class EnrollmentService implements IService {
oidDescription);
rec.set(IKeyRecord.ATTR_META_INFO, metaInfo);
- // key size does not apply to EC;
+ // key size does not apply to EC;
rec.setKeySize(-1);
}
diff --git a/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java
index ccf8e664f..a97724e6f 100644
--- a/base/kra/src/com/netscape/kra/KRANotify.java
+++ b/base/kra/src/com/netscape/kra/KRANotify.java
@@ -29,7 +29,8 @@ import com.netscape.certsrv.request.ARequestNotifier;
* @version $Revision$, $Date$
*/
public class KRANotify extends ARequestNotifier {
- private IKeyRecoveryAuthority mKRA = null;
+ @SuppressWarnings("unused")
+ private IKeyRecoveryAuthority mKRA;
/**
* default constructor
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index 09f765877..6579261f6 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
@@ -96,7 +96,6 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
private static final String PARAM_LOCK = "lock";
private static final String PARAM_PK12 = "pk12";
private static final String PARAM_ERROR = "error";
- private static final String PARAM_AGENT = "agent";
private final static String KEY_RESP_NAME = "keyRepository";
private static final String PROP_REPLICAID_DN = "dbs.replicadn";
diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
index 348a1b2f8..836907dac 100644
--- a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
+++ b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
@@ -76,7 +76,6 @@ import com.netscape.cmsutil.ocsp.ResponseData;
*/
public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, IAuthority {
- private long mServedRequests = 0;
private long mServedTime = 0;
public final static OBJECT_IDENTIFIER OCSP_NONCE = new OBJECT_IDENTIFIER("1.3.6.1.5.5.7.48.1.2");
@@ -361,7 +360,6 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem,
OCSPResponse response = mDefStore.validate(request);
long endTime = (CMS.getCurrentDate()).getTime();
- mServedRequests++;
mServedTime = mServedTime + (endTime - startTime);
return response;
}
diff --git a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
index 4b6e7da75..0413f0c5c 100644
--- a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
+++ b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
@@ -73,7 +73,8 @@ public final class SigningUnit implements ISigningUnit {
private ILogger mLogger = CMS.getLogger();
private IConfigStore mConfig;
- private ISubsystem mOwner = null;
+ @SuppressWarnings("unused")
+ private ISubsystem mOwner;
private String mDefSigningAlgname = null;
private SignatureAlgorithm mDefSigningAlgorithm = null;
diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
index c74cd94c6..cddb630da 100644
--- a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
@@ -41,7 +41,7 @@ import netscape.ldap.LDAPv2;
public class CMSLDAP {
- private String HOST, DN, BASEDN, PASSWORD;
+ private String HOST, DN, PASSWORD;
private int PORT;
private LDAPConnection conn = new LDAPConnection();
diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
index 948076fd6..953dcd25d 100644
--- a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
@@ -33,7 +33,6 @@ import com.netscape.pkisilent.argparser.StringHolder;
public class CMSTask {
private static String operation;
- private static String debug;
private static String serverRoot;
private Process p = null;
diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
index d1941ca30..e36966de1 100644
--- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
@@ -57,6 +57,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier;
import org.mozilla.jss.pkix.primitive.Name;
import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
import org.mozilla.jss.util.Password;
+
import com.netscape.cmsutil.util.Utils;
/**
@@ -67,7 +68,9 @@ import com.netscape.cmsutil.util.Utils;
public class ComCrypto {
private String cdir, certnickname, keysize, keytype, tokenpwd;
- private String certpackage, pkcs10request;
+ @SuppressWarnings("unused")
+ private String certpackage;
+ private String pkcs10request;
private boolean debug = true;
private boolean DBlogin = false;
private boolean generaterequest = false;
@@ -82,7 +85,6 @@ public class ComCrypto {
public static CryptoManager manager;
public static CryptoToken token;
private CryptoStore store;
- private Password pass1 = null, pass2 = null;
private String bstr = "-----BEGIN NEW CERTIFICATE REQUEST-----";
private String blob, Blob1 = null;
diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
index bfaf1eb34..6d02fcd33 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
@@ -42,11 +42,12 @@ import org.mozilla.jss.util.Password;
public class Con2Agent implements SSLClientCertificateSelectionCallback,
SSLCertificateApprovalCallback {
- private int i, port;
- private String host, certdir, certnickname, tokenpwd, certname, query;
+ private int port;
+ @SuppressWarnings("unused")
+ private String certname;
+ private String host, certdir, certnickname, tokenpwd, query;
private String ACTIONURL;
- private BufferedReader stdin = null;
private StringBuffer stdout = new StringBuffer();
public Con2Agent() {
diff --git a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
index de331989b..809a65c5b 100644
--- a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
@@ -38,13 +38,12 @@ import org.mozilla.jss.ssl.SSLSocket;
public class DirEnroll extends TestClient {
- private int i;
private String Authenticator = "UserDir";
private int port;
+ @SuppressWarnings("unused")
private long elapsedTime;
private String importcert = "false";
- private boolean impStatus = false;
// Constructors
@@ -323,11 +322,7 @@ public class DirEnroll extends TestClient {
baseCert = baseCert.substring(n);
String tmp = baseCert.substring(0, baseCert.length() - 2);
- if (importCert(tmp)) {
- impStatus = true;
- }
- } else {
- impStatus = true;
+ importCert(tmp);
}
}
diff --git a/base/silent/src/com/netscape/pkisilent/common/Request.java b/base/silent/src/com/netscape/pkisilent/common/Request.java
index 7ee443f16..e0255ef59 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -52,9 +52,35 @@ public class Request extends TestClient {
// Cert Detail variables
- private String csrRequestorName, csrRequestorPhone, csrRequestorEmail, subject, subjectdn, reqStatus, certType;
- private String requestType, requestID, sslclient, clientcert, servercert, emailcert, objectsigningcert, sslcacert,
- objectsigningcacert, emailcacert, sigAlgo, totalRecord, validitylength, trustedManager;
+ private String csrRequestorName;
+ private String csrRequestorPhone;
+ private String csrRequestorEmail;
+ private String subject;
+ private String subjectdn;
+ private String reqStatus;
+ @SuppressWarnings("unused")
+ private String certType;
+ @SuppressWarnings("unused")
+ private String requestType;
+ private String requestID;
+ @SuppressWarnings("unused")
+ private String sslclient;
+ private String clientcert;
+ private String servercert;
+ private String emailcert;
+ private String objectsigningcert;
+ @SuppressWarnings("unused")
+ private String sslcacert;
+ @SuppressWarnings("unused")
+ private String objectsigningcacert;
+ @SuppressWarnings("unused")
+ private String emailcacert;
+ private String sigAlgo;
+ @SuppressWarnings("unused")
+ private String totalRecord;
+ @SuppressWarnings("unused")
+ private String validitylength;
+ private String trustedManager;
private int totalNumApproved = 0;
diff --git a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
index 5eccb1601..7ff761720 100644
--- a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
@@ -42,7 +42,6 @@ public class ServerInfo {
public static CMSProperties CMSprops = null;
// Private variables
- private int i;
public String CMSConfigFile, AdminConfigFile;
public ServerInfo() {
diff --git a/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
index a58e88bd1..f3d96085d 100644
--- a/base/silent/src/com/netscape/pkisilent/common/TestClient.java
+++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
@@ -48,7 +48,6 @@ public class TestClient implements SSLCertificateApprovalCallback {
public String query;
public boolean debug = false;
// Certificate nicknames to be used by Test Clients
- private int i;
private String testConfigFile;
public String caAgentCertName = "ca-agent";
@@ -62,6 +61,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
private String admDN = "admin";
private String admDNPW = "admin";
private String TmpDir;
+ @SuppressWarnings("unused")
private String TestLogFile;
private String startupTests, cleanupTests;
diff --git a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
index 123054503..3f7f92791 100644
--- a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
@@ -38,9 +38,9 @@ import org.mozilla.jss.ssl.SSLSocket;
public class UserEnroll extends TestClient {
- private int i;
private String requestorName, requestorEmail, requestorPhone, requestorComments, requestId, certType, ssl_client;
private int port;
+ @SuppressWarnings("unused")
private long elapsedTime;
// Constructor
diff --git a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
index 8acbf1ca7..e785657c0 100644
--- a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
+++ b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
@@ -38,16 +38,15 @@ import org.mozilla.jss.ssl.SSLSocket;
public class checkRequest extends TestClient {
- private int i;
private String certfile, importcert = "false", certnickname, serialNumber, ldapformat;
private String requestId;
private String reqStatus = "false";
private String pkcsCert, baseCert, ACTION_STRING, issuer, subject, AUTH = "ca";
private int port;
- private boolean impStatus = false;
private int type = 1;
+ @SuppressWarnings("unused")
private long elapsedTime;
private String host;
@@ -438,8 +437,6 @@ public class checkRequest extends TestClient {
GregorianCalendar begin = new GregorianCalendar();
- impStatus = false;
-
// SSLSocket socket = new SSLSocket(host,port);
SSLSocket socket = new SSLSocket(host, port, null, 0, this, null);
diff --git a/base/tks/src/com/netscape/tks/TKSAuthority.java b/base/tks/src/com/netscape/tks/TKSAuthority.java
index 836dc7959..cfb1b1fdf 100644
--- a/base/tks/src/com/netscape/tks/TKSAuthority.java
+++ b/base/tks/src/com/netscape/tks/TKSAuthority.java
@@ -29,6 +29,7 @@ import com.netscape.certsrv.request.IRequestQueue;
public class TKSAuthority implements IAuthority, ISubsystem {
protected ILogger mLogger = CMS.getLogger();
private String mNickname = null;
+ @SuppressWarnings("unused")
private ISubsystem mOwner;
private IConfigStore mConfig = null;
protected String mId = null;
diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
index 82a98c082..c8402b2ca 100644
--- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
@@ -1215,7 +1215,6 @@ public class CryptoUtil {
return certs;
}
- @SuppressWarnings("deprecation")
public static String unwrapUsingPassphrase(String wrappedRecoveredKey, String recoveryPassphrase)
throws IOException, InvalidBERException, InvalidKeyException, IllegalStateException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException, NotInitializedException, TokenException,
@@ -1244,7 +1243,6 @@ public class CryptoUtil {
return unwrappedData;
}
- @SuppressWarnings("deprecation")
public static String unwrapUsingSymmetricKey(CryptoToken token, IVParameterSpec IV, byte[] wrappedRecoveredKey,
SymmetricKey recoveryKey, EncryptionAlgorithm alg) throws NoSuchAlgorithmException, TokenException,
BadPaddingException,
@@ -1258,7 +1256,6 @@ public class CryptoUtil {
return unwrappedS;
}
- @SuppressWarnings("deprecation")
public static byte[] wrapPassphrase(CryptoToken token, String passphrase, IVParameterSpec IV, SymmetricKey sk,
EncryptionAlgorithm alg)
throws NoSuchAlgorithmException, TokenException, InvalidKeyException,
@@ -1289,7 +1286,6 @@ public class CryptoUtil {
return session_data;
}
- @SuppressWarnings("deprecation")
public static byte[] createPKIArchiveOptions(CryptoManager manager, CryptoToken token, String transportCert,
SymmetricKey vek, String passphrase, KeyGenAlgorithm keyGenAlg, IVParameterSpec IV) throws TokenException,
CharConversionException,
diff --git a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
index 6343fd805..7a9afec61 100644
--- a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
@@ -66,8 +66,6 @@ public class UnknownInfo implements CertStatus {
*/
public static class Template implements ASN1Template {
- private SEQUENCE.Template seqt;
-
public Template() {
// seqt = new SEQUENCE.Template();
// seqt.addElement(new NULL.Template() );
diff --git a/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
index 3f0ef1793..11cdd001e 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class CHAPPasswordAttribute extends Attribute {
- private byte _value[] = null;
private int _ident = 0;
private String _str = null;
@@ -33,7 +32,6 @@ public class CHAPPasswordAttribute extends Attribute {
_t = CHAP_PASSWORD;
_ident = value[2];
_str = new String(value, 2, 16);
- _value = value;
}
public int getIdent() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
index 5fd806003..0e1ae66a6 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class CallbackIdAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public CallbackIdAttribute(byte value[]) {
super();
_t = CALLBACK_ID;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
index d6e45cecd..bcaf23484 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class CallbackNumberAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public CallbackNumberAttribute(byte value[]) {
super();
_t = CALLBACK_NUMBER;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
index 3b5eec804..8ce1272eb 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class CallerStationIdAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public CallerStationIdAttribute(byte value[]) {
super();
_t = CALLER_STATION_ID;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
index 9a57f8089..cb562afda 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class CallingStationIdAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public CallingStationIdAttribute(byte value[]) {
super();
_t = CALLING_STATION_ID;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
index 879d7d5c7..c80562ea8 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FilterIdAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public FilterIdAttribute(byte value[]) {
super();
_t = CHAP_PASSWORD;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
index 05273780f..3e66120f5 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
@@ -22,13 +22,11 @@ import java.io.IOException;
public class FramedAppleTalkLinkAttribute extends Attribute {
public static int UN_NUMBERED = 0;
- private byte _value[] = null;
private int _type = 0;
public FramedAppleTalkLinkAttribute(byte value[]) {
super();
_t = FRAMED_APPLETALK_LINK;
- _value = value;
_type = value[5] & 0xFF;
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
index cea0d936a..fc9a8b2f5 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
@@ -20,13 +20,11 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedAppleTalkNetworkAttribute extends Attribute {
- private byte _value[] = null;
private int _type = 0;
public FramedAppleTalkNetworkAttribute(byte value[]) {
super();
_t = FRAMED_APPLETALK_NETWORK;
- _value = value;
_type = value[5] & 0xFF;
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
index 54ee47c45..45011f545 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedAppleTalkZoneAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public FramedAppleTalkZoneAttribute(byte value[]) {
super();
_t = FRAMED_APPLETALK_ZONE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
index b57c030b5..6cd377914 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
@@ -25,7 +25,6 @@ public class FramedCompressionAttribute extends Attribute {
public static final int IPX_HEADER = 2;
public static final int STAC_LZS = 3;
- private byte _value[] = null;
private int _type = 0;
public FramedCompressionAttribute(byte value[]) {
@@ -35,7 +34,6 @@ public class FramedCompressionAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
index 2f66ee8c2..7e0b5685d 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedIPAddressAttribute extends Attribute {
- private byte _value[] = null;
private byte _addr[] = new byte[4];
public FramedIPAddressAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPAddressAttribute extends Attribute {
_addr[1] = value[3];
_addr[2] = value[4];
_addr[3] = value[5];
- _value = value;
}
public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
index f8e1980c7..2d957f954 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedIPNetmaskAttribute extends Attribute {
- private byte _value[] = null;
private byte _mask[] = new byte[4];
public FramedIPNetmaskAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPNetmaskAttribute extends Attribute {
_mask[1] = value[3];
_mask[2] = value[4];
_mask[3] = value[5];
- _value = value;
}
public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
index 92f47eec1..8f8d25fd6 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedIPXNetworkAttribute extends Attribute {
- private byte _value[] = null;
private byte _net[] = new byte[4];
public FramedIPXNetworkAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPXNetworkAttribute extends Attribute {
_net[1] = value[3];
_net[2] = value[4];
_net[3] = value[5];
- _value = value;
}
public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
index 5cd9551a2..5211d533f 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
@@ -20,13 +20,11 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedMTUAttribute extends Attribute {
- private byte _value[] = null;
private int _type = 0;
public FramedMTUAttribute(byte value[]) {
super();
_t = FRAMED_IP_ADDRESS;
- _value = value;
_type = value[5] & 0xFF;
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
index 5af219b9a..c1265419e 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
@@ -27,7 +27,6 @@ public class FramedProtocolAttribute extends Attribute {
public static final int XYLOGICS = 5;
public static final int X_75 = 6;
- private byte _value[] = null;
private int _type = 0;
public FramedProtocolAttribute(byte value[]) {
@@ -37,7 +36,6 @@ public class FramedProtocolAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
index 9b123fe2a..8ed45e42f 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class FramedRouteAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public FramedRouteAttribute(byte value[]) {
super();
_t = FRAMED_ROUTE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
index 14d2b0cc8..f75ba4ed9 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
@@ -25,7 +25,6 @@ public class FramedRoutingAttribute extends Attribute {
public static final int LISTEN_FOR_ROUTING_PACKETS = 2;
public static final int SEND_AND_LISTEN = 3;
- private byte _value[] = null;
private int _type = 0;
public FramedRoutingAttribute(byte value[]) {
@@ -35,7 +34,6 @@ public class FramedRoutingAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
index 0d1c0565a..d14fe8ec3 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
@@ -23,7 +23,6 @@ public class LoginIPHostAttribute extends Attribute {
public static final int NAS_ALLOW_SELECT = 0xFFFFFFFF;
public static final int NAS_SELECT = 0;
- private byte _value[] = null;
private int _type = 0;
public LoginIPHostAttribute(byte value[]) {
@@ -33,7 +32,6 @@ public class LoginIPHostAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
index 4cee6bc3a..bf3532e97 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class LoginLATGroupAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public LoginLATGroupAttribute(byte value[]) {
super();
_t = LOGIN_LAT_GROUP;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
index 2c2d3411e..f58a52853 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class LoginLATNodeAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public LoginLATNodeAttribute(byte value[]) {
super();
_t = LOGIN_LAT_NODE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
index 330161ec8..aa4b86952 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class LoginLATPortAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public LoginLATPortAttribute(byte value[]) {
super();
_t = PROXY_STATE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
index 158630d27..1fdbb6927 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class LoginLATServiceAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public LoginLATServiceAttribute(byte value[]) {
super();
_t = LOGIN_LAT_SERVICE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
index 73f49d39f..e312ab80d 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
@@ -29,7 +29,6 @@ public class LoginServiceAttribute extends Attribute {
public static final int X25_T3POS = 6;
public static final int TCP_CLEAR_QUIET = 8;
- private byte _value[] = null;
private int _type = 0;
public LoginServiceAttribute(byte value[]) {
@@ -39,7 +38,6 @@ public class LoginServiceAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
index 57b983028..ac8a29dd2 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class NASClassAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public NASClassAttribute(byte value[]) {
super();
_t = NAS_CLASS;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
index d4022b3dd..6ab01562a 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
@@ -22,12 +22,10 @@ import java.net.InetAddress;
public class NASIPAddressAttribute extends Attribute {
private InetAddress _ip = null;
- private byte _value[] = null;
public NASIPAddressAttribute(byte value[]) {
super();
_t = NAS_IP_ADDRESS;
- _value = value;
}
public NASIPAddressAttribute(InetAddress ip) {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
index 0a3a62cd8..3870dda4b 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class NASIdentifierAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public NASIdentifierAttribute(byte value[]) {
super();
_t = NAS_IDENTIFIER;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
index 7903bb1fd..9bc045a15 100644
--- a/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
@@ -22,12 +22,9 @@ import java.io.IOException;
public class PortLimitAttribute extends Attribute {
private int _port = 0;
- private byte _value[] = null;
-
public PortLimitAttribute(byte value[]) {
super();
_t = FRAMED_IP_ADDRESS;
- _value = value;
_port = value[5] & 0xFF;
_port |= ((value[4] << 8) & 0xFF00);
_port |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
index 83831b652..cf019f614 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class ProxyStateAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public ProxyStateAttribute(byte value[]) {
super();
_t = PROXY_STATE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
index b22807a5d..95d6bfecd 100644
--- a/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
+++ b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
@@ -39,7 +39,8 @@ public class RadiusConn {
public static String OPTION_DEBUG = "OPTION_DEBUG";
- private Properties _options = null;
+ @SuppressWarnings("unused")
+ private Properties _options;
private boolean _traceOn = true;
private String _host[] = new String[2];
private int _port[] = new int[2];
diff --git a/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
index 5ec4ea052..7f84fd0b7 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class ReplyMessageAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public ReplyMessageAttribute(byte value[]) {
super();
_t = REPLY_MESSAGE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
index f31c74f9a..63082ba50 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
@@ -32,7 +32,6 @@ public class ServiceTypeAttribute extends Attribute {
public static final int CALL_CHECK = 10;
public static final int CALLBACK_ADMINISTRATIVE = 11;
- private byte _value[] = null;
private int _type = 0;
public ServiceTypeAttribute(byte value[]) {
@@ -42,7 +41,6 @@ public class ServiceTypeAttribute extends Attribute {
_type |= ((value[4] << 8) & 0xFF00);
_type |= ((value[3] << 16) & 0xFF0000);
_type |= ((value[2] << 24) & 0xFF000000);
- _value = value;
}
public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
index 027f95620..4f286dd3c 100644
--- a/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class StateAttribute extends Attribute {
- private byte _value[] = null;
private String _str = null;
public StateAttribute(String str) {
@@ -32,7 +31,6 @@ public class StateAttribute extends Attribute {
super();
_t = STATE;
_str = new String(value, 2, value.length - 2);
- _value = value;
}
public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
index 5f3d9f170..c25e71187 100644
--- a/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
import java.io.IOException;
public class VendorSpecificAttribute extends Attribute {
- private byte _value[] = null;
private String _id = null;
private String _str = null;
@@ -29,7 +28,6 @@ public class VendorSpecificAttribute extends Attribute {
_t = VENDOR_SPECIFIC;
_id = new String(value, 2, 4);
_str = new String(value, 6, value.length - 6);
- _value = value;
}
public String getId() {
diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
index baf66e710..834e21088 100644
--- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
+++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
@@ -151,7 +151,6 @@ public class CRSPKIMessage {
private SignedData sd;
// In the signed data, we have:
- private int sdv; // Version
private ContentInfo data; // The data to be digested
private EnvelopedData sded; // Enveloped data inside of signed data
private byte[] signerCertBytes;
@@ -160,7 +159,6 @@ public class CRSPKIMessage {
private SET sis; // set of SignerInfos
private SignerInfo si; // First SignerInfo
private AlgorithmIdentifier digestAlgorithmId = null;
- private int siv; // Version
private SET aa; // Authenticated Attributes
private SET aa_old; // Authenticated Attributes
private IssuerAndSerialNumber sgnIASN; // Signer's Issuer Name and Serialnum
@@ -179,18 +177,18 @@ public class CRSPKIMessage {
private int riv; // Version
private AlgorithmIdentifier riAlgid; // alg that the bulk key is wrapped with
private byte[] riKey; // bulk key, wrapped with above algorithm
- private byte[] cKey; // * 'clear', unwrapped key (not in ASN.1) *
private IssuerAndSerialNumber rcpIASN; // Recipient's Issuer Name and Serial Number
private EncryptedContentInfo eci;
private byte[] iv; // initialization vector for above key
private byte[] ec; // encrypted content (P10, in case of request)
- private byte[] cc; // * 'clear' content (not in ASN.1) *
private String encryptionAlgorithm = null;
// For the CertRep, the enveloped content is another signed Data:
private SignedData crsd;
+ @SuppressWarnings("unused")
private int rsdVersion;
+ @SuppressWarnings("unused")
private byte[] rsdCert; // certificate to send in response
private PKCS10 myP10;
diff --git a/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index 1e78ecc94..e8fab049e 100644
--- a/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
@@ -39,7 +39,6 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
*/
private static final long serialVersionUID = -6333109673043357921L;
private boolean mCritical;
- private String mOID = null;
private int mVersion = 0;
private String mStreetAddress = null;
private String mTelephoneNumber = null;
diff --git a/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java
index c9dc6c546..64575b870 100644
--- a/base/util/src/netscape/security/provider/DSA.java
+++ b/base/util/src/netscape/security/provider/DSA.java
@@ -55,6 +55,7 @@ public final class DSA extends Signature {
private static boolean debug = false;
/* The parameter object */
+ @SuppressWarnings("unused")
private DSAParams params;
/* algorithm parameters */
diff --git a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
index dca206d0c..66c1460be 100644
--- a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
@@ -305,14 +305,6 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
}
}
- /* Test vectors from the DSA specs. */
-
- private static int[] testXSeed = { 0xbd029bbe, 0x7f51960b, 0xcf9edb2b,
- 0x61f06f0f, 0xeb5a38b6 };
-
- private int[] x_t = { 0x67452301, 0xefcdab89, 0x98badcfe,
- 0x10325476, 0xc3d2e1f0 };
-
/**
* Generate the private key component of the key pair using the
* provided source of random bits. This method uses the random but
diff --git a/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
index 3a316cac5..1e544d021 100755
--- a/base/util/src/netscape/security/provider/DSAParameterGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
@@ -54,7 +54,6 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
private SecureRandom random;
// useful constants
- private static final BigInteger ZERO = BigInteger.valueOf(0);
private static final BigInteger ONE = BigInteger.valueOf(1);
private static final BigInteger TWO = BigInteger.valueOf(2);
diff --git a/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java
index 47b99eb1b..e64873942 100644
--- a/base/util/src/netscape/security/provider/MD5.java
+++ b/base/util/src/netscape/security/provider/MD5.java
@@ -35,8 +35,6 @@ public final class MD5 extends MessageDigestSpi implements Cloneable {
/** contains the computed message digest */
private byte[] digestBits;
- private String algorithm;
-
private int state[];
private long count; // bit count AND buffer[] index aid
private byte buffer[];
diff --git a/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
index 1d159aa9a..6e2f953e4 100644
--- a/base/util/src/netscape/security/util/CertPrettyPrint.java
+++ b/base/util/src/netscape/security/util/CertPrettyPrint.java
@@ -55,7 +55,6 @@ public class CertPrettyPrint {
* variables
*==========================================================*/
private X509CertImpl mX509Cert = null;
- private Certificate mCert = null;
private PrettyPrintFormat pp = null;
private byte[] mCert_b = null;
diff --git a/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java
index c69f70ebc..d40379e7d 100644
--- a/base/util/src/netscape/security/util/ExtPrettyPrint.java
+++ b/base/util/src/netscape/security/util/ExtPrettyPrint.java
@@ -91,7 +91,6 @@ public class ExtPrettyPrint {
*==========================================================*/
private Extension mExt = null;
private ResourceBundle mResource = null;
- private ResourceBundle resource = null;
private PrettyPrintFormat pp = null;
private int mIndentSize = 0;
diff --git a/base/util/src/netscape/security/x509/AlgorithmId.java b/base/util/src/netscape/security/x509/AlgorithmId.java
index 947853a42..4b108ac4b 100644
--- a/base/util/src/netscape/security/x509/AlgorithmId.java
+++ b/base/util/src/netscape/security/x509/AlgorithmId.java
@@ -57,9 +57,6 @@ public class AlgorithmId implements Serializable, DerEncoder {
/** use serialVersionUID from JDK 1.1. for interoperability */
private static final long serialVersionUID = 7205873507486557157L;
- /* Are we debugging? */
- private static boolean debug = false;
-
/**
* The object identitifer being used for this algorithm.
*/
diff --git a/base/util/src/netscape/security/x509/X500Signer.java b/base/util/src/netscape/security/x509/X500Signer.java
index 746795527..7d429cd95 100644
--- a/base/util/src/netscape/security/x509/X500Signer.java
+++ b/base/util/src/netscape/security/x509/X500Signer.java
@@ -42,8 +42,6 @@ import java.security.SignatureException;
*/
public final class X500Signer {
- private static final long serialVersionUID = -3148659822293810158L;
-
private Signature sig;
private X500Name agent; // XXX should be X509CertChain
private AlgorithmId algid;