From a4db0f39e257950a5c89203452c1184c7080e5bd Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Fri, 18 May 2012 13:17:34 -0400 Subject: Fixes for Coverity Defects of Category : FB.DM_NUMBER_CTOR, FB.DM_STRING_CTOR, FB.DM_STRING_VOID_CTOR --- base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 2 +- .../netscape/cmscore/base/SimpleProperties.java | 3 ++- .../cmscore/notification/EmailTemplate.java | 3 ++- .../src/com/netscape/cmscore/security/PWUtil.java | 2 +- .../com/netscape/cmscore/request/RequestTest.java | 6 +++--- .../java-tools/src/com/netscape/cmstools/AtoB.java | 4 ++-- .../src/com/netscape/cmstools/CMCEnroll.java | 4 ++-- .../src/com/netscape/cmstools/CMCRequest.java | 4 ++-- .../src/com/netscape/cmstools/CMCRevoke.java | 6 +++--- .../src/com/netscape/cmstools/DRMTool.java | 4 ++-- .../src/com/netscape/cmstools/PrettyPrintCert.java | 10 ++++----- .../src/com/netscape/cmstools/PrettyPrintCrl.java | 10 ++++----- .../netscape/pkisilent/argparser/ArgParser.java | 2 +- .../netscape/pkisilent/common/CMSProperties.java | 4 ++-- .../com/netscape/pkisilent/common/TestClient.java | 24 ++++++---------------- .../com/netscape/cmsutil/scep/CRSPKIMessage.java | 6 +++--- .../extensions/ExtendedKeyUsageExtension.java | 8 ++++---- .../extensions/InhibitAnyPolicyExtension.java | 2 +- .../security/extensions/OCSPNoCheckExtension.java | 9 ++++---- 19 files changed, 51 insertions(+), 62 deletions(-) diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index f93e6e31b..aaeea2636 100644 --- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -591,7 +591,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { return null; } else { if (t > t0) { - listedTimes.addElement(new Integer(k * t)); + listedTimes.addElement(Integer.valueOf(k * t)); t0 = t; } else { return null; diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index fb399e0c6..527b4f694 100644 --- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -191,7 +191,8 @@ public class SimpleProperties extends Hashtable { if (whiteSpaceChars.indexOf(nextLine.charAt(startIndex)) == -1) break; nextLine = nextLine.substring(startIndex, nextLine.length()); - line = new String(loppedLine + nextLine); + + line = loppedLine + nextLine; } // Find start of key int len = line.length(); diff --git a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java index bd56ec608..86c232630 100644 --- a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java +++ b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java @@ -43,7 +43,7 @@ public class EmailTemplate implements IEmailTemplate { *==========================================================*/ /* private variables */ - private String mTemplateFile = new String(); + private String mTemplateFile = ""; private ILogger mLogger = CMS.getLogger(); /* public vaiables */ @@ -59,6 +59,7 @@ public class EmailTemplate implements IEmailTemplate { * @param templateFile File name of the template including the full path and * file extension */ + public EmailTemplate(String templatePath) { mTemplateFile = templatePath; } diff --git a/base/common/src/com/netscape/cmscore/security/PWUtil.java b/base/common/src/com/netscape/cmscore/security/PWUtil.java index 3938bf5d2..fa0de3c4b 100644 --- a/base/common/src/com/netscape/cmscore/security/PWUtil.java +++ b/base/common/src/com/netscape/cmscore/security/PWUtil.java @@ -26,7 +26,7 @@ public class PWUtil { throws PasswordCallback.GiveUpException { StringBuffer buf = new StringBuffer(); - String passwordString = new String(); + String passwordString = ""; int c; try { diff --git a/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java index 32c244033..0e98ab084 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -239,9 +239,9 @@ public class RequestTest extends CMSBaseTestCase { public void testGetSetExtDataIntegerArray() { Integer[] data = new Integer[] { - new Integer(5), - new Integer(23), - new Integer(12) + Integer.valueOf(5), + Integer.valueOf(23), + Integer.valueOf(12) }; assertTrue(request.setExtData("topkey1", data)); Integer[] retval = request.getExtDataInIntegerArray("topkey1"); diff --git a/base/java-tools/src/com/netscape/cmstools/AtoB.java b/base/java-tools/src/com/netscape/cmstools/AtoB.java index fe743fc5c..e3059b0d1 100644 --- a/base/java-tools/src/com/netscape/cmstools/AtoB.java +++ b/base/java-tools/src/com/netscape/cmstools/AtoB.java @@ -60,8 +60,8 @@ public class AtoB { public static void main(String argv[]) { BufferedReader inputBlob = null; - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; byte binaryBASE64Blob[] = null; FileOutputStream outputBlob = null; diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index bed5d8334..ba8d71f3d 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -393,8 +393,8 @@ public class CMCEnroll { // blob into a String() object throwing away any // headers beginning with HEADER and any trailers beginning // with TRAILER - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; try { while ((asciiBASE64BlobChunk = inputBlob.readLine()) != null) { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index f2205ed5c..e46b746aa 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -1005,8 +1005,8 @@ public class CMCRequest { // blob into a String() object throwing away any // headers beginning with HEADER and any trailers beginning // with TRAILER - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; try { while ((asciiBASE64BlobChunk = inputBlob.readLine()) != null) { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java index 8dffa13e3..d76e93a52 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java @@ -82,7 +82,7 @@ public class CMCRevoke { if (s.startsWith("\"") && s.endsWith("\"")) return s.substring(1, s.length() - 2); else if (s.startsWith("\'") && s.endsWith("\'")) - return new String(s.substring(1, s.length() - 2)); + return s.substring(1, s.length() - 2); else return s; } @@ -140,7 +140,7 @@ public class CMCRevoke { } // optional parameter if (cValue == null) - cValue = new String(); + cValue = ""; if (dValue == null || nValue == null || iValue == null || sValue == null || mValue == null || hValue == null) bWrongParam = true; @@ -280,7 +280,7 @@ public class CMCRevoke { SignerIdentifier si = null; ContentInfo fullEnrollmentReq = null; String tokenname = "internal"; - String asciiBASE64Blob = new String(); + String asciiBASE64Blob = ""; try { diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java index c6b2c575f..f67d735e6 100644 --- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -1445,8 +1445,8 @@ public class DRMTool { */ private static PublicKey getPublicKey() { BufferedReader inputCert = null; - String encodedBASE64CertChunk = new String(); - String encodedBASE64Cert = new String(); + String encodedBASE64CertChunk = ""; + String encodedBASE64Cert = ""; byte decodedBASE64Cert[] = null; X509CertImpl cert = null; PublicKey key = null; diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java index 88d8cb05b..fdb988dd5 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java @@ -27,8 +27,6 @@ import java.io.InputStreamReader; import java.security.cert.CertificateException; import java.util.Locale; -import com.netscape.cmsutil.util.Utils; - import netscape.security.util.CertPrettyPrint; import netscape.security.x509.CertificateSubjectName; import netscape.security.x509.RDN; @@ -36,6 +34,8 @@ import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509CertInfo; +import com.netscape.cmsutil.util.Utils; + /** * The PrettyPrintCert class is a utility program designed to "pretty print" * a certificate. It assumes that the name of a data file is passed to the @@ -79,13 +79,13 @@ public class PrettyPrintCert { public static void main(String argv[]) { BufferedReader inputCert = null; - String encodedBASE64CertChunk = new String(); - String encodedBASE64Cert = new String(); + String encodedBASE64CertChunk = ""; + String encodedBASE64Cert = ""; byte decodedBASE64Cert[] = null; X509CertImpl cert = null; Locale aLocale = null; CertPrettyPrint certDetails = null; - String pp = new String(); + String pp = ""; FileOutputStream outputCert = null; boolean mSimpleInfo = false; String inputfile = null; diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java index 6bb43aee7..8bd4f9ed5 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java @@ -28,8 +28,6 @@ import java.security.cert.CRLException; import java.security.cert.CertificateException; import java.util.Locale; -import com.netscape.cmsutil.util.Utils; - import netscape.security.util.CrlPrettyPrint; import netscape.security.x509.DeltaCRLIndicatorExtension; import netscape.security.x509.HoldInstructionExtension; @@ -39,6 +37,8 @@ import netscape.security.x509.OIDMap; import netscape.security.x509.X509CRLImpl; import netscape.security.x509.X509ExtensionException; +import com.netscape.cmsutil.util.Utils; + /** * The PrettyPrintCrl class is a utility program designed to "pretty print" * a CRL. It assumes that the name of a data file is passed to the @@ -72,13 +72,13 @@ public class PrettyPrintCrl { public static void main(String argv[]) { BufferedReader inputCrl = null; - String encodedBASE64CrlChunk = new String(); - String encodedBASE64Crl = new String(); + String encodedBASE64CrlChunk = ""; + String encodedBASE64Crl = ""; byte decodedBASE64Crl[] = null; X509CRLImpl crl = null; Locale aLocale = null; CrlPrettyPrint CrlDetails = null; - String pp = new String(); + String pp = ""; FileOutputStream outputCrl = null; // (1) Check that at least one argument was submitted to the program diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java index d2791c1e2..29c1c394d 100755 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java @@ -1877,7 +1877,7 @@ public class ArgParser { ObjectHolder ndescHolder = new ObjectHolder(); Record rec = getRecord(args[idx], ndescHolder); if (rec == null || (rec.convertCode == 'h' && !helpOptionsEnabled)) { // didn't match - unmatchedArg = new String(args[idx]); + unmatchedArg = args[idx]; return idx + 1; } NameDesc ndesc = (NameDesc) ndescHolder.value; diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java index 241d13f06..16f18500c 100644 --- a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java +++ b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java @@ -215,7 +215,7 @@ class CMSProperties extends Hashtable { String nextLine = in.readLine(); if (nextLine == null) { - nextLine = new String(""); + nextLine = ""; } String loppedLine = line.substring(0, line.length() - 1); // Advance beyond whitespace on new line @@ -229,7 +229,7 @@ class CMSProperties extends Hashtable { } nextLine = nextLine.substring(startIndex, nextLine.length()); - line = new String(loppedLine + nextLine); + line = loppedLine + nextLine; } // Find start of key diff --git a/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java index f3d96085d..22275ede5 100644 --- a/base/silent/src/com/netscape/pkisilent/common/TestClient.java +++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java @@ -452,16 +452,6 @@ public class TestClient implements SSLCertificateApprovalCallback { } - /** - * returns a String representation of an interger - */ - public String getString(int m) { - Integer x = new Integer(m); - String s = x.toString(); - - return s; - } - /** * returns FreePort in this machine . Takes a parmater portnumber. For example getFreePort("4026"). */ @@ -477,21 +467,19 @@ public class TestClient implements SSLCertificateApprovalCallback { p = ss1.getLocalPort(); System.out.println("Obtained Free Port = " + p); ss1.close(); - return (getString(p)); } catch (Exception e) { System.out.println("Unable to get Free Port"); e.printStackTrace(); p = 0; - return (getString(p)); } - + return (String.valueOf(p)); // This following method doesn't Always get a free port. // while (st) { // if(isSocketUnused(host,p) ) // st=false; // p++; // } - // return (getString(p)); + // return (String.valueOf(p)); } @@ -708,7 +696,7 @@ public class TestClient implements SSLCertificateApprovalCallback { {System.out.println("CRMFClient : could not submit request");} - checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(CrmfClient.getRequestId()),"false"); + checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),String.valueOf(CrmfClient.getRequestId()),"false"); cr.checkRequestStatus(); System.out.println("Serial num " + cr.getSerialNumber()); System.out.println("cert pack " + cr.getCert()); @@ -861,7 +849,7 @@ public class TestClient implements SSLCertificateApprovalCallback { Request re = new Request (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority()); re.setAgentCertName(t.GetAdminCertName()); re.ListPendingRequests("2","70"); - re.ApproveRequests(t.getString(ue.getRequestId())); + re.ApproveRequests(String.valueOf(ue.getRequestId())); */ /* @@ -872,7 +860,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* // check request status and Revoke cert - checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(ue.getRequestId()),"false"); + checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),String.valueOf(ue.getRequestId()),"false"); checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),"1","false"); cr.checkRequestStatus(); @@ -893,7 +881,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* /* - Revoke rr = new Revoke (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority(),t.getString(cr.getSerialNumber())); + Revoke rr = new Revoke (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority(),String.valueOf(cr.getSerialNumber())); rr.revokeCerts(); */ diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index 834e21088..de6cb20aa 100644 --- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -855,10 +855,10 @@ public class CRSPKIMessage { } else if (oid.equals(CRS_PKISTATUS)) { ps = (PrintableString) pst.decode(new ByteArrayInputStream(f.getEncoded())); - pkiStatus = new String(ps.toString()); + pkiStatus = ps.toString(); } else if (oid.equals(CRS_FAILINFO)) { ps = (PrintableString) pst.decode(new ByteArrayInputStream(f.getEncoded())); - failInfo = new String(ps.toString()); + failInfo = ps.toString(); } else if (oid.equals(CRS_SENDERNONCE)) { OCTET_STRING oss = (OCTET_STRING) ost.decode(new ByteArrayInputStream(f.getEncoded())); @@ -869,7 +869,7 @@ public class CRSPKIMessage { recipientNonce = osr.toByteArray(); } else if (oid.equals(CRS_TRANSID)) { ps = (PrintableString) pst.decode(new ByteArrayInputStream(f.getEncoded())); - transactionID = new String(ps.toString()); + transactionID = ps.toString(); } } diff --git a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java index 072a7c974..7c9f8450d 100644 --- a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -132,18 +132,18 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet } public String toString() { + String presentation = "oid=" + ExtendedKeyUsageExtension.OID + " "; if (critical) { presentation += "critical=true"; } if (extensionValue != null) { - String extByteValue = new String(" val="); - + StringBuffer extByteValue = new StringBuffer(" val="); for (int i = 0; i < extensionValue.length; i++) { - extByteValue += (extensionValue[i] + " "); + extByteValue.append(extensionValue[i] + " "); } - presentation += extByteValue; + presentation += extByteValue.toString(); } return presentation; } diff --git a/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java index 5295cf6a1..181360f52 100644 --- a/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -110,7 +110,7 @@ public class InhibitAnyPolicyExtension presentation += "Criticality=false"; } if (extensionValue != null) { - String extByteValue = new String(" skipCerts=" + mSkipCerts); + String extByteValue = " skipCerts=" + mSkipCerts; presentation += extByteValue; } diff --git a/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index bd6cf5aa7..323cfbdbe 100644 --- a/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -96,18 +96,17 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet { } public String toString() { - String presentation = "oid=" + OID + " "; + String presentation = "oid=" + ExtendedKeyUsageExtension.OID + " "; if (critical) { presentation += "critical=true"; } if (extensionValue != null) { - String extByteValue = new String(" val="); - + StringBuffer extByteValue = new StringBuffer(" val="); for (int i = 0; i < extensionValue.length; i++) { - extByteValue += (extensionValue[i] + " "); + extByteValue.append(extensionValue[i] + " "); } - presentation += extByteValue; + presentation += extByteValue.toString(); } return presentation; } -- cgit