From 7c7b9d023cd466c1771068badc020dab36beb553 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 14:49:11 -0500 Subject: 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 --- .../cms/servlet/cert/scep/CRSEnrollment.java | 52 +++++++++++----------- .../cms/servlet/cert/scep/ChallengePassword.java | 6 +-- .../cms/servlet/cert/scep/ExtensionsRequested.java | 6 +-- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/cert/scep') 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 { -- cgit