Refactored additional line concatenation.

The code that concatenates lines has been simplified using
String.replace().

Change-Id: Id376f089cb9b8a78cfd9b3fb922e9cd9055c0e74

4 files changed, 16 insertions, 44 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 229c3779a..e5a1474a0 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -105,7 +105,6 @@ public final class CMSAdminServlet extends AdminServlet {
     private final static String PROP_INTERNAL_DB = "internaldb";
 
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
 
     // CMS must be instantiated before this admin servlet.
 
@@ -3390,7 +3389,6 @@ public final class CMSAdminServlet extends AdminServlet {
         rawData = object.getPublic().getEncoded();
 
         String key = null;
-        StringBuffer sb = new StringBuffer();
 
         // convert "rawData" into "base64Data"
         if (rawData != null) {
@@ -3398,14 +3396,9 @@ public final class CMSAdminServlet extends AdminServlet {
 
             base64Data = Utils.base64encode(rawData).trim();
 
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    sb.append(base64Data.substring(i, i));
-                }
-            }
+            // concatenate lines
+            key = base64Data.replace("\r", "").replace("\n", "");
         }
-        key = sb.toString();
 
         if (key != null) {
             key = key.trim();
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 375796782..6f01d2aa4 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -35,14 +35,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.dogtagpki.legacy.policy.IPolicyProcessor;
 
-import netscape.security.pkcs.PKCS10;
-import netscape.security.x509.AlgorithmId;
-import netscape.security.x509.CertificateAlgorithmId;
-import netscape.security.x509.CertificateX509Key;
-import netscape.security.x509.X509CertImpl;
-import netscape.security.x509.X509CertInfo;
-import netscape.security.x509.X509Key;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.authentication.AuthToken;
 import com.netscape.certsrv.authentication.IAuthSubsystem;
@@ -78,6 +70,14 @@ import com.netscape.cms.servlet.processors.PKCS10Processor;
 import com.netscape.cms.servlet.processors.PKIProcessor;
 import com.netscape.cmsutil.util.Utils;
 
+import netscape.security.pkcs.PKCS10;
+import netscape.security.x509.AlgorithmId;
+import netscape.security.x509.CertificateAlgorithmId;
+import netscape.security.x509.CertificateX509Key;
+import netscape.security.x509.X509CertImpl;
+import netscape.security.x509.X509CertInfo;
+import netscape.security.x509.X509Key;
+
 /**
  * Submit a Certificate Enrollment request
  *
@@ -138,7 +138,6 @@ public class EnrollServlet extends CMSServlet {
             "racertbasedenrollment";
     private final static String EE_RA_ENROLLMENT_SERVLET =
             "raenrollment";
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
     private final static String[] SIGNED_AUDIT_AUTOMATED_REJECTION_REASON = new String[] {
 
     /* 0 */"automated non-profile cert request rejection:  "
@@ -1732,14 +1731,8 @@ public class EnrollServlet extends CMSServlet {
 
             base64Data = Utils.base64encode(rawData).trim();
 
-            StringBuffer sb = new StringBuffer();
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    sb.append(base64Data.substring(i, i));
-                }
-            }
-            cert = sb.toString();
+            // concatenate lines
+            cert = base64Data.replace("\r", "").replace("\n", "");
         }
 
         if (cert != null) {
diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index 13c732b2f..9c75cc14a 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -98,7 +98,6 @@ public class ConnectorServlet extends CMSServlet {
 
     protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
     private final static String SIGNED_AUDIT_PROTECTION_METHOD_SSL = "ssl";
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
 
     public ConnectorServlet() {
     }
@@ -1101,14 +1100,8 @@ public class ConnectorServlet extends CMSServlet {
 
             base64Data = Utils.base64encode(rawData).trim();
 
-            StringBuffer sb = new StringBuffer();
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    sb.append(base64Data.substring(i, i));
-                }
-            }
-            cert = sb.toString();
+            // concatenate lines
+            cert = base64Data.replace("\r", "").replace("\n", "");
         }
 
         if (cert != null) {
diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index d15774e29..9d0da4804 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
@@ -118,7 +118,6 @@ public class ProcessCertReq extends CMSServlet {
     private final static String SIGNED_AUDIT_CANCELLATION = "cancel";
     private final static String SIGNED_AUDIT_CLONING = "clone";
     private final static String SIGNED_AUDIT_REJECTION = "reject";
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
     private final static String[] SIGNED_AUDIT_MANUAL_CANCELLATION_REASON = new String[] {
 
     /* 0 */"manual non-profile cert request cancellation:  "
@@ -1840,14 +1839,8 @@ public class ProcessCertReq extends CMSServlet {
 
             base64Data = Utils.base64encode(rawData).trim();
 
-            // extract all line separators from the "base64Data"
-            StringBuffer sb = new StringBuffer();
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    sb.append(base64Data.substring(i, i));
-                }
-            }
-            cert = sb.toString();
+            // concatenate lines
+            cert = base64Data.replace("\r", "").replace("\n", "");
         }
 
         if (cert != null) {