diff options
Diffstat (limited to 'pki/base/util')
40 files changed, 145 insertions, 365 deletions
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index 8894cf22..dffa341b 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -97,7 +97,6 @@ set(pki-nsutil_java_SRCS netscape/security/x509/CertificateValidity.java netscape/security/x509/PKIXExtensions.java netscape/security/x509/PrintableConverter.java - netscape/security/x509/AttributeNameEnumeration.java netscape/security/x509/SubjectDirAttributesExtension.java netscape/security/x509/CRLDistributionPoint.java netscape/security/x509/NameConstraintsExtension.java @@ -176,7 +175,6 @@ set(pki-nsutil_java_SRCS netscape/security/util/ByteArrayTagOrder.java netscape/security/util/PrettyPrintResources.java netscape/security/util/PrettyPrintFormat.java - netscape/security/util/ArraySet.java netscape/security/util/CharToByteUniversalString.java netscape/security/util/ByteToCharIA5String.java netscape/security/util/PubKeyPrettyPrint.java diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java index f4a8f3aa..bd0fd7e1 100644 --- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -28,12 +28,13 @@ import java.text.ParseException; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; -import netscape.security.x509.AttributeNameEnumeration; + import netscape.security.x509.CertAttrSet; import netscape.security.x509.Extension; import netscape.security.x509.OIDMap; @@ -351,7 +352,7 @@ implements CertAttrSet { * attribute. */ public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + Vector<String> elements = new Vector<String>(); elements.addElement("octet"); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/pki/base/util/src/netscape/security/util/ArraySet.java deleted file mode 100644 index 54055789..00000000 --- a/pki/base/util/src/netscape/security/util/ArraySet.java +++ /dev/null @@ -1,202 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package netscape.security.util; - -import java.util.AbstractSet; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -/** - * This class implements the Set interface, backed by an ArrayList. It is - * designed to offer good performance for very small Sets, especially those - * that are frequently created and destroyed. The performance will be - * <em>extremely</em> bad for large Sets: ArraySet provides linear time - * performance for the basic operations (add, remove and contains). This Set - * permit all elements, including null. - * <p> - * <p> - * <strong>Note that this implementation is not synchronized.</strong> If - * multiple threads access an ArraySet concurrently, and at least one of the - * threads modifies the ArraySet, it <em>must</em> be synchronized externally. - * This is typically accomplished by synchronizing on some object that - * naturally encapsulates the ArraySet. If no such object exists, the ArraySet - * should be "wrapped" using the Collections.synchronizedSet method. This is - * best done at creation time, to prevent accidental unsynchronized access to - * the ArraySet: - * <pre> - * Set s = Collections.synchronizedSet(new ArraySet(...)); - * </pre> - * <p> - * The Iterators returned by ArraySet's iterator method are - * <em>fail-fast</em>: if the HashSet is modified at any time after the - * Iterator is created, in any way except through the Iterator's own remove - * method, the Iterator will throw a ConcurrentModificationException. Thus, - * in the face of concurrent modification, the Iterator fails quickly and - * cleanly, rather than risking arbitrary, non-deterministic behavior at an - * undetermined time in the future. - * - * @author Josh Bloch - * @version 1.7 10/13/97 - * @see Collection - * @see Set - * @see HashSet - * @see ArrayList - * @since JDK1.2 - */ - -public class ArraySet extends AbstractSet - implements Set, Cloneable, java.io.Serializable { - /** - * - */ - private static final long serialVersionUID = 3497902530270794207L; - private ArrayList a; - - /** - * Constructs a new, empty ArraySet; the backing ArrayList has default - * initial capacity and capacity increment. - * - * @since JDK1.2 - */ - public ArraySet() { - a = new ArrayList(); - } - - /** - * Constructs a new ArraySet containing the elements in the specified - * Collection. The backing ArrayList has default initial capacity and - * capacity increment. - * - * @exception NullPointerException the specified collection is null. - * @since JDK1.2 - */ - public ArraySet(Collection c) { - a = new ArrayList(); - - // Add elements of c to a. Don't check for dups if c is a Set. - Iterator i = c.iterator(); - if(c instanceof Set) { - while(i.hasNext()) - a.add(i.next()); - } else { - while(i.hasNext()) - add(i.next()); - } - } - - /** - * Constructs a new, empty ArraySet; the backing ArrayList has the - * specified initial capacity and default capacity increment. - * - * @param initialCapacity the initial capacity of the ArrayList. - * @since JDK1.2 - */ - public ArraySet(int initialCapacity) { - a = new ArrayList(initialCapacity); - } - - /** - * Returns an Iterator over the elements in this ArraySet. The elements - * are returned in the order they were added. - * - * @since JDK1.2 - */ - public Iterator iterator() { - return a.iterator(); - } - - /** - * Returns the number of elements in this ArraySet (its cardinality). - * - * @since JDK1.2 - */ - public int size() { - return a.size(); - } - - /** - * Returns true if this ArraySet contains no elements. - * - * @since JDK1.2 - */ - public boolean isEmpty() { - return a.size()==0; - } - - /** - * Returns true if this ArraySet contains the specified element. - * - * @since JDK1.2 - */ - public boolean contains(Object o) { - return a.contains(o); - } - - /** - * Adds the specified element to this Set if it is not already present. - * - * @param o element to be added to this Set. - * @return true if the Set did not already contain the specified element. - * @since JDK1.2 - */ - public boolean add(Object o) { - boolean modified; - if (modified = !a.contains(o)) - a.add(o); - return modified; - } - - /** - * Removes the given element from this Set if it is present. - * - * @param o object to be removed from this Set, if present. - * @return true if the Set contained the specified element. - * @since JDK1.2 - */ - public boolean remove(Object o) { - return a.remove(o); - } - - /** - * Removes all of the elements from this Set. - * - * @since JDK1.2 - */ - public void clear() { - a.clear(); - } - - /** - * Returns a shallow copy of this ArraySet. (The elements themselves - * are not cloned.) - * - * @since JDK1.2 - */ - public Object clone() { - try { - ArraySet newSet = (ArraySet)super.clone(); - newSet.a = (ArrayList)a.clone(); - return newSet; - } catch (CloneNotSupportedException e) { - throw new InternalError(); - } - } -} diff --git a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java deleted file mode 100644 index 47e18fdc..00000000 --- a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java +++ /dev/null @@ -1,43 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package netscape.security.x509; - -import java.util.Vector; - -/** - * <p>This class provides the Enumeration implementation used - * by all the X509 certificate attributes to return the attribute - * names contained within them. - * - * @author Amit Kapoor - * @author Hemma Prafullchandra - * @version 1.3 - */ -public class AttributeNameEnumeration extends Vector { - /** - * - */ - private static final long serialVersionUID = 6855308073169292869L; - - /** - * The default constructor for this class. - */ - public AttributeNameEnumeration() { - super(1,1); - } -} diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index 738c97e4..c0eff9b3 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -320,8 +321,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); elements.addElement(AUTH_NAME); elements.addElement(SERIAL_NUMBER); diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index f0e689e5..7314c2ac 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; @@ -276,8 +277,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(IS_CA); elements.addElement(PATH_LEN); diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/pki/base/util/src/netscape/security/x509/CRLExtensions.java index 3b165a59..bba44eab 100755 --- a/pki/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CRLExtensions.java @@ -39,18 +39,18 @@ import netscape.security.util.DerValue; * @author Hemma Prafullchandra * @version 1.4 */ -public class CRLExtensions extends Vector { +public class CRLExtensions extends Vector<Extension> { /** * */ private static final long serialVersionUID = 365767738692986418L; - private Hashtable map; + private Hashtable<String,Extension> map; // Parse the encoded extension private void parseExtension(Extension ext) throws X509ExtensionException { try { - Class extClass = OIDMap.getClass(ext.getExtensionId()); + Class<?> extClass = OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -61,8 +61,8 @@ public class CRLExtensions extends Vector { return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<?> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; Object value = Array.newInstance(byte.class, extLen); @@ -73,8 +73,8 @@ public class CRLExtensions extends Vector { Object[] passed = new Object[] {new Boolean(ext.isCritical()), value}; CertAttrSet crlExt = (CertAttrSet)cons.newInstance(passed); - map.put(crlExt.getName(), crlExt); - addElement(crlExt); + map.put(crlExt.getName(), (Extension) crlExt); + addElement((Extension) crlExt); } catch (InvocationTargetException invk) { throw new X509ExtensionException( @@ -89,7 +89,7 @@ public class CRLExtensions extends Vector { * Default constructor. */ public CRLExtensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -102,7 +102,7 @@ public class CRLExtensions extends Vector { public CRLExtensions(DerInputStream in) throws CRLException, X509ExtensionException { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); try { DerValue[] exts = in.getSequence(5); @@ -128,7 +128,7 @@ public class CRLExtensions extends Vector { DerValue val = new DerValue(in); DerInputStream str = val.toDerInputStream(); - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -213,7 +213,7 @@ public class CRLExtensions extends Vector { * alias. * @exception IOException on errors. */ - public void set(String alias, Object obj) throws IOException { + public void set(String alias, Extension obj) throws IOException { map.put(alias, obj); addElement(obj); } @@ -222,7 +222,7 @@ public class CRLExtensions extends Vector { * Return an enumeration of names of the extensions. * @return an enumeration of the names of the extensions in this CRL. */ - public Enumeration getElements () { + public Enumeration<Extension> getElements () { return (map.elements()); } } diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index d073d881..67baf106 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -23,6 +23,7 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.math.BigInteger; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; @@ -209,8 +210,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java index d1386e68..8f10ac6a 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -205,8 +206,8 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(REASON); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 20d1c0b6..48fcb454 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -24,6 +24,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Serializable; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -172,8 +173,8 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(ALGORITHM); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java index f30b3164..1f616d67 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -59,7 +59,7 @@ implements CertAttrSet, Serializable { */ public static final String NAME = "extensions"; - private Hashtable map; + private Hashtable<String, Object> map; // Parse the encoded extension public void parseExtension(Extension ext) throws IOException { @@ -89,8 +89,8 @@ implements CertAttrSet, Serializable { value}; CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); if (certExt != null && certExt.getName() != null) { - map.put(certExt.getName(), certExt); - addElement(certExt); + map.put(certExt.getName(), (Extension) certExt); + addElement((Extension) certExt); } } catch (NoSuchMethodException nosuch) { throw new IOException(nosuch.toString()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index c8585b7d..73d9c1d1 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -23,6 +23,7 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.security.cert.CertificateException; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -230,8 +231,8 @@ public class CertificateIssuerExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(CERTIFICATE_ISSUER); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index f964a220..22d05d07 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -154,8 +155,8 @@ public class CertificateIssuerName implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index 10cb4513..687aedb4 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -167,8 +168,8 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(ID); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index e582a35f..106cc450 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -227,7 +227,7 @@ implements CertAttrSet { * attribute. */ public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + Vector elements = new Vector(); elements.addElement(mInfos); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java index a802a436..eeebb873 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.math.BigInteger; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -173,8 +174,8 @@ public class CertificateSerialNumber implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java index 5b09fa59..a4dac169 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -24,6 +24,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Serializable; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -185,8 +186,8 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); return(elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index fa44e252..c214546a 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -167,8 +168,8 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(ID); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java index fdb03594..e0b26428 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -27,6 +27,7 @@ import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; import java.util.Date; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -245,8 +246,8 @@ public class CertificateValidity implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(NOT_BEFORE); elements.addElement(NOT_AFTER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/pki/base/util/src/netscape/security/x509/CertificateVersion.java index 36daef86..d35a012e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; @@ -223,8 +224,8 @@ public class CertificateVersion implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java index acc1bc04..cf888eea 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -24,6 +24,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Serializable; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -172,8 +173,8 @@ public class CertificateX509Key implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(KEY); return(elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index 4f4e11c4..96f7167c 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -24,6 +24,7 @@ import java.lang.reflect.Array; import java.math.BigInteger; import java.security.cert.CertificateException; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; @@ -222,8 +223,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index 31806ae1..ee93e4be 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -23,6 +23,7 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.security.cert.CertificateException; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -350,8 +351,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(HOLD_INSTRUCTION); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java index c70eca7a..cb568c7f 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -24,6 +24,7 @@ import java.lang.reflect.Array; import java.security.cert.CertificateException; import java.util.Date; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -229,8 +230,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(INVALIDITY_DATE); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index 5f09b353..dd599ca6 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -222,8 +223,8 @@ extends Extension implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(ISSUER_NAME); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index d6afd54c..1cef0f88 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.cert.CertificateException; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BitArray; import netscape.security.util.DerOutputStream; @@ -348,8 +349,8 @@ public class IssuingDistributionPointExtension extends Extension } } - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(ISSUING_DISTRIBUTION_POINT); return (elements.elements()); // return (new Vector()).elements(); diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 807388a7..7cef5923 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BitArray; import netscape.security.util.DerOutputStream; @@ -385,8 +386,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(DIGITAL_SIGNATURE); elements.addElement(NON_REPUDIATION); elements.addElement(KEY_ENCIPHERMENT); diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index 4a8e91c9..040126bf 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -213,7 +213,7 @@ implements CertAttrSet { * attribute. */ public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + Vector elements = new Vector(); elements.addElement(mInfos); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 5e54c2d9..9a2ac91c 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -300,8 +301,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(PERMITTED_SUBTREES); elements.addElement(EXCLUDED_SUBTREES); diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 45039df8..681d449b 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; @@ -274,8 +275,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(REQUIRE); elements.addElement(INHIBIT); diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index 77753711..90dd5267 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -231,8 +231,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(MAP); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index c844eb33..30944495 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -27,6 +27,7 @@ import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateParsingException; import java.util.Date; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -320,8 +321,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(NOT_BEFORE); elements.addElement(NOT_AFTER); diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/pki/base/util/src/netscape/security/x509/ReasonFlags.java index 64c8ff90..809323ad 100755 --- a/pki/base/util/src/netscape/security/x509/ReasonFlags.java +++ b/pki/base/util/src/netscape/security/x509/ReasonFlags.java @@ -19,6 +19,7 @@ package netscape.security.x509; import java.io.IOException; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.BitArray; import netscape.security.util.DerInputStream; @@ -266,8 +267,8 @@ public class ReasonFlags { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(UNUSED); elements.addElement(KEY_COMPROMISE); elements.addElement(CA_COMPROMISE); diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index 5d9d0491..99bd1665 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -27,8 +27,8 @@ import java.security.cert.CRLException; import java.util.Date; import java.util.Enumeration; import java.util.Set; +import java.util.TreeSet; -import netscape.security.util.ArraySet; import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -294,7 +294,7 @@ public class RevokedCertImpl extends RevokedCertificate public Set getCriticalExtensionOIDs() { if (extensions == null) return null; - ArraySet extSet = new ArraySet(); + Set extSet = new TreeSet(); Extension ex; for (Enumeration e = extensions.getElements(); e.hasMoreElements();) { @@ -315,7 +315,7 @@ public class RevokedCertImpl extends RevokedCertificate public Set getNonCriticalExtensionOIDs() { if (extensions == null) return null; - ArraySet extSet = new ArraySet(); + Set extSet = new TreeSet(); Extension ex; for (Enumeration e = extensions.getElements(); e.hasMoreElements();) { diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index f950f57d..5c3ad35e 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -221,8 +222,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(SUBJECT_NAME); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index a3277ce7..da9170f3 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -263,8 +263,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index 1572f63b..fc65ec31 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; +import java.util.Vector; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -202,8 +203,8 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements () { + Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java index 82ec7841..c76e8e25 100755 --- a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -34,13 +34,12 @@ import java.security.cert.Certificate; import java.security.cert.X509CRL; import java.security.cert.X509CRLEntry; import java.security.cert.X509Certificate; -import java.util.Collection; import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Set; +import java.util.TreeSet; -import netscape.security.util.ArraySet; import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -103,7 +102,7 @@ public class X509CRLImpl extends X509CRL { private Date thisUpdate = null; private Date nextUpdate = null; // private static final Hashtable revokedCerts = new Hashtable(); - private Hashtable revokedCerts = new Hashtable(); + private Hashtable<BigInteger,RevokedCertificate> revokedCerts = new Hashtable<BigInteger, RevokedCertificate>(); // private static CRLExtensions extensions = null; private CRLExtensions extensions = null; private boolean entriesIncluded = true; @@ -281,7 +280,7 @@ public class X509CRLImpl extends X509CRL { */ public X509CRLImpl(X500Name issuer, AlgorithmId algId, Date thisDate, Date nextDate, - Hashtable badCerts, CRLExtensions crlExts) + Hashtable<BigInteger,RevokedCertificate> badCerts, CRLExtensions crlExts) throws CRLException, X509ExtensionException { this.issuer = issuer; this.thisUpdate = thisDate; @@ -354,7 +353,7 @@ public class X509CRLImpl extends X509CRL { tmp.putUTCTime(nextUpdate); if (! revokedCerts.isEmpty()) { - for (Enumeration e = revokedCerts.elements(); + for (Enumeration<RevokedCertificate> e = revokedCerts.elements(); e.hasMoreElements();) ((RevokedCertImpl)e.nextElement()).encode(rCerts); tmp.write(DerValue.tag_Sequence, rCerts); @@ -538,7 +537,7 @@ public class X509CRLImpl extends X509CRL { sb.append("\nNO certificates have been revoked\n"); else { sb.append("\nRevoked Certificates:\n"); - for (Enumeration e = revokedCerts.elements(); + for (Enumeration<RevokedCertificate> e = revokedCerts.elements(); e.hasMoreElements();) sb.append(((RevokedCertificate)e.nextElement()).toString()); } @@ -671,24 +670,22 @@ public class X509CRLImpl extends X509CRL { * none. * @see RevokedCertificate */ - public Set getRevokedCertificates() { + public Set<RevokedCertificate> getRevokedCertificates() { if (revokedCerts == null || revokedCerts.isEmpty()) return null; else { - ArraySet certSet = new ArraySet(); - Collection badCerts = revokedCerts.values(); - Object[] objs = badCerts.toArray(); - for (int i = 0; i < objs.length; i++) - certSet.add(objs[i]); + Set<RevokedCertificate> certSet = new TreeSet<RevokedCertificate>(revokedCerts.values()); return certSet; } } - public Hashtable getListOfRevokedCertificates() { - if (revokedCerts == null) + @SuppressWarnings("unchecked") + public Hashtable<BigInteger,RevokedCertificate> getListOfRevokedCertificates() { + if (revokedCerts == null){ return null; - else - return (Hashtable)revokedCerts.clone(); + }else{ + return (Hashtable<BigInteger,RevokedCertificate>)revokedCerts.clone(); + } } public int getNumberOfRevokedCertificates() { @@ -808,17 +805,18 @@ public class X509CRLImpl extends X509CRL { * @return a set of the extension oid strings in the * CRL that are marked critical. */ - public Set getCriticalExtensionOIDs() { + public Set<String> getCriticalExtensionOIDs() { if (extensions == null) return null; - ArraySet extSet = new ArraySet(); + Set<String> extSet = new TreeSet<String>(); Extension ex; - for (Enumeration e = extensions.getElements(); + for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension)e.nextElement(); - if (ex.isCritical()) - extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString()); + ex = e.nextElement(); + if (ex.isCritical()){ + extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString()); } + } return extSet; } @@ -829,14 +827,14 @@ public class X509CRLImpl extends X509CRL { * @return a set of the extension oid strings in the * CRL that are NOT marked critical. */ - public Set getNonCriticalExtensionOIDs() { + public Set<String> getNonCriticalExtensionOIDs() { if (extensions == null) return null; - ArraySet extSet = new ArraySet(); + Set<String> extSet = new TreeSet<String>(); Extension ex; - for (Enumeration e = extensions.getElements(); + for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension)e.nextElement(); + ex = e.nextElement(); if ( ! ex.isCritical()) extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString()); } @@ -865,9 +863,9 @@ public class X509CRLImpl extends X509CRL { ObjectIdentifier findOID = new ObjectIdentifier(oid); Extension ex = null; ObjectIdentifier inCertOID; - for (Enumeration e=extensions.getElements(); + for (Enumeration<Extension> e=extensions.getElements(); e.hasMoreElements();) { - ex = (Extension)e.nextElement(); + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { crlExt = ex; @@ -894,7 +892,7 @@ public class X509CRLImpl extends X509CRL { CRLExtensions exts = getExtensions(); if (exts == null) return null; - Enumeration e = exts.getElements(); + Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { Extension ext = (Extension)e.nextElement(); if (ext instanceof CRLNumberExtension) { @@ -912,7 +910,7 @@ public class X509CRLImpl extends X509CRL { CRLExtensions exts = getExtensions(); if (exts == null) return null; - Enumeration e = exts.getElements(); + Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { Extension ext = (Extension)e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { @@ -930,7 +928,7 @@ public class X509CRLImpl extends X509CRL { CRLExtensions exts = getExtensions(); if (exts == null) return false; - Enumeration e = exts.getElements(); + Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { Extension ext = (Extension)e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index 0d666ebd..bb1b441a 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -42,8 +42,9 @@ import java.security.cert.X509Certificate; import java.util.Date; import java.util.Enumeration; import java.util.Set; +import java.util.TreeSet; +import java.util.Vector; -import netscape.security.util.ArraySet; import netscape.security.util.BigInt; import netscape.security.util.DerEncoder; import netscape.security.util.DerOutputStream; @@ -618,8 +619,8 @@ implements Serializable, DerEncoder { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(NAME + DOT + INFO); elements.addElement(NAME + DOT + ALG_ID); elements.addElement(NAME + DOT + SIGNATURE); @@ -912,7 +913,7 @@ implements Serializable, DerEncoder { CertificateExtensions.NAME); if (exts == null) return null; - ArraySet extSet = new ArraySet(); + Set<String> extSet = new TreeSet(); Extension ex; for (Enumeration e = exts.getElements(); e.hasMoreElements(); ) { ex = (Extension)e.nextElement(); @@ -941,7 +942,7 @@ implements Serializable, DerEncoder { if (exts == null) return null; - ArraySet extSet = new ArraySet(); + Set extSet = new TreeSet(); Extension ex; for (Enumeration e = exts.getElements(); e.hasMoreElements(); ) { ex = (Extension)e.nextElement(); diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java index 0e58a10b..4ece0df8 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -28,6 +28,7 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Vector; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; @@ -116,7 +117,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { private byte[] rawCertInfo = null; // The certificate attribute name to integer mapping stored here - private static final Hashtable map = new Hashtable(); + private static final Hashtable<String, Integer> map = new Hashtable<String, Integer>(); static { map.put(VERSION, Integer.valueOf(ATTR_VERSION)); map.put(SERIAL_NUMBER, Integer.valueOf(ATTR_SERIAL)); @@ -221,8 +222,8 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - AttributeNameEnumeration elements = new AttributeNameEnumeration(); + public Enumeration<String> getElements() { + Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); elements.addElement(SERIAL_NUMBER); elements.addElement(ALGORITHM_ID); @@ -806,7 +807,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Returns the integer attribute number for the passed attribute name. */ private int attributeMap(String name) { - Integer num = (Integer)map.get(name); + Integer num = map.get(name); if (num == null) { return(0); } |