diff options
Diffstat (limited to 'pki/base/util/src/netscape')
15 files changed, 32 insertions, 49 deletions
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java index b28c570c3..4de75a4e1 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java @@ -272,9 +272,6 @@ public class PKCS7 { // contentInfo contentInfo.encode(signedData); - // certificates - DerOutputStream certs = new DerOutputStream(); - // cast to X509CertImpl[] since X509CertImpl implements DerEncoder X509CertImpl implCerts[] = new X509CertImpl[certificates.length]; try { diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java index b3ec07906..6fc89610a 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java @@ -184,7 +184,7 @@ public class PKCS8Key implements PrivateKey { throw new InstantiationException(); } - Class keyClass = Class.forName(classname); + Class<?> keyClass = Class.forName(classname); Object inst; PKCS8Key result; diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java index 6f7ce6abb..485cdded1 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java @@ -38,12 +38,12 @@ public class PKCS9Attributes { /** * Attributes in this set indexed by OID. */ - private final Hashtable attributes = new Hashtable(3); + private final Hashtable<ObjectIdentifier, PKCS9Attribute> attributes = new Hashtable<ObjectIdentifier, PKCS9Attribute>(3); /** * The keys of this hashtable are the OIDs of permitted attributes. */ - private final Hashtable permittedAttributes; + private final Hashtable<ObjectIdentifier, ObjectIdentifier> permittedAttributes; /** * The DER encoding of this attribute set. The tag byte must be @@ -73,7 +73,7 @@ public class PKCS9Attributes { DerInputStream in) throws IOException { if (permittedAttributes != null) { this.permittedAttributes = - new Hashtable(permittedAttributes.length); + new Hashtable<ObjectIdentifier, ObjectIdentifier>(permittedAttributes.length); for (int i = 0; i < permittedAttributes.length; i++) this.permittedAttributes.put(permittedAttributes[i], @@ -157,7 +157,6 @@ public class PKCS9Attributes { PKCS9Attribute attrib; ObjectIdentifier oid; - int index; for (int i = 0; i < derVals.length; i++) { attrib = new PKCS9Attribute(derVals[i]); @@ -213,14 +212,14 @@ public class PKCS9Attributes { * Get an attribute from this set. */ public PKCS9Attribute getAttribute(ObjectIdentifier oid) { - return (PKCS9Attribute) attributes.get(oid); + return attributes.get(oid); } /** * Get an attribute from this set. */ public PKCS9Attribute getAttribute(String name) { - return (PKCS9Attribute) attributes.get(PKCS9Attribute.getOID(name)); + return attributes.get(PKCS9Attribute.getOID(name)); } /** @@ -228,7 +227,6 @@ public class PKCS9Attributes { */ public PKCS9Attribute[] getAttributes() { PKCS9Attribute[] attribs = new PKCS9Attribute[attributes.size()]; - ObjectIdentifier oid; int j = 0; for (int i = 1; i < PKCS9Attribute.PKCS9_OIDS.length && @@ -275,7 +273,6 @@ public class PKCS9Attributes { StringBuffer buf = new StringBuffer(200); buf.append("PKCS9 Attributes: [\n\t"); - ObjectIdentifier oid; PKCS9Attribute value; boolean first = true; diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/pki/base/util/src/netscape/security/provider/CMS.java index fffa00dea..4a4f150ab 100644 --- a/pki/base/util/src/netscape/security/provider/CMS.java +++ b/pki/base/util/src/netscape/security/provider/CMS.java @@ -38,7 +38,7 @@ public final class CMS extends Provider { /* We are the SUN provider */ super("CMS", 1.0, INFO); - AccessController.doPrivileged(new java.security.PrivilegedAction() { + AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() { public Object run() { /* * Certificates diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java index 1d77a7283..41f0081f2 100755 --- a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java +++ b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java @@ -122,7 +122,8 @@ public class DSAKeyFactory extends KeyFactorySpi { * inappropriate for the given key, or the given key cannot be processed * (e.g., the given key has an unrecognized algorithm or format). */ - protected KeySpec engineGetKeySpec(Key key, Class keySpec) + @SuppressWarnings("unchecked") + protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec) throws InvalidKeySpecException { DSAParams params; @@ -132,21 +133,21 @@ public class DSAKeyFactory extends KeyFactorySpi { if (key instanceof java.security.interfaces.DSAPublicKey) { // Determine valid key specs - Class dsaPubKeySpec = Class.forName + Class<?> dsaPubKeySpec = Class.forName ("java.security.spec.DSAPublicKeySpec"); - Class x509KeySpec = Class.forName + Class<?> x509KeySpec = Class.forName ("java.security.spec.X509EncodedKeySpec"); if (dsaPubKeySpec.isAssignableFrom(keySpec)) { java.security.interfaces.DSAPublicKey dsaPubKey = (java.security.interfaces.DSAPublicKey) key; params = dsaPubKey.getParams(); - return new DSAPublicKeySpec(dsaPubKey.getY(), + return (T) new DSAPublicKeySpec(dsaPubKey.getY(), params.getP(), params.getQ(), params.getG()); } else if (x509KeySpec.isAssignableFrom(keySpec)) { - return new X509EncodedKeySpec(key.getEncoded()); + return (T) new X509EncodedKeySpec(key.getEncoded()); } else { throw new InvalidKeySpecException("Inappropriate key specification"); @@ -155,21 +156,21 @@ public class DSAKeyFactory extends KeyFactorySpi { } else if (key instanceof java.security.interfaces.DSAPrivateKey) { // Determine valid key specs - Class dsaPrivKeySpec = Class.forName + Class<?> dsaPrivKeySpec = Class.forName ("java.security.spec.DSAPrivateKeySpec"); - Class pkcs8KeySpec = Class.forName + Class<?> pkcs8KeySpec = Class.forName ("java.security.spec.PKCS8EncodedKeySpec"); if (dsaPrivKeySpec.isAssignableFrom(keySpec)) { java.security.interfaces.DSAPrivateKey dsaPrivKey = (java.security.interfaces.DSAPrivateKey) key; params = dsaPrivKey.getParams(); - return new DSAPrivateKeySpec(dsaPrivKey.getX(), + return (T) new DSAPrivateKeySpec(dsaPrivKey.getX(), params.getP(), params.getQ(), params.getG()); } else if (pkcs8KeySpec.isAssignableFrom(keySpec)) { - return new PKCS8EncodedKeySpec(key.getEncoded()); + return (T) new PKCS8EncodedKeySpec(key.getEncoded()); } else { throw new InvalidKeySpecException("Inappropriate key specification"); @@ -205,8 +206,7 @@ public class DSAKeyFactory extends KeyFactorySpi { return key; } // Convert key to spec - DSAPublicKeySpec dsaPubKeySpec = (DSAPublicKeySpec) engineGetKeySpec - (key, DSAPublicKeySpec.class); + DSAPublicKeySpec dsaPubKeySpec = engineGetKeySpec(key, DSAPublicKeySpec.class); // Create key from spec, and return it return engineGeneratePublic(dsaPubKeySpec); @@ -216,8 +216,7 @@ public class DSAKeyFactory extends KeyFactorySpi { return key; } // Convert key to spec - DSAPrivateKeySpec dsaPrivKeySpec = (DSAPrivateKeySpec) engineGetKeySpec - (key, DSAPrivateKeySpec.class); + DSAPrivateKeySpec dsaPrivKeySpec = engineGetKeySpec(key, DSAPrivateKeySpec.class); // Create key from spec, and return it return engineGeneratePrivate(dsaPrivKeySpec); diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/pki/base/util/src/netscape/security/provider/DSAParameters.java index cc3012f75..e2a5dd128 100755 --- a/pki/base/util/src/netscape/security/provider/DSAParameters.java +++ b/pki/base/util/src/netscape/security/provider/DSAParameters.java @@ -86,13 +86,14 @@ public class DSAParameters extends AlgorithmParametersSpi { engineInit(params); } - protected AlgorithmParameterSpec engineGetParameterSpec(Class paramSpec) + @SuppressWarnings("unchecked") + protected <T extends AlgorithmParameterSpec> T engineGetParameterSpec(Class<T> paramSpec) throws InvalidParameterSpecException { try { - Class dsaParamSpec = Class.forName + Class<?> dsaParamSpec = Class.forName ("java.security.spec.DSAParameterSpec"); if (dsaParamSpec.isAssignableFrom(paramSpec)) { - return new DSAParameterSpec(this.p, this.q, this.g); + return (T) new DSAParameterSpec(this.p, this.q, this.g); } else { throw new InvalidParameterSpecException("Inappropriate parameter Specification"); } diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java index 972c57846..c9c364f4f 100644 --- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java +++ b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java @@ -20,7 +20,6 @@ package netscape.security.util; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import java.nio.charset.CodingErrorAction; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java b/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java index ded4522d9..2ee2f740e 100644 --- a/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java +++ b/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java @@ -25,7 +25,7 @@ import java.util.Comparator; * @version 1.4 97/12/10 * @author D. N. Hoover */ -public class ByteArrayLexOrder implements Comparator { +public class ByteArrayLexOrder implements Comparator<byte[]> { /** * Perform lexicographical comparison of two byte arrays, @@ -41,10 +41,7 @@ public class ByteArrayLexOrder implements Comparator { * * @exception <code>ClassCastException</code> if either argument is not a byte array. */ - public final int compare(Object obj1, Object obj2) { - - byte[] bytes1 = (byte[]) obj1; - byte[] bytes2 = (byte[]) obj2; + public final int compare(byte[] bytes1, byte[] bytes2) { int diff; for (int i = 0; i < bytes1.length && i < bytes2.length; i++) { diff --git a/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java b/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java index 1367ee043..e57a3b5f1 100644 --- a/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java +++ b/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java @@ -19,7 +19,7 @@ package netscape.security.util; import java.util.Comparator; -public class ByteArrayTagOrder implements Comparator { +public class ByteArrayTagOrder implements Comparator<byte[]> { /** * Compare two byte arrays, by the order of their tags, @@ -34,10 +34,7 @@ public class ByteArrayTagOrder implements Comparator { * @exception <code>ClassCastException</code> if either argument is not a byte array. */ - public final int compare(Object obj1, Object obj2) { - - byte[] bytes1 = (byte[]) obj1; - byte[] bytes2 = (byte[]) obj2; + public final int compare(byte[] bytes1, byte[] bytes2) { // tag order is same as byte order ignoring any difference in // the constructivity bit (0x02) diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/pki/base/util/src/netscape/security/util/DerOutputStream.java index 44a4df8f0..62290d604 100644 --- a/pki/base/util/src/netscape/security/util/DerOutputStream.java +++ b/pki/base/util/src/netscape/security/util/DerOutputStream.java @@ -460,7 +460,7 @@ public class DerOutputStream * @param order the order to use when sorting encodings of components. */ private void putOrderedSet(byte tag, DerEncoder[] set, - Comparator order) throws IOException { + Comparator<byte[]> order) throws IOException { DerOutputStream[] streams = new DerOutputStream[set.length]; for (int i = 0; i < set.length; i++) { diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java index 8dd547760..6ff02d1b0 100644 --- a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -19,6 +19,7 @@ package netscape.security.util; import java.io.IOException; import java.io.Serializable; +import java.util.Hashtable; import java.util.StringTokenizer; /** @@ -376,7 +377,7 @@ final public class ObjectIdentifier implements Serializable { * This function never returns null. IOException is raised * in error conditions. */ - public static java.util.Hashtable mOIDs = new java.util.Hashtable(); + public static Hashtable<String, ObjectIdentifier> mOIDs = new Hashtable<String, ObjectIdentifier>(); public static ObjectIdentifier getObjectIdentifier(String oid) throws IOException { @@ -387,7 +388,7 @@ final public class ObjectIdentifier implements Serializable { oid = oid.trim(); - ObjectIdentifier thisOID = (ObjectIdentifier) mOIDs.get(oid); + ObjectIdentifier thisOID = mOIDs.get(oid); if (thisOID != null) return thisOID; diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index 320bbf3df..c749ae04e 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -29,7 +29,6 @@ import java.util.Vector; import netscape.security.util.BitArray; import netscape.security.util.DerOutputStream; -import netscape.security.x509.FreshestCRLExtension.Reason; import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.InvalidBERException; diff --git a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index fd6e15bfb..52ff67017 100644 --- a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -134,8 +134,6 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { throws IOException { StringReader rdn_reader = new StringReader(rdn); PushbackReader in = new PushbackReader(rdn_reader, 5); - Vector<AVA> avaVector = new Vector<AVA>(); - AVA[] assertion; return parseRDN(in, null); } @@ -649,7 +647,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * production as practical. */ StringBuffer retval = new StringBuffer(30); - int i, j; + int i; String temp = null; AVAValueConverter valueConverter; diff --git a/pki/base/util/src/netscape/security/x509/RDN.java b/pki/base/util/src/netscape/security/x509/RDN.java index 79e494638..c5e8765a0 100644 --- a/pki/base/util/src/netscape/security/x509/RDN.java +++ b/pki/base/util/src/netscape/security/x509/RDN.java @@ -193,7 +193,6 @@ public class RDN { } public AVA nextElement() { - AVA ava = null; if (index >= assertion.length) return null; return assertion[index++]; diff --git a/pki/base/util/src/netscape/security/x509/X509Cert.java b/pki/base/util/src/netscape/security/x509/X509Cert.java index b524f779b..9ab7ba754 100644 --- a/pki/base/util/src/netscape/security/x509/X509Cert.java +++ b/pki/base/util/src/netscape/security/x509/X509Cert.java @@ -444,7 +444,6 @@ public class X509Cert implements Certificate, Serializable { */ public Signature getVerifier(String algorithm) throws NoSuchAlgorithmException, InvalidKeyException { - String algName; Signature sig; sig = Signature.getInstance(algorithm); |