diff options
Diffstat (limited to 'pki/base/ca')
4 files changed, 21 insertions, 24 deletions
diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/pki/base/ca/src/com/netscape/ca/CAService.java index d086ee551..d8faa8b34 100644 --- a/pki/base/ca/src/com/netscape/ca/CAService.java +++ b/pki/base/ca/src/com/netscape/ca/CAService.java @@ -410,7 +410,7 @@ public class CAService implements ICAService, IService { } String type = request.getRequestType(); - IServant servant = (IServant) mServants.get(type); + IServant servant = mServants.get(type); if (servant == null) { mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_INVALID_REQUEST_TYPE", type)); @@ -923,7 +923,7 @@ public class CAService implements ICAService, IService { Enumeration<String> n = oldMeta.getElements(); while (n.hasMoreElements()) { - String name = (String) n.nextElement(); + String name = n.nextElement(); System.out.println("name " + name + " value " + oldMeta.get(name)); @@ -950,7 +950,7 @@ public class CAService implements ICAService, IService { Enumeration<String> n = oldMeta.getElements(); while (n.hasMoreElements()) { - String name = (String) n.nextElement(); + String name = n.nextElement(); } } @@ -1105,7 +1105,7 @@ public class CAService implements ICAService, IService { Enumeration<ICRLIssuingPoint> eIPs = mCRLIssuingPoints.elements(); while (eIPs.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) eIPs.nextElement(); + ICRLIssuingPoint ip = eIPs.nextElement(); if (ip != null) { boolean b = true; @@ -1434,7 +1434,7 @@ class serviceRenewal implements IServant { if (renewed != null) { BigInteger serial = new BigInteger(renewed); - X509CertImpl cert = (X509CertImpl) + X509CertImpl cert = mCA.getCertificateRepository().getX509Certificate(serial); if (cert == null) { @@ -1898,7 +1898,7 @@ class serviceGetCRL implements IServant { throws EBaseException { try { ICRLIssuingPointRecord crlRec = - (ICRLIssuingPointRecord) mCA.getCRLRepository().readCRLIssuingPointRecord( + mCA.getCRLRepository().readCRLIssuingPointRecord( ICertificateAuthority.PROP_MASTER_CRL); X509CRLImpl crl = new X509CRLImpl(crlRec.getCRL()); @@ -1936,7 +1936,7 @@ class serviceGetRevocationInfo implements IServant { Enumeration<String> enum1 = request.getExtDataKeys(); while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); if (name.equals(IRequest.ISSUED_CERTS)) { X509CertImpl certsToCheck[] = @@ -1976,7 +1976,7 @@ class serviceGetCertificates implements IServant { Enumeration<String> enum1 = request.getExtDataKeys(); while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); if (name.equals(IRequest.CERT_FILTER)) { String filter = request.getExtDataInString(IRequest.CERT_FILTER); @@ -2046,7 +2046,7 @@ class serviceCert4Crl implements IServant { Enumeration<ICRLIssuingPoint> eIPs = hips.elements(); while (eIPs.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) eIPs.nextElement(); + ICRLIssuingPoint ip = eIPs.nextElement(); // form RevokedCertImpl RevokedCertImpl rci = new RevokedCertImpl(revokedCertRecs[i].getSerialNumber(), @@ -2108,7 +2108,7 @@ class serviceUnCert4Crl implements IServant { Enumeration<ICRLIssuingPoint> eIPs = hips.elements(); while (eIPs.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) eIPs.nextElement(); + ICRLIssuingPoint ip = eIPs.nextElement(); if (ip != null) { ip.addUnrevokedCert(oldSerialNo[i]); diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java index 0d98b9631..8c59d42d8 100644 --- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java +++ b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java @@ -200,7 +200,7 @@ public class CMSCRLExtensions implements ICMSCRLExtensions { IConfigStore mFileConfig = SubsystemRegistry.getInstance().get("MAIN").getConfigStore(); - IConfigStore crlExtConfig = (IConfigStore) mFileConfig; + IConfigStore crlExtConfig = mFileConfig; StringTokenizer st = new StringTokenizer(mCRLExtConfig.getName(), "."); while (st.hasMoreTokens()) { @@ -471,11 +471,11 @@ public class CMSCRLExtensions implements ICMSCRLExtensions { if (cmsCRLExt != null) { if (ext != null) { if (isCRLExtensionCritical(extName) ^ ext.isCritical()) { - ext = (Extension) cmsCRLExt.setCRLExtensionCriticality( + ext = cmsCRLExt.setCRLExtensionCriticality( ext, isCRLExtensionCritical(extName)); } } else { - ext = (Extension) cmsCRLExt.getCRLExtension(mCRLExtConfig.getSubStore(extName), + ext = cmsCRLExt.getCRLExtension(mCRLExtConfig.getSubStore(extName), mCRLIssuingPoint, isCRLExtensionCritical(extName)); } diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index 46ddb544d..1c89a29c8 100644 --- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -635,7 +635,6 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { Vector<String> listedProfiles = new Vector<String>(); StringTokenizer elements = new StringTokenizer(list, ",", true); - int t0 = -1; int n = 0; while (elements.hasMoreTokens()) { String element = elements.nextToken().trim(); @@ -3151,7 +3150,7 @@ class CertRecProcessor implements IElementProcessor { boolean includeCert = checkRevokedCertExtensions(crlExts); if (includeCert == true) { - mCRLCerts.put(serialNumber, (RevokedCertificate) newRevokedCert); + mCRLCerts.put(serialNumber, newRevokedCert); if (serialNumber != null) { CMS.debug("Putting certificate serial: 0x" + serialNumber.toString(16) + " into CRL hashtable"); } diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java index dab9c069d..00fcbae0f 100644 --- a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -93,7 +93,6 @@ import com.netscape.cmscore.dbs.CertRecord; import com.netscape.cmscore.dbs.CertificateRepository; import com.netscape.cmscore.dbs.DBSubsystem; import com.netscape.cmscore.dbs.ReplicaIDRepository; -import com.netscape.cmscore.dbs.Repository; import com.netscape.cmscore.ldap.PublisherProcessor; import com.netscape.cmscore.listeners.ListenerPlugin; import com.netscape.cmscore.request.RequestSubsystem; @@ -590,7 +589,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori public String getStartSerial() { try { BigInteger serial = - ((Repository) mCertRepot).getTheSerialNumber(); + mCertRepot.getTheSerialNumber(); if (serial == null) return ""; @@ -603,11 +602,11 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori } public void setStartSerial(String serial) throws EBaseException { - ((Repository) mCertRepot).setTheSerialNumber(new BigInteger(serial)); + mCertRepot.setTheSerialNumber(new BigInteger(serial)); } public String getMaxSerial() { - String serial = ((Repository) mCertRepot).getMaxSerial(); + String serial = mCertRepot.getMaxSerial(); if (serial != null) return serial; @@ -616,7 +615,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori } public void setMaxSerial(String serial) throws EBaseException { - ((Repository) mCertRepot).setMaxSerial(serial); + mCertRepot.setMaxSerial(serial); } /** @@ -658,7 +657,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori * @return CRL issuing point */ public ICRLIssuingPoint getCRLIssuingPoint(String id) { - return (CRLIssuingPoint) mCRLIssuePoints.get(id); + return mCRLIssuePoints.get(id); } /** @@ -1491,7 +1490,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori Enumeration<String> names = implc.getSubStoreNames(); while (names.hasMoreElements()) { - String id = (String) names.nextElement(); + String id = names.nextElement(); if (Debug.ON) Debug.trace("registering listener impl: " + id); @@ -1698,7 +1697,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori // a Master/full crl must exist. while (issuePointIdEnum.hasMoreElements()) { - String issuePointId = (String) issuePointIdEnum.nextElement(); + String issuePointId = issuePointIdEnum.nextElement(); CMS.debug( "initializing crl issue point " + issuePointId); @@ -1923,7 +1922,6 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori DerOutputStream tmpChain = new DerOutputStream(); DerOutputStream tmp1 = new DerOutputStream(); - DerOutputStream outChain = new DerOutputStream(); java.security.cert.X509Certificate chains[] = mOCSPCertChain.getChain(); |