diff options
author | Ade Lee <alee@redhat.com> | 2013-03-07 11:18:55 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-03-07 17:29:09 -0500 |
commit | 4600fe0e9b7a398146a409328037f2cb26fd1330 (patch) | |
tree | 8668e7d7638b9e432ba0346359f370ad8cb79c6e /base/java-tools/src/com/netscape | |
parent | 081527ad210845a62efdb0bf3de11bb2321043c4 (diff) | |
download | pki-4600fe0e9b7a398146a409328037f2cb26fd1330.tar.gz pki-4600fe0e9b7a398146a409328037f2cb26fd1330.tar.xz pki-4600fe0e9b7a398146a409328037f2cb26fd1330.zip |
Clean up various eclipse warnings
Diffstat (limited to 'base/java-tools/src/com/netscape')
3 files changed, 55 insertions, 72 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index c2382d671..fd3b2a29d 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -30,7 +30,6 @@ import java.io.PrintStream; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.security.SignatureException; import java.util.Date; import java.util.StringTokenizer; @@ -52,7 +51,6 @@ import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.SET; import org.mozilla.jss.asn1.UTF8String; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.DigestAlgorithm; import org.mozilla.jss.crypto.ObjectNotFoundException; import org.mozilla.jss.crypto.SignatureAlgorithm; @@ -1040,8 +1038,6 @@ public class CMCRequest { System.exit(1); } - CryptoStore store = token.getCryptoStore(); - X509Certificate[] list = store.getCertificates(); X509Certificate signerCert = null; StringBuffer certname = new StringBuffer(); diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 204d234c0..79c8a7489 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -19,8 +19,8 @@ package com.netscape.cmstools; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; -import java.io.FileReader; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -50,7 +50,6 @@ import org.mozilla.jss.crypto.KeyGenAlgorithm; import org.mozilla.jss.crypto.KeyGenerator; import org.mozilla.jss.crypto.KeyPairAlgorithm; import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.crypto.KeyPairGeneratorSpi.Usage.*; import org.mozilla.jss.crypto.KeyWrapAlgorithm; import org.mozilla.jss.crypto.KeyWrapper; import org.mozilla.jss.crypto.Signature; @@ -71,10 +70,9 @@ import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; -import com.netscape.cmsutil.util.HMACDigest; -import com.netscape.cmsutil.util.Utils; -import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.certsrv.apps.CMS; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.util.HMACDigest; /** * A command-line utility used to generate a Certificate Request Message @@ -167,13 +165,12 @@ public class CRMFPopClient { int ec_extractable = -1; /* -1, 0, or 1 */ boolean ec_ssl_ecdh = false; - int PORT = 0; String USER_NAME = null; String REQUESTOR_NAME = null; String PROFILE_NAME = null; - + // format: "host:port" - String HOST_PORT = null; + String HOST_PORT = null; String SUBJ_DN = null; int doServerHit = 0; @@ -213,7 +210,7 @@ public class CRMFPopClient { } else if (name.equals("-s")) { String ec_sensitive_s = args[i+1]; ec_sensitive = Integer.parseInt(ec_sensitive_s); - if ((ec_sensitive != 0) && + if ((ec_sensitive != 0) && (ec_sensitive != 1) && (ec_sensitive != -1)) { System.out.println("PKCS10Client: Illegal input parameters for -s."); @@ -223,7 +220,7 @@ public class CRMFPopClient { } else if (name.equals("-e")) { String ec_extractable_s = args[i+1]; ec_extractable = Integer.parseInt(ec_extractable_s); - if ((ec_extractable != 0) && + if ((ec_extractable != 0) && (ec_extractable != 1) && (ec_extractable != -1)) { System.out.println("PKCS10Client: Illegal input parameters for -e."); @@ -248,7 +245,7 @@ public class CRMFPopClient { } else if (name.equals("-q")) { POP_OPTION = args[i+1]; if (!POP_OPTION.equals("POP_SUCCESS") && - !POP_OPTION.equals("POP_FAIL") && + !POP_OPTION.equals("POP_FAIL") && !POP_OPTION.equals("POP_NONE")) { System.out.println("CRMFPopClient: ERROR: invalid POP option: "+ POP_OPTION); System.exit(1); @@ -270,7 +267,6 @@ public class CRMFPopClient { InputStream is = null; BufferedReader reader = null; boolean success = false; - int num = 1; long total_time = 0; KeyPair pair = null; @@ -295,18 +291,18 @@ public class CRMFPopClient { } } - try { + try { CryptoManager.initialize( DB_DIR ); } catch (AlreadyInitializedException ae) { - // it is ok if it is already initialized + // it is ok if it is already initialized System.out.println("CRMFPopClient: already initialized, continue"); - } catch (Exception e) { + } catch (Exception e) { System.out.println("CRMFPopClient: INITIALIZATION ERROR: " + e.toString()); System.exit(1); } try { - CryptoManager manager = CryptoManager.getInstance(); + CryptoManager manager = CryptoManager.getInstance(); String token_pwd = TOKEN_PWD; if (token_pwd == null) { System.out.println("missing password"); @@ -322,9 +318,9 @@ public class CRMFPopClient { } System.out.println("CRMFPopClient: getting token: "+TOKEN_NAME); manager.setThreadToken(token); - Password password = new Password(token_pwd.toCharArray()); + Password password = new Password(token_pwd.toCharArray()); try { - token.login(password); + token.login(password); } catch (Exception e) { System.out.println("CRMFPopClient: login Exception: " + e.toString()); System.exit(1); @@ -347,10 +343,10 @@ public class CRMFPopClient { if (alg.equals("rsa")) { KeyPairGenerator kg = token.getKeyPairGenerator( - KeyPairAlgorithm.RSA); + KeyPairAlgorithm.RSA); kg.initialize(RSA_keylen); - pair = kg.genKeyPair(); + pair = kg.genKeyPair(); } else if (alg.equals("ec")) { /* * used with SSL server cert that does ECDH ECDSA @@ -388,7 +384,7 @@ public class CRMFPopClient { System.out.println(".before KeyWrapper"); // wrap private key using session - KeyWrapper wrapper1 = + KeyWrapper wrapper1 = token.getKeyWrapper(KeyWrapAlgorithm.DES3_CBC_PAD); System.out.println(".key wrapper created"); @@ -404,11 +400,11 @@ public class CRMFPopClient { // currently, a transport cert has to be an RSA cert, // regardless of the key you are wrapping KeyWrapper rsaWrap = token.getKeyWrapper( - KeyWrapAlgorithm.RSA); + KeyWrapAlgorithm.RSA); System.out.println(".got rsaWrapper"); - rsaWrap.initWrap(tcert.getPublicKey(), null); + rsaWrap.initWrap(tcert.getPublicKey(), null); System.out.println(".rsaWrap inited"); @@ -423,10 +419,10 @@ public class CRMFPopClient { Name n1 = getJssName(SUBJ_DN); - Name n = new Name(); + Name n = new Name(); - n.addCommonName("Me"); - n.addCountryName("US"); + n.addCommonName("Me"); + n.addCountryName("US"); n.addElement(new AVA(new OBJECT_IDENTIFIER("0.9.2342.19200300.100.1.1"), new PrintableString("MyUid"))); if (n1 != null) @@ -463,7 +459,7 @@ public class CRMFPopClient { } /* Example of adding the POP link witness control to CRMF */ - byte[] b = + byte[] b = { 0x10, 0x53, 0x42, 0x24, 0x1a, 0x2a, 0x35, 0x3c, 0x7a, 0x52, 0x54, 0x56, 0x71, 0x65, 0x66, 0x4c, 0x51, 0x34, 0x35, 0x23, 0x3c, 0x42, 0x43, 0x45, @@ -491,7 +487,7 @@ public class CRMFPopClient { ByteArrayOutputStream bo = new ByteArrayOutputStream(); certReq.encode(bo); byte[] toBeVerified = bo.toByteArray(); - + byte popdata[] = ASN1Util.encode(certReq); byte signature[]; @@ -539,7 +535,7 @@ public class CRMFPopClient { if (alg.equals("rsa")) { algID = new AlgorithmIdentifier(SignatureAlgorithm.RSASignatureWithMD5Digest.toOID(), null ); } else { // "ec" - algID = new AlgorithmIdentifier(SignatureAlgorithm.ECSignatureWithSHA1Digest.toOID(), null ); + algID = new AlgorithmIdentifier(SignatureAlgorithm.ECSignatureWithSHA1Digest.toOID(), null ); } POPOSigningKey popoKey = new POPOSigningKey(null,algID, new BIT_STRING(signature,0)); @@ -554,7 +550,7 @@ public class CRMFPopClient { SEQUENCE s1 = new SEQUENCE(); s1.addElement(crmfMsg); - byte encoded[] = ASN1Util.encode(s1); + byte encoded[] = ASN1Util.encode(s1); String Req1 = CMS.BtoA(encoded); @@ -579,10 +575,10 @@ public class CRMFPopClient { if (doServerHit == 0) return; } - + String Req = URLEncoder.encode(Req1); - url = + url = new URL("http://" + HOST_PORT + "/ca/ee/ca/profileSubmit?cert_request_type=crmf&cert_request=" + Req + "&renewal=false&uid=" + USER_NAME + "&xmlOutput=false&&profileId=" @@ -591,33 +587,33 @@ public class CRMFPopClient { System.out.println("CRMFPopClient: Posting " + url); - System.out.println(""); + System.out.println(""); System.out.println("CRMFPopClient: Server Response....."); System.out.println("--------------------"); System.out.println(""); - long start_time = (new Date()).getTime(); - conn = url.openConnection(); - is = conn.getInputStream(); - reader = new BufferedReader(new InputStreamReader(is)); - String line = null; + long start_time = (new Date()).getTime(); + conn = url.openConnection(); + is = conn.getInputStream(); + reader = new BufferedReader(new InputStreamReader(is)); + String line = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { System.out.println(line); - if (line.equals("CMS Enroll Request Success")) { - success = true; + if (line.equals("CMS Enroll Request Success")) { + success = true; System.out.println("CRMFPopClient: Enrollment Successful: ......"); System.out.println(""); - } - } /* while */ + } + } /* while */ - long end_time = (new Date()).getTime(); - total_time += (end_time - start_time); - } catch (Exception e) { + long end_time = (new Date()).getTime(); + total_time += (end_time - start_time); + } catch (Exception e) { System.out.println("CRMFPopClient: WARNING: " + e.toString()); e.printStackTrace(); } - } catch (Exception e) { + } catch (Exception e) { System.out.println("CRMFPopClient: ERROR: " + e.toString()); e.printStackTrace(); } diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index 6b2c0535e..a138ae29d 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -22,13 +22,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; import java.security.KeyPair; -import java.security.PublicKey; -import java.security.PrivateKey; import java.security.MessageDigest; +import java.security.PublicKey; +import netscape.security.pkcs.PKCS10; import netscape.security.x509.X500Name; import netscape.security.x509.X509Key; -import netscape.security.pkcs.PKCS10; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.INTEGER; @@ -37,11 +36,9 @@ import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.asn1.PrintableString; import org.mozilla.jss.asn1.SET; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.KeyPairAlgorithm; import org.mozilla.jss.crypto.KeyPairGenerator; import org.mozilla.jss.crypto.SignatureAlgorithm; -import org.mozilla.jss.crypto.KeyPairGeneratorSpi.Usage.*; import org.mozilla.jss.pkcs10.CertificationRequest; import org.mozilla.jss.pkcs10.CertificationRequestInfo; import org.mozilla.jss.pkix.primitive.AVA; @@ -50,10 +47,9 @@ import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; -import com.netscape.cmsutil.util.HMACDigest; -import com.netscape.cmsutil.util.Utils; -import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.certsrv.apps.CMS; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.util.HMACDigest; /** * Generates an ECC or RSA key pair in the security database, constructs a @@ -135,7 +131,7 @@ public class PKCS10Client { } else if (name.equals("-s")) { String ec_sensitive_s = args[i+1]; ec_sensitive = Integer.parseInt(ec_sensitive_s); - if ((ec_sensitive != 0) && + if ((ec_sensitive != 0) && (ec_sensitive != 1) && (ec_sensitive != -1)) { System.out.println("PKCS10Client: Illegal input parameters for -s."); @@ -145,7 +141,7 @@ public class PKCS10Client { } else if (name.equals("-e")) { String ec_extractable_s = args[i+1]; ec_extractable = Integer.parseInt(ec_extractable_s); - if ((ec_extractable != 0) && + if ((ec_extractable != 0) && (ec_extractable != 1) && (ec_extractable != -1)) { System.out.println("PKCS10Client: Illegal input parameters for -e."); @@ -179,7 +175,7 @@ public class PKCS10Client { if (dbdir == null) dbdir = "."; - try { + try { // initialize CryptoManager String mPrefix = ""; CryptoManager.InitializationValues vals = @@ -210,9 +206,9 @@ public class PKCS10Client { KeyPair pair = null; if (alg.equals("rsa")) { - KeyPairGenerator kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA); + KeyPairGenerator kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA); kg.initialize(rsa_keylen); - pair = kg.genKeyPair(); + pair = kg.genKeyPair(); } else if (alg.equals("ec")) { // used with SSL server cert that does ECDH ECDSA org.mozilla.jss.crypto.KeyPairGeneratorSpi.Usage usages_mask_ECDH[] = { @@ -277,11 +273,6 @@ public class PKCS10Client { certRequest = new CertificationRequest(certReqInfo, pair.getPrivate(), SignatureAlgorithm.RSASignatureWithMD5Digest); System.out.println("PKCS10Client: CertificationRequest created."); - if (certRequest == null) { - System.out.println("PKCS10Client: certRequest null."); - System.exit(1); - } else - System.out.println("PKCS10Client: certRequest not null."); ByteArrayOutputStream bos = new ByteArrayOutputStream(); certRequest.encode(bos); @@ -304,7 +295,7 @@ public class PKCS10Client { xKey = CryptoUtil.getPublicX509ECCKey(pubk_encoded); System.out.println("PKCS10Client: calling CryptoUtil.createCertificationRequest"); PKCS10 certReq = CryptoUtil.createCertificationRequest( - subjectName, xKey, (org.mozilla.jss.crypto.PrivateKey) pair.getPrivate(), + subjectName, xKey, (org.mozilla.jss.crypto.PrivateKey) pair.getPrivate(), "SHA256withEC"); System.out.println("PKCS10Client: created cert request"); @@ -316,11 +307,11 @@ public class PKCS10Client { byte[] certReqb = certReq.toByteArray(); b64E = CryptoUtil.base64Encode(certReqb); } - + System.out.println("-----BEGIN NEW CERTIFICATE REQUEST-----"); System.out.println(b64E); System.out.println("-----END NEW CERTIFICATE REQUEST-----"); - + PrintStream ps = null; ps = new PrintStream(new FileOutputStream(ofilename)); ps.println("-----BEGIN NEW CERTIFICATE REQUEST-----"); |