diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
| commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
| tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cms/servlet/cert | |
| parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
| download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip | |
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command:
find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;
Ticket #134
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/cert')
36 files changed, 281 insertions, 281 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 5af09ad0d..fc9a97be2 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Revoke a certificate with a CMC-formatted revocation request - * + * * @version $Revision$, $Date$ */ public class CMCRevReqServlet extends CMSServlet { @@ -96,7 +96,7 @@ public class CMCRevReqServlet extends CMSServlet { private final static String LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED = "LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED_7"; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -110,7 +110,7 @@ public class CMCRevReqServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -136,11 +136,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Process the HTTP request. - * + * * <ul> * <li>http.param cmcRequest the base-64 encoded CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -315,20 +315,20 @@ public class CMCRevReqServlet extends CMSServlet { * Process cert status change request using the Certificate Management * protocol using CMS (CMC) * <P> - * + * * (Certificate Request - an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - an "EE" cert status change request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -965,11 +965,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -995,11 +995,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1028,11 +1028,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index f056047cc..94c8f1207 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Takes the certificate info (serial number) and optional challenge phrase, creates a * revocation request and submits it to the authority subsystem for processing - * + * * @version $Revision$, $Date$ */ public class ChallengeRevocationServlet1 extends CMSServlet { @@ -88,7 +88,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { private IPublisherProcessor mPublisherProcessor = null; private String mRequestID = null; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -103,7 +103,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { /** * Initialize the servlet. This servlet uses the file * revocationResult.template for the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -130,7 +130,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { * <li>http.param REASON_CODE the revocation reason * <li>http.param b64eCertificate the base-64 encoded certificate to revoke * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -370,7 +370,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java index d17fd959b..aa7abc92e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * Redirect a request to the Master. This servlet is used in * a clone when a requested service (such as CRL) is not available. * It redirects the user to the master. - * + * * @version $Revision$, $Date$ */ public class CloneRedirect extends CMSServlet { @@ -69,7 +69,7 @@ public class CloneRedirect extends CMSServlet { /** * Initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java index ced92ba85..aa48a7ca9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Face-to-face' certificate enrollment. - * + * * @version $Revision$, $Date$ */ public class DirAuthServlet extends CMSServlet { @@ -64,7 +64,7 @@ public class DirAuthServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class DirAuthServlet extends CMSServlet { /** * Process the HTTP request. This servlet reads configuration information * from the hashDirEnrollment configuration substore - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index a5cdc98e8..46863c098 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, disable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.EnableEnrollResult */ 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 5a1e4ed65..105fc66a1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -69,10 +69,10 @@ import com.netscape.cmsutil.util.Utils; /** * Display detailed information about a certificate - * + * * The template 'displayBySerial.template' is used to * render the response for this servlet. - * + * * @version $Revision$, $Date$ */ public class DisplayBySerial extends CMSServlet { @@ -98,7 +98,7 @@ public class DisplayBySerial extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -118,7 +118,7 @@ public class DisplayBySerial extends CMSServlet { if (mOutputTemplatePath != null) mForm1Path = mOutputTemplatePath; - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); } @@ -353,11 +353,11 @@ public class DisplayBySerial extends CMSServlet { /* String scheme = req.getScheme(); - if (scheme.equals("http") && connectionIsSSL(req)) + if (scheme.equals("http") && connectionIsSSL(req)) scheme = "https"; String requestURI = req.getRequestURI(); int i = requestURI.indexOf('?'); - String newRequestURI = + String newRequestURI = (i > -1)? requestURI.substring(0, i): requestURI; header.addStringValue("serviceURL", scheme +"://"+ req.getServerName() + ":"+ @@ -384,7 +384,7 @@ public class DisplayBySerial extends CMSServlet { /* String userAgent = req.getHeader("user-agent"); - String agent = + String agent = (userAgent != null)? UserInfo.getUserAgent(userAgent): ""; */ // Now formulate a PKCS#7 blob @@ -428,7 +428,7 @@ public class DisplayBySerial extends CMSServlet { p7Str = Utils.base64encode(p7Bytes); header.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception e) { - //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() //+ "; Please contact your administrator"; log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_FORMING_PKCS7_1", e.toString())); 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 ad503272a..61a606cae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -52,7 +52,7 @@ import com.netscape.cmsutil.util.Utils; /** * Decode the CRL and display it to the requester. - * + * * @version $Revision$, $Date$ */ public class DisplayCRL extends CMSServlet { @@ -79,7 +79,7 @@ public class DisplayCRL extends CMSServlet { /** * Initialize the servlet. This servlet uses the 'displayCRL.template' file to * to render the response to the client. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class DisplayCRL extends CMSServlet { * <li>http.param pageStart which page to start displaying from * <li>http.param pageSize number of entries to show per page * </ul> - * + * * @param cmsReq the Request to service. */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index 99082d4c5..e65082f4d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to report the status, ie, the agent-initiated user * enrollment is enabled or disabled. - * + * * @version $Revision$, $Date$ */ public class DisplayHashUserEnroll extends CMSServlet { 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 1594c5323..afd958abf 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -73,7 +73,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevoke extends CMSServlet { @@ -109,7 +109,7 @@ public class DoRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -144,18 +144,18 @@ public class DoRevoke extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -375,21 +375,21 @@ public class DoRevoke extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -535,7 +535,7 @@ public class DoRevoke extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; @@ -564,7 +564,7 @@ public class DoRevoke extends CMSServlet { boolean addToList = false; for (int j = 0; j < serialNumbers.size(); j++) { - //xxxxx serial number in decimal? + //xxxxx serial number in decimal? if (certs[i].getSerialNumber().toString().equals((String) serialNumbers.elementAt(j)) && eeSubjectDN != null && eeSubjectDN.equals(certs[i].getSubjectDN().toString())) { addToList = true; @@ -707,7 +707,7 @@ public class DoRevoke extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -832,7 +832,7 @@ public class DoRevoke extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -906,7 +906,7 @@ public class DoRevoke extends CMSServlet { header.addIntegerValue("certsUpdated", certsUpdated); header.addIntegerValue("certsToUpdate", certsToUpdate); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -1110,11 +1110,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -1140,11 +1140,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1164,7 +1164,7 @@ public class DoRevoke extends CMSServlet { BigInteger value = BigInteger.ONE.negate(); - //try int + //try int try { value = new BigInteger(serialNumber, 10); } catch (NumberFormatException e) { @@ -1193,11 +1193,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ 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 c4603dd51..83cefa6f6 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -64,7 +64,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevokeTPS extends CMSServlet { @@ -99,7 +99,7 @@ public class DoRevokeTPS extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -129,18 +129,18 @@ public class DoRevokeTPS extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -278,21 +278,21 @@ public class DoRevokeTPS extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -510,7 +510,7 @@ public class DoRevokeTPS extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -629,7 +629,7 @@ public class DoRevokeTPS extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -682,7 +682,7 @@ public class DoRevokeTPS extends CMSServlet { if (mPublisherProcessor != null && mPublisherProcessor.ldapEnabled()) { header.addStringValue("dirEnabled", "yes"); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -851,11 +851,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -881,11 +881,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -912,11 +912,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ 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 c6b6065b4..cd9a0196b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevoke extends CMSServlet { @@ -89,7 +89,7 @@ public class DoUnrevoke extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -115,7 +115,7 @@ public class DoUnrevoke extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -214,20 +214,20 @@ public class DoUnrevoke extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param serialNumbers the serial number of the certificate @@ -409,7 +409,7 @@ public class DoUnrevoke extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -610,11 +610,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -640,11 +640,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ 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 5d096aff3..e56eece2c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevokeTPS extends CMSServlet { @@ -88,7 +88,7 @@ public class DoUnrevokeTPS extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class DoUnrevokeTPS extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -129,7 +129,7 @@ public class DoUnrevokeTPS extends CMSServlet { try { form = getTemplate(mFormPath, req, locale); } catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", e.toString())); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); @@ -217,20 +217,20 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param serialNumbers the serial number of the certificate * @param req HTTP servlet request * @param resp HTTP servlet response @@ -365,7 +365,7 @@ public class DoUnrevokeTPS extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -557,11 +557,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -587,11 +587,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index 2a143b668..cbb233251 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, enable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.DisableEnrollResult */ 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 a73a8146c..50eaaa94b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -77,7 +77,7 @@ import com.netscape.cmsutil.util.Utils; /** * Submit a Certificate Enrollment request - * + * * @version $Revision$, $Date$ */ public class EnrollServlet extends CMSServlet { @@ -91,7 +91,7 @@ public class EnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "EnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -171,7 +171,7 @@ public class EnrollServlet extends CMSServlet { * <ul> * <li>CMSServlet.PROP_ID - ID for signed audit log messages * <li>CMSServlet.PROP_SUCCESS_TEMPLATE - success template file - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -288,7 +288,7 @@ public class EnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -304,7 +304,7 @@ public class EnrollServlet extends CMSServlet { * Getter method to see if Proof of Posession checking is enabled. * this value is set in the CMS.cfg filem with the parameter * "enrollment.enforcePop". It defaults to false - * + * * @return true if user is required to Prove that they possess the * private key corresponding to the public key in the certificate * request they are submitting @@ -323,7 +323,7 @@ public class EnrollServlet extends CMSServlet { * <LI>The request is preprocessed, then processed further in one of the cert request processor classes: * KeyGenProcessor, PKCS10Processor, CMCProcessor, CRMFProcessor * </UL> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -693,23 +693,23 @@ public class EnrollServlet extends CMSServlet { /** * Process X509 certificate enrollment request * <P> - * + * * (Certificate Request - either an "admin" cert request for an admin certificate, an "agent" cert request for * "bulk enrollment", or an "EE" standard cert request) * <P> - * + * * (Certificate Request Processed - either an automated "admin" non-profile based CA admin cert acceptance, an * automated "admin" non-profile based CA admin cert rejection, an automated "EE" non-profile based cert acceptance, * or an automated "EE" non-profile based cert rejection) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_NON_PROFILE_CERT_REQUEST used when a non-profile cert request is made * (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq a certificate enrollment request * @exception EBaseException an error has occurred */ @@ -806,7 +806,7 @@ public class EnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -938,8 +938,8 @@ public class EnrollServlet extends CMSServlet { if (authToken != null) { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(AuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + @@ -1355,9 +1355,9 @@ public class EnrollServlet extends CMSServlet { // ensure that any low-level exceptions are reported // to the signed audit log and stored as failures try { - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // do not want any javascript in HTML, and need to @@ -1693,11 +1693,11 @@ public class EnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1709,11 +1709,11 @@ public class EnrollServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ 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 663397f54..bf985c93e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.crypto.CryptoUtil; /** * Retrieve certificate by serial number. - * + * * @version $Revision$, $Date$ */ public class GetBySerial extends CMSServlet { @@ -85,7 +85,7 @@ public class GetBySerial extends CMSServlet { * Initialize the servlet. This servlet uses the template file * "ImportCert.template" to import the cert to the users browser, * if that is what the user requested - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -101,7 +101,7 @@ public class GetBySerial extends CMSServlet { } mImportTemplateFiller = new ImportCertsTemplateFiller(); - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); @@ -118,7 +118,7 @@ public class GetBySerial extends CMSServlet { * <ul> * <li>http.param serialNumber serial number of certificate in HEX * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -279,7 +279,7 @@ public class GetBySerial extends CMSServlet { cmsReq.setStatus(CMSRequest.SUCCESS); // XXX follow request in cert record to set certtype, which will - // import cert only if it's client. For now assume "client" if + // import cert only if it's client. For now assume "client" if // someone clicked to import this cert. cmsReq.getHttpParams().set("certType", "client"); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index fe55f335b..da4959268 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve the Certificates comprising the CA Chain for this CA. - * + * * @version $Revision$, $Date$ */ public class GetCAChain extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCAChain extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -85,7 +85,7 @@ public class GetCAChain extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 4c8661359..e9e3c809a 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Utils; /** * Retrieve CRL for a Certificate Authority - * + * * @version $Revision$, $Date$ */ public class GetCRL extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCRL extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -81,7 +81,7 @@ public class GetCRL extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information * @see DisplayCRL#process */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 71b0004cd..ce60fabc1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -54,7 +54,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Gets a issued certificate from a request id. - * + * * @version $Revision$, $Date$ */ public class GetCertFromRequest extends CMSServlet { @@ -82,7 +82,7 @@ public class GetCertFromRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template files * "displayCertFromRequest.template" and "ImportCert.template" - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -134,7 +134,7 @@ public class GetCertFromRequest extends CMSServlet { * <ul> * <li>http.param requestId The request ID to search on * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -206,7 +206,7 @@ public class GetCertFromRequest extends CMSServlet { } } - if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || + if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || (r.getRequestType().equals(IRequest.RENEWAL_REQUEST)))) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_REQUEST_NOT_ENROLLMENT_1", requestId)); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index d0dfb8f9a..99bdf2486 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to get the enrollment status, enable or disable. - * + * * @version $Revision$, $Date$ */ public class GetEnableStatus extends CMSServlet { @@ -63,7 +63,7 @@ public class GetEnableStatus extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class GetEnableStatus extends CMSServlet { * <ul> * <li>http.param * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) 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 6af5c0c39..30f0b0c40 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get detailed information about CA CRL processing - * + * * @version $Revision$, $Date$ */ public class GetInfo extends CMSServlet { @@ -74,7 +74,7 @@ public class GetInfo extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -93,7 +93,7 @@ public class GetInfo extends CMSServlet { * <ul> * <li>http.param template filename of template to use to render the result * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { 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 5e6207e1a..0d4b52672 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -85,7 +85,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * performs face-to-face enrollment. - * + * * @version $Revision$, $Date$ */ public class HashEnrollServlet extends CMSServlet { @@ -99,7 +99,7 @@ public class HashEnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "/ra/HashEnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -130,7 +130,7 @@ public class HashEnrollServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -157,7 +157,7 @@ public class HashEnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); } @@ -165,7 +165,7 @@ public class HashEnrollServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -281,7 +281,7 @@ public class HashEnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -349,8 +349,8 @@ public class HashEnrollServlet extends CMSServlet { String certBasedOldSubjectDN = null; BigInteger certBasedOldSerialNum = null; - // check if request was authenticated, if so set authtoken & certInfo. - // also if authenticated, take certInfo from authToken. + // check if request was authenticated, if so set authtoken & certInfo. + // also if authenticated, take certInfo from authToken. X509CertInfo certInfo = null; if (certAuthEnroll == true) { @@ -399,14 +399,14 @@ public class HashEnrollServlet extends CMSServlet { } else { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME)); fillCertInfoFromAuthToken(certInfo, authToken); - // save authtoken attrs to request directly (for policy use) + // save authtoken attrs to request directly (for policy use) saveAuthToken(authToken, req); // req.set(IRequest.AUTH_TOKEN, authToken); // } @@ -606,9 +606,9 @@ public class HashEnrollServlet extends CMSServlet { req.setExtData(CHALLENGE_PASSWORD, pwd); } - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // dont want any javascript in HTML, and need to @@ -628,7 +628,7 @@ public class HashEnrollServlet extends CMSServlet { String agentID = null; if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { - // request is from eegateway, so fromUser. + // request is from eegateway, so fromUser. initiative = AuditFormat.FROMUSER; } else { agentID = authToken.getInString("userid"); @@ -640,7 +640,7 @@ public class HashEnrollServlet extends CMSServlet { if (status != RequestStatus.COMPLETE) { cmsReq.setIRequestStatus(); // set status acc. to IRequest status. - // audit log the status + // audit log the status try { if (status == RequestStatus.REJECTED) { Vector<String> messages = req.getExtDataInStringVector(IRequest.ERRORS); @@ -680,7 +680,7 @@ public class HashEnrollServlet extends CMSServlet { certInfo.get(X509CertInfo.SUBJECT), "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -802,7 +802,7 @@ public class HashEnrollServlet extends CMSServlet { throws EBaseException { // override subject, validity and extensions from auth token // CA determines algorithm, version and issuer. - // take key from keygen, cmc, pkcs10 or crmf. + // take key from keygen, cmc, pkcs10 or crmf. // subject name. try { @@ -953,14 +953,14 @@ public class HashEnrollServlet extends CMSServlet { new CertificateSubjectName(subject)); } else if (authToken == null || authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) == null) { - // No subject name - error! + // No subject name - error! log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); } - // get extensions + // get extensions CertificateExtensions extensions = null; try { @@ -972,8 +972,8 @@ public class HashEnrollServlet extends CMSServlet { extensions = null; } if (certTemplate.hasExtensions()) { - // put each extension from CRMF into CertInfo. - // index by extension name, consistent with + // put each extension from CRMF into CertInfo. + // index by extension name, consistent with // CertificateExtensions.parseExtension() method. if (extensions == null) extensions = new CertificateExtensions(); @@ -1013,7 +1013,7 @@ public class HashEnrollServlet extends CMSServlet { } - // Added a new configuration parameter + // Added a new configuration parameter // eeGateway.Enrollment.authTokenOverride=[true|false] // By default, it is set to true. In most // of the case, administrator would want @@ -1022,7 +1022,7 @@ public class HashEnrollServlet extends CMSServlet { // -- CRMFfillCert if (authToken != null && authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) != null) { - // if authenticated override subect name, validity and + // if authenticated override subect name, validity and // extensions if any from authtoken. fillCertInfoFromAuthToken(certInfo, authToken); } @@ -1161,11 +1161,11 @@ public class HashEnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1196,7 +1196,7 @@ public class HashEnrollServlet extends CMSServlet { exts.get(KeyUsageExtension.NAME); if (ext == null) - // should not happen + // should not happen continue; byte[] value = ext.getExtensionValue(); @@ -1207,7 +1207,7 @@ public class HashEnrollServlet extends CMSServlet { newvalue[1] = 0x03; newvalue[2] = 0x07; newvalue[3] = value[3]; - // force encryption certs to have digitial signature + // force encryption certs to have digitial signature // set too so smime can find the cert for encryption. if (value[3] == 0x20) { @@ -1229,10 +1229,10 @@ public class HashEnrollServlet extends CMSServlet { exts.set(KeyUsageExtension.NAME, newext); } } catch (IOException e) { - // should never happen + // should never happen continue; } catch (CertificateException e) { - // should never happen + // should never happen continue; } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 2f551d3f5..016d5a124 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -60,24 +60,24 @@ import com.netscape.cmsutil.util.Utils; /** * Set up HTTP response to import certificate into browsers - * + * * The result must have been populate with the set of certificates * to return. - * + * * <pre> * inputs: certtype. - * outputs: + * outputs: * - cert type from http input (if any) - * - CA chain + * - CA chain * - authority name (RM, CM, DRM) * - scheme:host:port of server. - * array of one or more + * array of one or more * - cert serial number * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import * </pre> - * + * * @version $Revision$, $Date$ */ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { @@ -118,7 +118,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(header, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -169,14 +169,14 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { if (replyTo != null) fixed.set("replyTo", replyTo); - // set user + CA cert chain and pkcs7 for MSIE. + // set user + CA cert chain and pkcs7 for MSIE. X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1]; int m = 1, n = 0; for (; n < cacerts.length; m++, n++) userChain[m] = (X509CertImpl) cacerts[n]; - // certs. + // certs. X509CertImpl[] certs = (X509CertImpl[]) cmsReq.getResult(); // expose CRMF request id @@ -190,7 +190,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CRMF_REQID, crmfReqId); } - // set CA certs in cmmf, initialize CertRepContent + // set CA certs in cmmf, initialize CertRepContent // note cartman can't trust ca certs yet but it'll import them. // also set cert nickname for cartman. CertRepContent certRepContent = null; @@ -212,7 +212,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CERT_NICKNAME, certnickname); } - // make pkcs7 for MSIE + // make pkcs7 for MSIE if (CMSServlet.clientIsMSIE(cmsReq.getHttpReq()) && (certType == null || certType.equals("client"))) { userChain[0] = certs[0]; @@ -308,7 +308,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { p7Str = CMS.BtoA(p7Bytes); repeat.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception ex) { - //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() //+ "; Please contact your administrator"; throw new ECMSGWException( CMS.getUserMessage("CMS_GW_FORMING_PKCS7_ERROR")); diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index b93a82fb8..4185113f4 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve a paged list of certs matching the specified query - * + * * @version $Revision$, $Date$ */ public class ListCerts extends CMSServlet { @@ -93,7 +93,7 @@ public class ListCerts extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryCert.template" to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -400,7 +400,7 @@ public class ListCerts extends CMSServlet { int toCurIndex = 0; if (!serialToVal.equals(MINUS_ONE)) { - // if user specify a range, we need to + // if user specify a range, we need to // calculate the totalRecordCount tolist = (ICertRecordList) mCertDB.findCertRecordsInList( filter, @@ -456,7 +456,7 @@ public class ListCerts extends CMSServlet { } // DS has a problem where last record will be returned - // even though the filter is not matched. + // even though the filter is not matched. /*cfu - is this necessary? it breaks when paging up if (curSerial.compareTo(sentinel) == -1) { com.netscape.certsrv.apps.CMS.debug("curSerial compare sentinel -1 break..."); 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 ac531caca..7f626a83f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Provide statistical queries of request and certificate records. - * + * * @version $Revision$, $Date$ */ public class Monitor extends CMSServlet { @@ -82,7 +82,7 @@ public class Monitor extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'monitor.template' to render the response. - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index 0f21e1921..5b9cd7741 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Specify the RevocationReason when revoking a certificate - * + * * @version $Revision$, $Date$ */ public class ReasonToRevoke extends CMSServlet { @@ -75,7 +75,7 @@ public class ReasonToRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'reasonToRevoke.template' to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -112,7 +112,7 @@ public class ReasonToRevoke extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { 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 478df161d..2783656ae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -53,7 +53,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Allow agent to turn on/off authentication managers - * + * * @version $Revision$, $Date$ */ public class RemoteAuthConfig extends CMSServlet { @@ -85,7 +85,7 @@ public class RemoteAuthConfig extends CMSServlet { /** * Initializes the servlet. - * + * * Presence of "auths.enableRemoteConfiguration=true" in CMS.cfg * enables remote configuration for authentication plugins. * List of remotely set instances can be found in CMS.cfg diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index 223121577..3b2a8c3e9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Certificate Renewal - * + * * @version $Revision$, $Date$ */ public class RenewalServlet extends CMSServlet { @@ -70,12 +70,12 @@ public class RenewalServlet extends CMSServlet { // renewal templates. public static final String RENEWAL_SUCCESS_TEMPLATE = "RenewalSuccess.template"; - // http params + // http params public static final String CERT_TYPE = "certType"; public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String IMPORT_CERT = "importCert"; private String mRenewalSuccessTemplate = RENEWAL_SUCCESS_TEMPLATE; @@ -89,7 +89,7 @@ public class RenewalServlet extends CMSServlet { * initialize the servlet. This servlet makes use of the * template file "RenewalSuccess.template" to render the * response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -111,7 +111,7 @@ public class RenewalServlet extends CMSServlet { mRenewalSuccessFiller = filler; } } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -121,7 +121,7 @@ public class RenewalServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -130,12 +130,12 @@ public class RenewalServlet extends CMSServlet { IArgBlock httpParams = cmsReq.getHttpParams(); HttpServletRequest httpReq = cmsReq.getHttpReq(); - // renewal requires either: - // - coming from ee: - // - old cert from ssl client auth + // renewal requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be renewed. + // - coming from agent or trusted RA: + // - serial no of cert to be renewed. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -171,7 +171,7 @@ public class RenewalServlet extends CMSServlet { authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -196,7 +196,7 @@ public class RenewalServlet extends CMSServlet { } } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); @@ -215,15 +215,15 @@ public class RenewalServlet extends CMSServlet { req.setExtData(IRequest.OLD_CERTS, new X509CertImpl[] { old_cert } ); - // create new certinfo from old_cert contents. + // create new certinfo from old_cert contents. X509CertInfo old_certInfo = (X509CertInfo) ((X509CertImpl) old_cert).get( X509CertImpl.NAME + "." + X509CertImpl.INFO); new_certInfo = new X509CertInfo(old_certInfo.getEncodedInfo()); } else { - // if no old cert (came from RA agent) create new cert info - // (serializable) to pass through policies. And set the old + // if no old cert (came from RA agent) create new cert info + // (serializable) to pass through policies. And set the old // serial number to pick up. new_certInfo = new CertInfo(); new_certInfo.set(X509CertInfo.SERIAL_NUMBER, @@ -256,7 +256,7 @@ public class RenewalServlet extends CMSServlet { saveAuthToken(authToken, req); cmsReq.setIRequest(req); - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); // for audit log @@ -271,7 +271,7 @@ public class RenewalServlet extends CMSServlet { initiative = AuditFormat.FROMUSER; } - // check resulting status + // check resulting status RequestStatus status = req.getRequestStatus(); if (status != RequestStatus.COMPLETE) { @@ -320,7 +320,7 @@ public class RenewalServlet extends CMSServlet { "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -338,7 +338,7 @@ public class RenewalServlet extends CMSServlet { return; } - // service error + // service error Integer result = req.getExtDataInInteger(IRequest.RESULT); CMS.debug( @@ -413,8 +413,8 @@ public class RenewalServlet extends CMSServlet { ); cmsReq.setStatus(CMSRequest.SUCCESS); - // check if cert should be imported. - // browser must have input type set to nav or cartman since + // check if cert should be imported. + // browser must have input type set to nav or cartman since // there's no other way to tell IArgBlock httpParams = cmsReq.getHttpParams(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 22aa29eda..2c1709145 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.util.Utils; /** * Perform the first step in revoking a certificate - * + * * @version $Revision$, $Date$ */ public class RevocationServlet extends CMSServlet { @@ -71,11 +71,11 @@ public class RevocationServlet extends CMSServlet { // revocation templates. private final static String TPL_FILE = "reasonToRevoke.template"; - // http params + // http params public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String REASON_CODE = "reasonCode"; private String mFormPath = null; @@ -92,7 +92,7 @@ public class RevocationServlet extends CMSServlet { * initialize the servlet. This servlet uses * the template file "reasonToRevoke.template" to render the * result. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -131,7 +131,7 @@ public class RevocationServlet extends CMSServlet { * actually perform the certificate revocation. This is the first * step in the multi-step revocation process. (the next step is * in the ReasonToRevoke servlet. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -140,12 +140,12 @@ public class RevocationServlet extends CMSServlet { HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - // revocation requires either: - // - coming from ee: - // - old cert from ssl client auth + // revocation requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be revoked. + // - coming from agent or trusted RA: + // - serial no of cert to be revoked. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -186,7 +186,7 @@ public class RevocationServlet extends CMSServlet { return; } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -194,7 +194,7 @@ public class RevocationServlet extends CMSServlet { old_cert = (X509CertImpl) cert[0]; } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index cfc562d71..00941776c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import - * + * * @version $Revision$, $Date$ */ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { @@ -65,7 +65,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(null, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -84,7 +84,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { RevokedCertImpl[] revoked = (RevokedCertImpl[]) cmsReq.getResult(); - // revoked certs. + // revoked certs. for (int i = 0; i < revoked.length; i++) { IArgBlock repeat = CMS.createArgBlock(); 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 3602515c9..375265331 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SrchCerts extends CMSServlet { @@ -96,7 +96,7 @@ public class SrchCerts extends CMSServlet { /** * initialize the servlet. This servlet uses srchCert.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { 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 c0298d1e7..6be6d506c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -61,7 +61,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Force the CRL to be updated now. - * + * * @version $Revision$, $Date$ */ public class UpdateCRL extends CMSServlet { @@ -109,7 +109,7 @@ public class UpdateCRL extends CMSServlet { * <li>http.param clearCRLCache true/false - should the CRL cache cleared before the CRL is generated? * <li>http.param crlIssuingPoint the CRL Issuing Point to Update * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { 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 707e7ff5f..df0277b54 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -59,7 +59,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Update the configured LDAP server with specified objects - * + * * @version $Revision$, $Date$ */ public class UpdateDir extends CMSServlet { @@ -128,7 +128,7 @@ public class UpdateDir extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java index 14c537098..30623ce61 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java +++ b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; /** * @author alee - * + * */ @XmlRootElement(name = "CertificateData") @XmlAccessorType(XmlAccessType.FIELD) 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 90a48cb4e..421381441 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 @@ -126,12 +126,12 @@ import com.netscape.cmsutil.util.Utils; * This servlet deals with PKCS#10-based certificate requests from * CRS, now called SCEP, and defined at: * http://search.ietf.org/internet-drafts/draft-nourse-scep-02.txt - * + * * The router is hardcoded to look for the http://host:80/cgi-bin/pkiclient.exe - * + * * The HTTP parameters are 'operation' and 'message' * operation can be either 'GetCACert' or 'PKIOperation' - * + * * @version $Revision$, $Date$ */ public class CRSEnrollment extends HttpServlet { @@ -319,13 +319,13 @@ public class CRSEnrollment extends HttpServlet { } /** - * + * * Service a CRS Request. It all starts here. This is where the message from the * router is processed - * + * * @param httpReq The HttpServletRequest. * @param httpResp The HttpServletResponse. - * + * */ public void service(HttpServletRequest httpReq, HttpServletResponse httpResp) @@ -500,7 +500,7 @@ public class CRSEnrollment extends HttpServlet { * ANY cert = new ANY(chain[i].getEncoded()); * certs.addElement(cert); * } - * + * * SignedData crsd = new SignedData( * new SET(), // empty set of digestAlgorithmID's * new ContentInfo( @@ -510,14 +510,14 @@ public class CRSEnrollment extends HttpServlet { * null, // no CRL's * new SET() // empty SignerInfos * ); - * + * * ContentInfo wrap = new ContentInfo(ContentInfo.SIGNED_DATA, crsd); - * + * * ByteArrayOutputStream baos = new ByteArrayOutputStream(); * wrap.encode(baos); - * + * * bytes = baos.toByteArray(); - * + * * httpResp.setContentType("application/x-x509-ca-ra-cert"); *****/ @@ -902,17 +902,17 @@ public class CRSEnrollment extends HttpServlet { CMS.debug("Processing PKCSReq"); try { // Check if there is an existing request. If this returns non-null, - // then the request is 'active' (either pending or completed) in + // then the request is 'active' (either pending or completed) in // which case, we compare the hash of the new request to the hash of the - // one in the queue - if they are the same, I return the state of the + // one in the queue - if they are the same, I return the state of the // original request - as if it was 'getCertInitial' message. // If the hashes are different, then the user attempted to enroll - // for a new request with the same txid, which is not allowed - + // for a new request with the same txid, which is not allowed - // so we return 'failure'. IRequest cmsRequest = findRequestByTransactionID(req.getTransactionID(), true); - // If there was no request (with a cert) with this transaction ID, + // If there was no request (with a cert) with this transaction ID, // process it as a new request cert = handlePKCSReq(httpReq, cmsRequest, req, crsResp, cx); @@ -1006,15 +1006,15 @@ public class CRSEnrollment extends HttpServlet { * Called if the router is requesting us to send it its certificate * Examine request queue for a request matching the transaction ID. * Ignore any rejected or cancelled requests. - * + * * If a request is found in the pending state, the response should be * 'pending' - * + * * If a request is found in the completed state, the response should be * to return the certificate - * + * * If no request is found, the response should be to return null - * + * */ public X509CertImpl handleGetCertInitial(CRSPKIMessage req, CRSPKIMessage resp) { @@ -1053,7 +1053,7 @@ public class CRSEnrollment extends HttpServlet { /** * Create an entry for this user in the publishing directory - * + * */ private boolean createEntry(String dn) { @@ -1096,7 +1096,7 @@ public class CRSEnrollment extends HttpServlet { /** * Here we decrypt the PKCS10 message from the client - * + * */ public void unwrapPKCS10(CRSPKIMessage req, CryptoContext cx) @@ -1316,7 +1316,7 @@ public class CRSEnrollment extends HttpServlet { req.put(SUBJECTNAME, subject); if (key == null || subject == null) { - // log + // log //throw new ERegistrationException(RegistrationResources.ERROR_MALFORMED_P10); } @@ -1536,7 +1536,7 @@ public class CRSEnrollment extends HttpServlet { return null; } - ////// post the request + ////// post the request /* needed: @@ -1604,7 +1604,7 @@ public class CRSEnrollment extends HttpServlet { credentials.set("PWD", p10Password); if (authenticator == null) { - // XXX - to help caRouterCert to work, we need to + // XXX - to help caRouterCert to work, we need to // add authentication to caRouterCert authToken = new AuthToken(null); } else { @@ -1867,7 +1867,7 @@ public class CRSEnrollment extends HttpServlet { byte[] ed = crsResp.makeEnvelopedData(0); - // 7. Make Digest of SignedData Content + // 7. Make Digest of SignedData Content MessageDigest md = MessageDigest.getInstance(mHashAlgorithm); msgdigest = md.digest(ed); @@ -1898,7 +1898,7 @@ public class CRSEnrollment extends HttpServlet { // recipientNonce and SenderNonce have already been set crsResp.makeAuthenticatedAttributes(); - // crsResp.makeAuthenticatedAttributes_old(); + // crsResp.makeAuthenticatedAttributes_old(); // now package up the rest of the SignerInfo { diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java index ff55dc9ce..5c7ac856f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java @@ -42,7 +42,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get the password marshalled in this object - * + * * @return the challenge password */ public String toString() { @@ -51,7 +51,7 @@ public class ChallengePassword implements CertAttrSet { /** * Create a ChallengePassword object - * + * * @param stuff (must be of type byte[]) a DER-encoded by array following * The ASN.1 template for ChallenegePassword specified in the SCEP * documentation @@ -103,7 +103,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get an attribute of this object. - * + * * @param name the name of the attribute of this object to get. The only * supported attribute is "password" */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java index 85f3938b8..3cb88f3f8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java @@ -94,7 +94,7 @@ public class ExtensionsRequested implements CertAttrSet { /** * construct - expects this in the inputstream (from the router): - * + * * 211 30 31: SEQUENCE { * 213 06 10: OBJECT IDENTIFIER '2 16 840 1 113733 1 9 8' * 225 31 17: SET { @@ -107,9 +107,9 @@ public class ExtensionsRequested implements CertAttrSet { * : } * : } * : } - * + * * or this (from IRE client): - * + * * 262 30 51: SEQUENCE { * 264 06 9: OBJECT IDENTIFIER extensionReq (1 2 840 113549 1 9 14) * 275 31 38: SET { |