1 files changed, 44 insertions, 53 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
index 65718481..01550c1a 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
-
 import java.io.ByteArrayOutputStream;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
@@ -42,14 +41,13 @@ import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.common.EnrollProfile;
 
-
 /**
- * This class implements the output plugin that outputs
- * PKCS7 for the issued certificate.
- *
+ * This class implements the output plugin that outputs PKCS7 for the issued
+ * certificate.
+ * 
  * @version $Revision$, $Date$
  */
-public class PKCS7Output extends EnrollOutput implements IProfileOutput { 
+public class PKCS7Output extends EnrollOutput implements IProfileOutput {
 
     public static final String VAL_PRETTY_CERT = "pretty_cert";
     public static final String VAL_PKCS7 = "pkcs7";
@@ -63,7 +61,7 @@ public class PKCS7Output extends EnrollOutput implements IProfileOutput {
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-        throws EProfileException {
+            throws EProfileException {
         super.init(profile, config);
     }
 
@@ -85,72 +83,65 @@ public class PKCS7Output extends EnrollOutput implements IProfileOutput {
      * Populates the request with this policy default.
      */
     public void populate(IProfileContext ctx, IRequest request)
-        throws EProfileException {
+            throws EProfileException {
     }
 
     /**
-     * Retrieves the descriptor of the given value
-     * parameter by name.
+     * Retrieves the descriptor of the given value parameter by name.
      */
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_PRETTY_CERT)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
-                    null,
-                    CMS.getUserMessage(locale, 
-                        "CMS_PROFILE_OUTPUT_CERT_PP"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
+                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_PP"));
         } else if (name.equals(VAL_PKCS7)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
-                    null,
-                    CMS.getUserMessage(locale, 
-                        "CMS_PROFILE_OUTPUT_PKCS7_B64"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
+                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_PKCS7_B64"));
         }
         return null;
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-        throws EProfileException {
+            throws EProfileException {
         if (name.equals(VAL_PRETTY_CERT)) {
-            X509CertImpl cert = request.getExtDataInCert(
-                    EnrollProfile.REQUEST_ISSUED_CERT);
+            X509CertImpl cert = request
+                    .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
             if (cert == null)
-                  return null;
-            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert); 
+                return null;
+            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert);
 
             return prettyCert.toString(locale);
         } else if (name.equals(VAL_PKCS7)) {
 
             try {
-              X509CertImpl cert = request.getExtDataInCert(
-                    EnrollProfile.REQUEST_ISSUED_CERT);
-              if (cert == null)
-                  return null;
-            
-              ICertificateAuthority ca = (ICertificateAuthority)
-                   CMS.getSubsystem("ca");
-              CertificateChain cachain = ca.getCACertChain(); 
-              X509Certificate[] cacerts = cachain.getChain();
-
-              X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1]; 
-              int m = 1, n = 0;
-
-              for (; n < cacerts.length; m++, n++) {
-                userChain[m] = (X509CertImpl) cacerts[n];
-              }
-
-              userChain[0] = cert;
-              PKCS7 p7 = new PKCS7(new AlgorithmId[0], 
-                  new ContentInfo(new byte[0]), 
-                  userChain, 
-                  new SignerInfo[0]); 
-              ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-              p7.encodeSignedData(bos); 
-              byte[] p7Bytes = bos.toByteArray(); 
-              String p7Str = CMS.BtoA(p7Bytes);
-
-              return p7Str;
+                X509CertImpl cert = request
+                        .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
+                if (cert == null)
+                    return null;
+
+                ICertificateAuthority ca = (ICertificateAuthority) CMS
+                        .getSubsystem("ca");
+                CertificateChain cachain = ca.getCACertChain();
+                X509Certificate[] cacerts = cachain.getChain();
+
+                X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1];
+                int m = 1, n = 0;
+
+                for (; n < cacerts.length; m++, n++) {
+                    userChain[m] = (X509CertImpl) cacerts[n];
+                }
+
+                userChain[0] = cert;
+                PKCS7 p7 = new PKCS7(new AlgorithmId[0], new ContentInfo(
+                        new byte[0]), userChain, new SignerInfo[0]);
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+                p7.encodeSignedData(bos);
+                byte[] p7Bytes = bos.toByteArray();
+                String p7Str = CMS.BtoA(p7Bytes);
+
+                return p7Str;
             } catch (Exception e) {
-              return "";
+                return "";
             }
         } else {
             return null;