diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-13 15:11:56 -0600 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-20 14:56:55 -0600 |
commit | 26f168f38aa13ed6f5d1be09ab8fbe828f631757 (patch) | |
tree | bb3ce31a7d65ac17d0132488f1c34714df8e2dda /pki/base/java-tools/src | |
parent | 046cd4e89b9a0deb3ce1bb26833bd86567fe0b4b (diff) | |
download | pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.tar.gz pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.tar.xz pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.zip |
Removed unused variables (part 1).
This patch brings down the warnings from 2917 to 2406.
Ticket #103
Diffstat (limited to 'pki/base/java-tools/src')
9 files changed, 5 insertions, 39 deletions
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java index 435567710..8a8854f8f 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java @@ -153,7 +153,7 @@ public class AuditVerify { } // get list of log files - Vector logFiles = new Vector(); + Vector<String> logFiles = new Vector<String>(); BufferedReader r = new BufferedReader(new FileReader(logListFile)); String listLine; while ((listLine = r.readLine()) != null) { @@ -231,8 +231,6 @@ public class AuditVerify { String sigStopFile = null; int signedLines = 1; - boolean lastLineWasSig = false; - for (int curfile = 0; curfile < logFiles.size(); ++curfile) { String curfileName = (String) logFiles.elementAt(curfile); BufferedReader br = new BufferedReader(new FileReader(curfileName)); diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index 18bfb51fc..d739fbcff 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -45,7 +45,6 @@ import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.DigestAlgorithm; import org.mozilla.jss.crypto.ObjectNotFoundException; @@ -154,8 +153,6 @@ public class CMCEnroll { throw new IOException("Internal Error - " + e.toString()); } - String hasSki = "true"; - BigInteger serialno = signerCert.getSerialNumber(); byte[] certB = signerCert.getEncoded(); X509CertImpl impl = new X509CertImpl(certB); @@ -374,8 +371,6 @@ public class CMCEnroll { Password pass = new Password(pValue.toCharArray()); token.login(pass); - CryptoStore store = token.getCryptoStore(); - X509Certificate[] list = store.getCertificates(); X509Certificate signerCert = null; signerCert = cm.findCertByNickname(nValue); @@ -425,9 +420,10 @@ public class CMCEnroll { asciiBASE64Blob = getCMCBlob(signerCert, cm, nValue, asciiBASE64Blob); // (5) Decode the ASCII BASE 64 blob enclosed in the // String() object into a BINARY BASE 64 byte[] object - byte binaryBASE64Blob[] = null; - binaryBASE64Blob = com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob); + @SuppressWarnings("unused") + byte binaryBASE64Blob[] = + com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob); // check for errors // (6) Finally, print the actual CMCEnroll blob to the // specified output file diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index 197f29e15..a4368736c 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -52,7 +52,6 @@ import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.SET; import org.mozilla.jss.asn1.UTF8String; -import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.DigestAlgorithm; import org.mozilla.jss.crypto.ObjectNotFoundException; @@ -198,7 +197,6 @@ public class CMCRequest { System.out.println("This is not a crmf request. Or this request has an error."); System.exit(1); } - int nummsgs = crmfMsgs.size(); certReqMsg = (CertReqMsg) crmfMsgs.elementAt(0); trq = new TaggedRequest(TaggedRequest.CRMF, null, certReqMsg); @@ -798,7 +796,6 @@ public class CMCRequest { String numRequests = null; String dbdir = null, nickname = null; String ifilename = null, ofilename = null, password = null, format = null; - FileOutputStream outputBlob = null; String confirmCertEnable = "false", confirmCertIssuer = null, confirmCertSerial = null; String getCertEnable = "false", getCertIssuer = null, getCertSerial = null; String dataReturnEnable = "false", dataReturnData = null; @@ -989,8 +986,6 @@ public class CMCRequest { Password pass = new Password(password.toCharArray()); token.login(pass); - CryptoStore store = token.getCryptoStore(); - X509Certificate[] list = store.getCertificates(); X509Certificate signerCert = null; signerCert = cm.findCertByNickname(nickname); diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java index 3be8167a1..57be364d7 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java @@ -41,7 +41,6 @@ import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.SET; import org.mozilla.jss.asn1.UTF8String; -import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.DigestAlgorithm; import org.mozilla.jss.crypto.ObjectNotFoundException; @@ -94,8 +93,6 @@ public class CMCRevoke { */ public static void main(String[] s) { - FileOutputStream outputBlob = null; - // default path is "." String mPath = "."; // default prefix is "" @@ -182,8 +179,6 @@ public class CMCRevoke { Password pass = new Password(hValue.toCharArray()); token.login(pass); - CryptoStore store = token.getCryptoStore(); - X509Certificate[] list = store.getCertificates(); X509Certificate signerCert = null; signerCert = cm.findCertByNickname(nValue); @@ -290,8 +285,6 @@ public class CMCRevoke { try { - String hasSki = "true"; - BigInteger serialno = signerCert.getSerialNumber(); byte[] certB = signerCert.getEncoded(); X509CertImpl impl = new X509CertImpl(certB); diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 73c56ffea..c45148f79 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -192,7 +192,6 @@ public class CRMFPopClient { } public static void main(String args[]) { - String USER_PREFIX = "user"; int argsLen = getRealArgsLength(args); @@ -261,8 +260,6 @@ public class CRMFPopClient { URLConnection conn = null; InputStream is = null; BufferedReader reader = null; - boolean success = false; - int num = 1; long total_time = 0; KeyPair pair = null; @@ -515,7 +512,6 @@ public class CRMFPopClient { while ((line = reader.readLine()) != null) { System.out.println(line); if (line.equals("CMS Enroll Request Success")) { - success = true; System.out.println("Enrollment Successful: ......"); System.out.println(""); } diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java index 3b0e8b1ff..c3a91dcd7 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -2448,7 +2448,6 @@ public class DRMTool { */ private static String output_dn(String record_type, String line) { - String data = null; String embedded_cn_data[] = null; String embedded_cn_output = null; String input = null; @@ -3955,7 +3954,6 @@ public class DRMTool { */ private static String output_extdata_auth_token_user(String record_type, String line) { - String data = null; String output = null; try { @@ -4003,7 +4001,6 @@ public class DRMTool { */ private static String output_extdata_auth_token_user_dn(String record_type, String line) { - String data = null; String output = null; try { @@ -4310,7 +4307,6 @@ public class DRMTool { * @return true if the DRMTOOL config file is successfully processed */ private static boolean process_drmtool_config_file() { - boolean success = false; BufferedReader reader = null; String line = null; String name_value_pair[] = null; diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java index e9877fd8d..8be0b98dd 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java @@ -272,7 +272,7 @@ public class PKCS12Export { if (prikey == null) { debug("Private key is null"); - byte[] localKeyId = addCertBag(certs[i], null, safeContents); + addCertBag(certs[i], null, safeContents); } else { debug("Private key is not null"); byte localKeyId[] = diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java index e4d8106f7..abb09db62 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java @@ -150,8 +150,6 @@ public class PasswordCache { String mPrefix = ""; String mKeyIdString = null; byte[] mKeyId = null; - String mCertDB = CERTDB; - String mKeyDB = KEYDB; String mCacheFile = "pwcache.db"; String pwdPath = null; @@ -197,7 +195,6 @@ public class PasswordCache { String keyFile = argv[i]; try { BufferedReader r = new BufferedReader(new FileReader(keyFile)); - String listLine; mKeyIdString = r.readLine(); } catch (Exception e) { System.out.println("Error: " + e.toString()); @@ -793,8 +790,6 @@ class PWsdrCache { Process process = Runtime.getRuntime().exec(cmds); process.waitFor(); - BufferedReader pOut = null; - String l = null; if (process.exitValue() == 0) { diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java index 9d9142927..ddbd95c8d 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java @@ -25,7 +25,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.security.cert.CertificateException; -import java.util.Enumeration; import java.util.Locale; import netscape.security.util.CertPrettyPrint; @@ -190,8 +189,6 @@ public class PrettyPrintCert { CertificateSubjectName csn = (CertificateSubjectName) certinfo.get(X509CertInfo.SUBJECT); - Enumeration<String> en = csn.getAttributeNames(); - X500Name dname = (X500Name) csn.get(CertificateSubjectName.DN_NAME); pp = ""; |