Attachment 597181 Details for Bug 441354 – proposed patch

[patch] proposed patch

441354.txt (text/plain), 3.77 KB, created by Andrew Wnuk on 2012-07-09 23:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Wnuk

Created: 2012-07-09 23:48:27 UTC

Size: 3.77 KB

patch

obsolete

>Index: pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
>===================================================================
>--- pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java	(revision 2381)
>+++ pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java	(working copy)
>@@ -464,6 +464,12 @@
> 
>             // Construct a CRL reason code extension.
>             RevocationReason revReason = RevocationReason.fromInt(reason);
>+            header.addIntegerValue("reasonCode", reason);
>+            if (revReason != null) {
>+                header.addStringValue("reason", revReason.toString());
>+            } else {
>+                header.addStringValue("error", "Invalid revocation reason: "+reason);
>+            }
>             CRLReasonExtension crlReasonExtn = new CRLReasonExtension(revReason);
> 
>             // Construct a CRL invalidity date extension.
>@@ -496,7 +502,8 @@
>                     rarg.addBigIntegerValue("serialNumber",
>                         cert.getSerialNumber(), 16);
> 
>-                    if (rec.getStatus().equals(ICertRecord.STATUS_REVOKED)) {
>+                    if ((rec.getStatus().equals(ICertRecord.STATUS_REVOKED)) &&
>+                        (revReason == null || revReason != RevocationReason.REMOVE_FROM_CRL)) {
>                         rarg.addStringValue("error", "Certificate " +
>                             cert.getSerialNumber().toString() +
>                             " is already revoked.");
>@@ -602,14 +609,20 @@
> 
>             X509CertImpl[] oldCerts = new X509CertImpl[count];
>             RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count];
>+            BigInteger[] certSerialNumbers = new BigInteger[count];
> 
>             for (int i = 0; i < count; i++) {
>                 oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i);
>                 revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i);
>+                certSerialNumbers[i] = oldCerts[i].getSerialNumber();
>             }
> 
>-            IRequest revReq =
>-                mQueue.newRequest(IRequest.REVOCATION_REQUEST);
>+            IRequest revReq = null;
>+            if (revReason != null && revReason == RevocationReason.REMOVE_FROM_CRL) {
>+                revReq = mQueue.newRequest(IRequest.UNREVOCATION_REQUEST);
>+            } else {
>+                revReq = mQueue.newRequest(IRequest.REVOCATION_REQUEST);
>+            }
> 
>             // store a message in the signed audit log file
>             auditMessage = CMS.getLogMessage(
>@@ -622,13 +635,18 @@
> 
>             audit(auditMessage);
> 
>-            revReq.setExtData(IRequest.CERT_INFO, revCertImpls);
>-            revReq.setExtData(IRequest.REQ_TYPE, IRequest.REVOCATION_REQUEST);
>             revReq.setExtData(IRequest.REQUESTOR_TYPE, IRequest.REQUESTOR_AGENT);
>-            revReq.setExtData(IRequest.REVOKED_REASON, reason);
>-            revReq.setExtData(IRequest.OLD_CERTS, oldCerts);
>-            if (comments != null) {
>-                revReq.setExtData(IRequest.REQUESTOR_COMMENTS, comments);
>+            if (revReason != null && revReason == RevocationReason.REMOVE_FROM_CRL) {
>+                revReq.setExtData(IRequest.REQ_TYPE, IRequest.UNREVOCATION_REQUEST);
>+                revReq.setExtData(IRequest.OLD_SERIALS, certSerialNumbers);
>+            } else {
>+                revReq.setExtData(IRequest.CERT_INFO, revCertImpls);
>+                revReq.setExtData(IRequest.REQ_TYPE, IRequest.REVOCATION_REQUEST);
>+                revReq.setExtData(IRequest.REVOKED_REASON, reason);
>+                revReq.setExtData(IRequest.OLD_CERTS, oldCerts);
>+                if (comments != null) {
>+                    revReq.setExtData(IRequest.REQUESTOR_COMMENTS, comments);
>+                }
>             }
> 
>             // change audit processing from "REQUEST" to "REQUEST_PROCESSED"

Flags:

mharmsen: review+

Actions: View | Diff

Attachments on bug 441354: 597181