pki-tools HEADER/FOOTER changes

* PKI TRAC Ticket #2436 - Dogtag 10.3.6: Miscellaneous Enhancements

5 files changed, 29 insertions, 18 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index d13ed13f7..dc4b191c5 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -79,8 +79,11 @@ public class CMCEnroll {
     public static final String PR_REQUEST_PKCS10 = "PKCS10";
 
     public static final int ARGC = 4;
-    public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
-    public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
+    public static final String HEADER = "-----BEGIN";
+    public static final String TRAILER = "-----END";
+    // From https://www.rfc-editor.org/rfc/rfc7468.txt
+    public static final String RFC7468_HEADER = "-----BEGIN CERTIFICATE REQUEST-----";
+    public static final String RFC7468_TRAILER = "-----END CERTIFICATE REQUEST-----";
 
     void cleanArgs(String[] s) {
 
@@ -434,10 +437,10 @@ public class CMCEnroll {
                     return;
                 }
 
-                System.out.println(HEADER);
-                System.out.println(asciiBASE64Blob.toString() + TRAILER);
+                System.out.println(RFC7468_HEADER);
+                System.out.println(asciiBASE64Blob.toString() + RFC7468_TRAILER);
                 try {
-                    asciiBASE64Blob_str = HEADER + "\n" + asciiBASE64Blob_str.toString() + TRAILER;
+                    asciiBASE64Blob_str = RFC7468_HEADER + "\n" + asciiBASE64Blob_str.toString() + RFC7468_TRAILER;
                     outputBlob.write(asciiBASE64Blob_str.getBytes());
                 } catch (IOException e) {
                     System.out.println("CMCEnroll:  I/O error " +
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 167c46104..1f508c3c7 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -97,8 +97,8 @@ public class CMCRequest {
     public static final String PR_INTERNAL_TOKEN_NAME = "internal";
 
     public static final int ARGC = 1;
-    public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
-    public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
+    public static final String HEADER = "-----BEGIN";
+    public static final String TRAILER = "-----END";
 
     void cleanArgs(String[] s) {
 
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index 3f9d81113..45c3f07cc 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
@@ -69,8 +69,9 @@ import com.netscape.cmsutil.util.Utils;
  */
 public class CMCRevoke {
     public static final int ARGC = 8;
-    public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
-    public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
+    // From https://www.rfc-editor.org/rfc/rfc7468.txt
+    public static final String RFC7468_HEADER = "-----BEGIN CERTIFICATE REQUEST-----";
+    public static final String RFC7468_TRAILER = "-----END CERTIFICATE REQUEST-----";
     static String dValue = null, nValue = null, iValue = null, sValue = null, mValue = null, hValue = null,
             pValue = null, cValue = null;
 
@@ -224,10 +225,10 @@ public class CMCRevoke {
             return;
         }
 
-        System.out.println(HEADER);
-        System.out.println(asciiBASE64Blob + TRAILER);
+        System.out.println(RFC7468_HEADER);
+        System.out.println(asciiBASE64Blob + RFC7468_TRAILER);
         try {
-            asciiBASE64Blob = HEADER + "\n" + asciiBASE64Blob + TRAILER;
+            asciiBASE64Blob = RFC7468_HEADER + "\n" + asciiBASE64Blob + RFC7468_TRAILER;
             outputBlob.write(asciiBASE64Blob.getBytes());
         } catch (IOException e) {
             System.out.println("CMCSigning:  I/O error " +
diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index 76d8f51d1..450f950a9 100644
--- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -101,6 +101,10 @@ public class CRMFPopClient {
 
     public boolean verbose;
 
+    // From https://www.rfc-editor.org/rfc/rfc7468.txt
+    public static final String RFC7468_HEADER = "-----BEGIN CERTIFICATE REQUEST-----";
+    public static final String RFC7468_TRAILER = "-----END CERTIFICATE REQUEST-----";
+
     public static Options createOptions() {
 
         Options options = new Options();
@@ -472,9 +476,9 @@ public class CRMFPopClient {
 
             StringWriter sw = new StringWriter();
             try (PrintWriter out = new PrintWriter(sw)) {
-                out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+                out.println(RFC7468_HEADER);
                 out.println(request);
-                out.println("-----END NEW CERTIFICATE REQUEST-----");
+                out.println(RFC7468_TRAILER);
             }
             String csr = sw.toString();
 
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index d1c787efb..0a3582754 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -71,6 +71,9 @@ import com.netscape.cmsutil.util.Utils;
  * @version $Revision$, $Date$
  */
 public class PKCS10Client {
+    // From https://www.rfc-editor.org/rfc/rfc7468.txt
+    public static final String RFC7468_HEADER = "-----BEGIN CERTIFICATE REQUEST-----";
+    public static final String RFC7468_TRAILER = "-----END CERTIFICATE REQUEST-----";
 
     private static void printUsage() {
         System.out.println(
@@ -323,15 +326,15 @@ public class PKCS10Client {
                 b64E = CryptoUtil.base64Encode(certReqb);
             }
 
-            System.out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+            System.out.println(RFC7468_HEADER);
             System.out.println(b64E);
-            System.out.println("-----END NEW CERTIFICATE REQUEST-----");
+            System.out.println(RFC7468_TRAILER);
 
             PrintStream ps = null;
             ps = new PrintStream(new FileOutputStream(ofilename));
-            ps.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+            ps.println(RFC7468_HEADER);
             ps.println(b64E);
-            ps.println("-----END NEW CERTIFICATE REQUEST-----");
+            ps.println(RFC7468_TRAILER);
             ps.flush();
             ps.close();
             System.out.println("PKCS10Client: done. Request written to file: "+ ofilename);