diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/cert')
14 files changed, 8 insertions, 53 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 0dfe4a26c..5af09ad0d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -200,7 +200,6 @@ public class CMCRevReqServlet extends CMSServlet { if (authToken != null) { reasonCode = authToken.getInInteger(REASON_CODE); } - RevocationReason reason = RevocationReason.fromInt(reasonCode.intValue()); String comments = ""; Date invalidityDate = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 4c0b56f0b..5a1e4ed65 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -160,7 +160,7 @@ public class DisplayBySerial extends CMSServlet { } serialNumber = getSerialNumber(req); - ICertRecord rec = getCertRecord(serialNumber, certType); + getCertRecord(serialNumber, certType); //throw exception on error if (certType[0].equalsIgnoreCase("x509")) { form = getTemplate(mForm1Path, req, locale); @@ -230,7 +230,7 @@ public class DisplayBySerial extends CMSServlet { String certType[] = new String[1]; try { - ICertRecord rec = getCertRecord(seq, certType); + getCertRecord(seq, certType); // throw exception on error if (certType[0].equalsIgnoreCase("x509")) { processX509(argSet, header, seq, req, resp, locale); diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index b84f5ace1..1594c5323 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -291,7 +291,7 @@ public class DoRevoke extends CMSServlet { if (authToken != null) { String serialNumber = req.getParameter("serialNumber"); - X509CertImpl sslCert = (X509CertImpl) getSSLClientCertificate(req); + getSSLClientCertificate(req); // throw exception on error if (serialNumber != null) { eeSerialNumber = serialNumber; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index 853fa1e45..c4603dd51 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -27,7 +27,6 @@ import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -254,8 +253,6 @@ public class DoRevokeTPS extends CMSServlet { } try { - ServletOutputStream out = resp.getOutputStream(); - if (!authorized) { o_status = "status=3"; errorString = "error=unauthorized"; @@ -684,19 +681,6 @@ public class DoRevokeTPS extends CMSServlet { if (mPublisherProcessor != null && mPublisherProcessor.ldapEnabled()) { header.addStringValue("dirEnabled", "yes"); - Integer[] ldapPublishStatus = - revReq.getExtDataInIntegerArray("ldapPublishStatus"); - int certsToUpdate = 0; - int certsUpdated = 0; - - if (ldapPublishStatus != null) { - certsToUpdate = ldapPublishStatus.length; - for (int i = 0; i < certsToUpdate; i++) { - if (ldapPublishStatus[i] == IRequest.RES_SUCCESS) { - certsUpdated++; - } - } - } // add crl publishing status. String publError = diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index c5fb568f2..c6b6065b4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -577,7 +577,7 @@ public class DoUnrevoke extends CMSServlet { String serialNumString = req.getParameter("serialNumber"); StringTokenizer snList = new StringTokenizer(serialNumString, " "); - Vector biList = new Vector(); + Vector<BigInteger> biList = new Vector<BigInteger>(); while (snList.hasMoreTokens()) { String snStr = snList.nextToken(); if (snStr != null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 969619815..5d096aff3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -27,7 +27,6 @@ import java.util.Vector; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,7 +50,6 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; -import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.ECMSGWException; /** @@ -125,8 +123,6 @@ public class DoUnrevokeTPS extends CMSServlet { BigInteger[] serialNumbers; EBaseException error = null; - CMSTemplate form = null; - Locale[] locale = new Locale[1]; /* @@ -195,8 +191,6 @@ public class DoUnrevokeTPS extends CMSServlet { } try { - ServletOutputStream out = resp.getOutputStream(); - if (error == null) { o_status = "status=0"; errorString = "error="; @@ -530,7 +524,7 @@ public class DoUnrevokeTPS extends CMSServlet { String serialNumString = req.getParameter("serialNumber"); StringTokenizer snList = new StringTokenizer(serialNumString, " "); - Vector biList = new Vector(); + Vector<BigInteger> biList = new Vector<BigInteger>(); while (snList.hasMoreTokens()) { String snStr = snList.nextToken(); if (snStr != null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index b580d7f79..a73a8146c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -473,7 +473,6 @@ public class EnrollServlet extends CMSServlet { (ICertRecordList) mCa.getCertificateRepository().findCertRecordsInList(filter, null, 10); int size = list.getSize(); Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1); - boolean gotEncCert = false; CMS.debug("EnrollServlet: signing cert filter " + filter); @@ -989,14 +988,9 @@ public class EnrollServlet extends CMSServlet { SUBJECT_KEYGEN_INFO, null); PKCS10 pkcs10 = null; - String certType = null; - - // - String test = httpParams.getValueAsString("certNickname", null); - // support Enterprise 3.5.1 server where CERT_TYPE=csrCertType // instead of certType - certType = httpParams.getValueAsString(OLD_CERT_TYPE, null); + String certType = httpParams.getValueAsString(OLD_CERT_TYPE, null); CMS.debug("EnrollServlet: certType " + certType); if (certType == null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index b9a2221f2..663397f54 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -122,8 +122,6 @@ public class GetBySerial extends CMSServlet { * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { - int serialNumber = -1; - boolean noError = true; HttpServletRequest req = cmsReq.getHttpReq(); HttpServletResponse response = cmsReq.getHttpResp(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index ae7599498..fe55f335b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -255,7 +255,6 @@ public class GetCAChain extends CMSServlet { HttpServletResponse httpResp, CMSRequest cmsReq) throws EBaseException { - String outputString = null; CertificateChain certChain = ((ICertAuthority) mAuthority).getCACertChain(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java index 9db5cb892..6af5c0c39 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -314,7 +314,7 @@ public class GetInfo extends CMSServlet { if (crlSplits.length() > 0) crlSplits.append("+"); - Vector splits = ip.getSplitTimes(); + Vector<Long> splits = ip.getSplitTimes(); for (int i = 0; i < splits.size(); i++) { crlSplits.append(splits.elementAt(i)); diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 4af8a6a68..5e6207e1a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -67,7 +67,6 @@ import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.KeyGenInfo; import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; @@ -413,18 +412,9 @@ public class HashEnrollServlet extends CMSServlet { // } } - // fill certInfo from input types: keygen, cmc, pkcs10 or crmf - KeyGenInfo keyGenInfo = - httpParams.getValueAsKeyGenInfo(SUBJECT_KEYGEN_INFO, null); - - String certType = null; - - // - String test = httpParams.getValueAsString("certNickname", null); - // support Enterprise 3.5.1 server where CERT_TYPE=csrCertType // instead of certType - certType = httpParams.getValueAsString(OLD_CERT_TYPE, null); + String certType = httpParams.getValueAsString(OLD_CERT_TYPE, null); if (certType == null) { certType = httpParams.getValueAsString(CERT_TYPE, "client"); } else { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 663eaae1a..22aa29eda 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -149,7 +149,6 @@ public class RevocationServlet extends CMSServlet { BigInteger old_serial_no = null; X509CertImpl old_cert = null; - String revokeAll = null; CMSTemplate form = null; Locale[] locale = new Locale[1]; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java index 680886b95..c0298d1e7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -121,7 +121,6 @@ public class UpdateCRL extends CMSServlet { statsSub.startTiming("crl", true /* main action */); } - long startTime = CMS.getCurrentDate().getTime(); IAuthToken authToken = authenticate(cmsReq); AuthzToken authzToken = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 525775d62..90a48cb4e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -1112,7 +1112,6 @@ public class CRSEnrollment extends HttpServlet { KeyWrapper kw; Cipher cip; EncryptionAlgorithm ea; - boolean errorInRequest = false; // Unwrap the session key with the Cert server key try { |