Fixes for Coverity Defects of Category : FB.SBSC_USE_STRINGBUFFER_CONCATENATION

8 files changed, 68 insertions, 64 deletions

diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
index c8402b2ca..65e5ad9b3 100644
--- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
@@ -403,19 +403,20 @@ public class CryptoUtil {
      * formats a cert request
      */
     public static String reqFormat(String content) {
-        String result = CERTREQ_BEGIN_HEADING + "\n";
+        StringBuffer result = new StringBuffer();
+        result.append(CERTREQ_BEGIN_HEADING + System.getProperty("line.separator"));
 
         while (content.length() >= LINE_COUNT) {
-            result = result + content.substring(0, LINE_COUNT) + "\n";
+            result.append(content.substring(0, LINE_COUNT) + System.getProperty("line.separator"));
             content = content.substring(LINE_COUNT);
         }
         if (content.length() > 0) {
-            result = result + content + "\n" + CERTREQ_END_HEADING;
+            result.append(content).append(System.getProperty("line.separator") + CERTREQ_END_HEADING);
         } else {
-            result = result + CERTREQ_END_HEADING;
+            result.append(CERTREQ_END_HEADING);
         }
 
-        return result;
+        return result.toString();
     }
 
     public static String getPKCS10FromKey(String dn,
@@ -463,19 +464,20 @@ public class CryptoUtil {
         if (content == null || content.length() == 0) {
             return "";
         }
-        String result = CERT_BEGIN_HEADING + "\n";
+        StringBuffer result = new StringBuffer();
+        result.append(CERT_BEGIN_HEADING + System.getProperty("line.separator"));
 
         while (content.length() >= LINE_COUNT) {
-            result = result + content.substring(0, LINE_COUNT) + "\n";
+            result.append(content.substring(0, LINE_COUNT) + System.getProperty("line.separator"));
             content = content.substring(LINE_COUNT);
         }
         if (content.length() > 0) {
-            result = result + content + "\n" + CERT_END_HEADING;
+            result.append(content + System.getProperty("line.separator") + CERT_END_HEADING);
         } else {
-            result = result + CERT_END_HEADING;
+            result.append(CERT_END_HEADING);
         }
 
-        return result;
+        return result.toString();
     }
 
     /**
@@ -545,7 +547,7 @@ public class CryptoUtil {
     }
 
     public static String normalizeCertStr(String s) {
-        String val = "";
+        StringBuffer val = new StringBuffer();
 
         for (int i = 0; i < s.length(); i++) {
             if (s.charAt(i) == '\n') {
@@ -557,9 +559,9 @@ public class CryptoUtil {
             } else if (s.charAt(i) == ' ') {
                 continue;
             }
-            val += s.charAt(i);
+            val.append(s.charAt(i));
         }
-        return val;
+        return val.toString();
     }
 
     public static void importCertificateChain(String certchain)
diff --git a/base/util/src/com/netscape/cmsutil/util/Cert.java b/base/util/src/com/netscape/cmsutil/util/Cert.java
index 3563f70c7..7dfc18a5d 100644
--- a/base/util/src/com/netscape/cmsutil/util/Cert.java
+++ b/base/util/src/com/netscape/cmsutil/util/Cert.java
@@ -151,7 +151,7 @@ public class Cert {
     }
 
     public static String normalizeCertStr(String s) {
-        String val = "";
+        StringBuffer val = new StringBuffer();
 
         for (int i = 0; i < s.length(); i++) {
             if (s.charAt(i) == '\n') {
@@ -163,13 +163,13 @@ public class Cert {
             } else if (s.charAt(i) == ' ') {
                 continue;
             }
-            val += s.charAt(i);
+            val.append(s.charAt(i));
         }
-        return val;
+        return val.toString();
     }
 
     public static String normalizeCertStrAndReq(String s) {
-        String val = "";
+        StringBuffer val = new StringBuffer();
 
         for (int i = 0; i < s.length(); i++) {
             if (s.charAt(i) == '\n') {
@@ -179,8 +179,8 @@ public class Cert {
             } else if (s.charAt(i) == '"') {
                 continue;
             }
-            val += s.charAt(i);
+            val.append(s.charAt(i));
         }
-        return val;
+        return val.toString();
     }
 }
diff --git a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
index c3d2bec6c..15c56a04c 100644
--- a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
+++ b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
@@ -28,8 +28,6 @@ import java.security.cert.CertificateException;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import com.netscape.cmsutil.util.Utils;
-
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
@@ -38,6 +36,8 @@ import netscape.security.x509.Extension;
 import netscape.security.x509.GeneralName;
 import netscape.security.x509.URIName;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * This represents the authority information access extension
  * as defined in RFC2459.
@@ -219,16 +219,18 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet {
      * Returns a printable representation of the AuthInfoAccess.
      */
     public String toString() {
-        String s = super.toString() + "AuthInfoAccess [\n";
+        StringBuffer s = new StringBuffer();
+        String b = super.toString() + "AuthInfoAccess [\n";
+        s.append(b);
 
         for (int i = 0; i < mDesc.size(); i++) {
             AccessDescription ad = mDesc.elementAt(i);
 
-            s += "(" + i + ")";
-            s += " ";
-            s += ad.getMethod().toString() + " " + ad.getLocation().toString();
+            s.append("(" + i + ")");
+            s.append(" ");
+            s.append(ad.getMethod().toString() + " " + ad.getLocation().toString());
         }
-        return (s + "]\n");
+        return (s.toString() + "]\n");
     }
 
     public static void main(String[] argv) {
diff --git a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
index 271bd3606..0f93c2b78 100644
--- a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
+++ b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
@@ -183,15 +183,15 @@ public class CertificateScopeOfUseExtension extends Extension
      * Returns a printable representation of the CertificateRenewalWindow.
      */
     public String toString() {
-        String s = super.toString() + "CertificateUseOfScope [\n";
+        StringBuffer s = new StringBuffer(super.toString() + "CertificateUseOfScope [\n");
 
         if (mEntries != null) {
             for (int i = 0; i < mEntries.size(); i++) {
                 CertificateScopeEntry se = mEntries.elementAt(i);
 
-                s += se.toString();
+                s.append(se.toString());
             }
         }
-        return (s + "]\n");
+        return (s.toString() + "]\n");
     }
 }
diff --git a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
index b11c77634..72407d62e 100644
--- a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
+++ b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
@@ -28,8 +28,6 @@ import java.security.cert.CertificateException;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import com.netscape.cmsutil.util.Utils;
-
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
@@ -38,6 +36,8 @@ import netscape.security.x509.Extension;
 import netscape.security.x509.GeneralName;
 import netscape.security.x509.URIName;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * This represents the subject information access extension
  * as defined in RFC3280.
@@ -201,16 +201,15 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet
      * Returns a printable representation of the AuthInfoAccess.
      */
     public String toString() {
-        String s = super.toString() + "AuthInfoAccess [\n";
+        StringBuffer s=new StringBuffer(super.toString() + "AuthInfoAccess [\n");
 
         for (int i = 0; i < mDesc.size(); i++) {
             AccessDescription ad = mDesc.elementAt(i);
-
-            s += "(" + i + ")";
-            s += " ";
-            s += ad.getMethod().toString() + " " + ad.getLocation().toString();
+            s.append( "(" + i + ")");
+            s.append(" ");
+            s.append(ad.getMethod().toString() + " " + ad.getLocation().toString());
         }
-        return (s + "]\n");
+        return (s.toString() + "]\n");
     }
 
     public static void main(String[] argv) {
diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
index 8bd514099..b53918233 100644
--- a/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -425,22 +425,23 @@ public class PKCS7 {
      * Returns the PKCS7 block in a printable string form.
      */
     public String toString() {
-        String out = "";
+        StringBuffer out=new StringBuffer();
 
-        out += "PKCS7 :: version: " + version + "\n";
-        out += "PKCS7 :: digest AlgorithmIds: \n";
+
+        out.append("PKCS7 :: version: " + version+System.getProperty("line.separator"));
+        out.append("PKCS7 :: digest AlgorithmIds: "+System.getProperty("line.separator"));
         for (int i = 0; i < digestAlgorithmIds.length; i++) {
-            out += "\t" + digestAlgorithmIds[i] + "\n";
+            out.append("\t" + digestAlgorithmIds[i]+System.getProperty("line.separator"));
         }
-        out += contentInfo + "\n";
-        out += "PKCS7 :: certificates: \n";
+        out.append(contentInfo).append(System.getProperty("line.separator"));
+        out.append("PKCS7 :: certificates: "+System.getProperty("line.separator"));
         for (int i = 0; i < certificates.length; i++) {
-            out += "\t" + i + ".   " + certificates[i] + "\n";
+            out.append("\t" + i + ".   " + certificates[i]+System.getProperty("line.separator"));
         }
-        out += "PKCS7 :: signer infos: \n";
+        out.append("PKCS7 :: signer infos: "+System.getProperty("line.separator"));
         for (int i = 0; i < signerInfos.length; i++) {
-            out += ("\t" + i + ".  " + signerInfos[i] + "\n");
+            out.append("\t" + i + ".  " + signerInfos[i]+System.getProperty("line.separator"));
         }
-        return out;
+        return out.toString();
     }
 }
diff --git a/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
index 6e2f953e4..a72f0d4fb 100644
--- a/base/util/src/netscape/security/util/CertPrettyPrint.java
+++ b/base/util/src/netscape/security/util/CertPrettyPrint.java
@@ -96,7 +96,7 @@ public class CertPrettyPrint {
     }
 
     public String pkcs7toString(Locale clientLocale) {
-        String content = "";
+        StringBuffer content=new StringBuffer();
 
         try {
             mX509Cert = new X509CertImpl(mCert_b);
@@ -134,15 +134,15 @@ public class CertPrettyPrint {
                     }
 
                     CertPrettyPrint print = new CertPrettyPrint(certImpl);
-                    content += print.toString(Locale.getDefault());
-                    content += "\n";
+                    content.append(print.toString(Locale.getDefault()));
+                    content.append("\n");
                 }
 
-                return content;
+                return content.toString();
             }
         }
 
-        return content;
+        return content.toString();
     }
 
     public String stripCertBrackets(String s) {
@@ -165,7 +165,7 @@ public class CertPrettyPrint {
     }
 
     public String normalizeCertStr(String s) {
-        String val = "";
+        StringBuffer val = new StringBuffer();
 
         for (int i = 0; i < s.length(); i++) {
             if (s.charAt(i) == '\n') {
@@ -177,9 +177,9 @@ public class CertPrettyPrint {
             } else if (s.charAt(i) == ' ') {
                 continue;
             }
-            val += s.charAt(i);
+            val.append(s.charAt(i));
         }
-        return val;
+        return val.toString();
     }
 
     public String X509toString(Locale clientLocale) {
@@ -323,18 +323,18 @@ public class CertPrettyPrint {
 
             // fingerprints
             String[] hashes = new String[] { "MD2", "MD5", "SHA1", "SHA256", "SHA512" };
-            String certFingerprints = "";
+            StringBuffer certFingerprints = new StringBuffer();
 
             sb.append(pp.indent(8) + "FingerPrint\n");
             for (int i = 0; i < hashes.length; i++) {
                 MessageDigest md = MessageDigest.getInstance(hashes[i]);
 
                 md.update(mX509Cert.getEncoded());
-                certFingerprints += pp.indent(12) + hashes[i] + ":\n" +
-                        pp.toHexString(md.digest(), 16, 16);
+                certFingerprints.append(pp.indent(12) + hashes[i] + ":\n" +
+                        pp.toHexString(md.digest(), 16, 16));
             }
 
-            sb.append(certFingerprints);
+            sb.append(certFingerprints.toString());
         } catch (Exception e) {
         }
 
diff --git a/base/util/src/netscape/security/util/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java
index 67846ec55..99de73e0d 100644
--- a/base/util/src/netscape/security/util/ObjectIdentifier.java
+++ b/base/util/src/netscape/security/util/ObjectIdentifier.java
@@ -413,14 +413,14 @@ final public class ObjectIdentifier implements Serializable {
 
     public static ObjectIdentifier getObjectIdentifier(int values[])
             throws IOException {
-        String retval;
+        StringBuffer retval = new StringBuffer();
         int i;
 
-        for (i = 0, retval = ""; i < values.length; i++) {
+        for (i = 0; i < values.length; i++) {
             if (i != 0)
-                retval += ".";
-            retval += values[i];
+                retval.append(".");
+            retval.append(values[i]);
         }
-        return getObjectIdentifier(retval);
+        return getObjectIdentifier(retval.toString());
     }
 }