diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-12 18:53:36 -0600 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-18 12:55:59 -0600 |
| commit | 2a535f04f7b7bf670b19b95801e25178af5c91f9 (patch) | |
| tree | 5e8356739fecf71d6b132e026d95ffb52bf2cdbf /pki/base/util/src | |
| parent | 9115902d5d3ffa4ac905f5d1f9fbd18a8e99622c (diff) | |
| download | pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.tar.gz pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.tar.xz pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.zip | |
Added generics (part 1).
This patch is based on Adam's patch. It brings down the warnings
from 6139 to 4648.
Ticket #2
Diffstat (limited to 'pki/base/util/src')
62 files changed, 304 insertions, 275 deletions
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index e2d5d156a..cad7d0ae3 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -945,10 +945,11 @@ public class CryptoUtil { throws CryptoManager.NotInitializedException, TokenException { CryptoManager cm = CryptoManager.getInstance(); - Enumeration enums = cm.getAllTokens(); + @SuppressWarnings("unchecked") + Enumeration<CryptoToken> enums = cm.getAllTokens(); while (enums.hasMoreElements()) { - CryptoToken token = (CryptoToken) enums.nextElement(); + CryptoToken token = enums.nextElement(); String tokenName = token.getName(); CryptoStore store = token.getCryptoStore(); PrivateKey keys[] = store.getPrivateKeys(); @@ -970,9 +971,10 @@ public class CryptoUtil { public static X509CertImpl[] getAllUserCerts() throws CryptoManager.NotInitializedException, TokenException { - Vector certs = new Vector(); + Vector<X509CertImpl> certs = new Vector<X509CertImpl>(); CryptoManager cm = CryptoManager.getInstance(); - Enumeration enums = cm.getAllTokens(); + @SuppressWarnings("unchecked") + Enumeration<CryptoToken> enums = cm.getAllTokens(); while (enums.hasMoreElements()) { CryptoToken token = (CryptoToken) enums.nextElement(); diff --git a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index 2971706fa..a5dd108ae 100644 --- a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -25,6 +25,8 @@ import java.security.PublicKey; import java.util.Arrays; import java.util.Hashtable; +import netscape.security.pkcs.PKCS10; + import org.mozilla.jss.asn1.ANY; import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.INTEGER; @@ -191,16 +193,16 @@ public class CRSPKIMessage { private int rsdVersion; private byte[] rsdCert; // certificate to send in response - private Object myP10; + private PKCS10 myP10; - private Hashtable attrs; // miscellanous + private Hashtable<String, Object> attrs; // miscellanous // *** END *** // public void debug() { } - public void put(Object a, Object b) { + public void put(String a, Object b) { attrs.put(a, b); } @@ -475,7 +477,7 @@ public class CRSPKIMessage { certs, null, // no CRL's new SET() // empty SignerInfos - ); + ); ContentInfo wrap = new ContentInfo(ContentInfo.SIGNED_DATA, crsd); @@ -606,11 +608,11 @@ public class CRSPKIMessage { return aa_digest.toByteArray(); } - public Object getP10() { + public PKCS10 getP10() { return myP10; } - public void setP10(Object p10) { + public void setP10(PKCS10 p10) { myP10 = p10; } @@ -717,11 +719,11 @@ public class CRSPKIMessage { } public CRSPKIMessage() { - attrs = new Hashtable(); + attrs = new Hashtable<String, Object>(); } public CRSPKIMessage(ByteArrayInputStream bais) throws InvalidBERException, Exception { - attrs = new Hashtable(); + attrs = new Hashtable<String, Object>(); decodeCRSPKIMessage(bais); } diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java index 1f5aa4e65..0bafcedd0 100644 --- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -62,9 +62,6 @@ import netscape.security.x509.URIName; * @version $Revision$, $Date$ */ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { - /** - * - */ private static final long serialVersionUID = 7373316523212538446L; public static final String NAME = "AuthInfoAccessExtension"; public static final String NAME2 = "AuthorityInformationAccess"; @@ -80,7 +77,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { public static final int OID[] = { 1, 3, 6, 1, 5, 5, 7, 1, 1 }; public static final ObjectIdentifier ID = new ObjectIdentifier(OID); - private Vector mDesc = new Vector(); + private Vector<AccessDescription> mDesc = new Vector<AccessDescription>(); /** * Create the extension from the passed DER encoded value of the same. @@ -136,7 +133,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } @@ -159,7 +156,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { } public AccessDescription getAccessDescription(int pos) { - return (AccessDescription) mDesc.elementAt(pos); + return mDesc.elementAt(pos); } /** @@ -190,7 +187,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { for (int i = 0; i < mDesc.size(); i++) { DerOutputStream tmp0 = new DerOutputStream(); - AccessDescription ad = (AccessDescription) mDesc.elementAt(i); + AccessDescription ad = mDesc.elementAt(i); tmp0.putOID(ad.getMethod()); ad.getLocation().encode(tmp0); @@ -223,7 +220,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { String s = super.toString() + "AuthInfoAccess [\n"; for (int i = 0; i < mDesc.size(); i++) { - AccessDescription ad = (AccessDescription) mDesc.elementAt(i); + AccessDescription ad = mDesc.elementAt(i); s += "(" + i + ")"; s += " "; diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java index 2f402ce2f..018fd71c8 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -43,9 +43,6 @@ import netscape.security.x509.Extension; */ public class CertificateRenewalWindowExtension extends Extension implements CertAttrSet { - /** - * - */ private static final long serialVersionUID = 4470220533545299271L; public static final String NAME = "CertificateRenewalWindow"; public static final int OID[] = { 2, 16, 840, 1, 113730, 1, 15 }; @@ -114,7 +111,7 @@ public class CertificateRenewalWindowExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java index b31bd9985..16641f36b 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java @@ -54,7 +54,7 @@ public class CertificateScopeOfUseExtension extends Extension public static final int OID[] = { 2, 16, 840, 1, 113730, 1, 17 }; public static final ObjectIdentifier ID = new ObjectIdentifier(OID); - private Vector mEntries = null; + private Vector<CertificateScopeEntry> mEntries = null; static { try { @@ -64,7 +64,7 @@ public class CertificateScopeOfUseExtension extends Extension } } - public CertificateScopeOfUseExtension(boolean critical, Vector scopeEntries) + public CertificateScopeOfUseExtension(boolean critical, Vector<CertificateScopeEntry> scopeEntries) throws IOException { this.extensionId = ID; this.critical = critical; @@ -91,7 +91,7 @@ public class CertificateScopeOfUseExtension extends Extension return NAME; } - public Vector getCertificateScopeEntries() { + public Vector<CertificateScopeEntry> getCertificateScopeEntries() { return mEntries; } @@ -128,7 +128,7 @@ public class CertificateScopeOfUseExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } @@ -139,7 +139,7 @@ public class CertificateScopeOfUseExtension extends Extension if (val.tag != DerValue.tag_Sequence) { throw new IOException("Invalid encoding of CertificateWindow extension"); } - mEntries = new Vector(); + mEntries = new Vector<CertificateScopeEntry>(); while (val.data.available() != 0) { mEntries.addElement(new CertificateScopeEntry( val.data.getDerValue())); diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java index 5b3f06e91..939da036f 100644 --- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -55,13 +55,13 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet public static final ObjectIdentifier OID_CODE_SIGNING = new ObjectIdentifier(OID_OCSP_SIGNING_STR); - private Vector oidSet = null; + private Vector<ObjectIdentifier> oidSet = null; private byte mCached[] = null; static { try { OIDMap.addAttribute(ExtendedKeyUsageExtension.class.getName(), - OID, NAME); + OID, ExtendedKeyUsageExtension.NAME); } catch (CertificateException e) { } } @@ -70,7 +70,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet this(false, null); } - public ExtendedKeyUsageExtension(boolean crit, Vector oids) { + public ExtendedKeyUsageExtension(boolean crit, Vector<ObjectIdentifier> oids) { try { extensionId = ObjectIdentifier.getObjectIdentifier(OID); } catch (IOException e) { @@ -78,9 +78,9 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet } critical = crit; if (oids != null) { - oidSet = (Vector) oids.clone(); + oidSet = new Vector<ObjectIdentifier>(oids); } else { - oidSet = new Vector(); + oidSet = new Vector<ObjectIdentifier>(); } encodeExtValue(); } @@ -100,7 +100,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet } } - public Enumeration getOIDs() { + public Enumeration<ObjectIdentifier> getOIDs() { if (oidSet == null) return null; return oidSet.elements(); @@ -114,7 +114,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet public void addOID(ObjectIdentifier oid) { if (oidSet == null) { - oidSet = new Vector(); + oidSet = new Vector<ObjectIdentifier>(); } if (oidSet.contains(oid)) @@ -172,7 +172,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } @@ -192,7 +192,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet throw new IOException("Invalid encoding of AuthInfoAccess extension"); } if (oidSet == null) - oidSet = new Vector(); + oidSet = new Vector<ObjectIdentifier>(); while (val.data.available() != 0) { DerValue oidVal = val.data.getDerValue(); @@ -205,7 +205,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet DerOutputStream temp = new DerOutputStream(); if (!oidSet.isEmpty()) { - Enumeration oidList = oidSet.elements(); + Enumeration<ObjectIdentifier> oidList = oidSet.elements(); try { while (oidList.hasMoreElements()) { diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java index 617ebacd8..6e28b4a0e 100644 --- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -34,7 +34,6 @@ import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; - import netscape.security.x509.CertAttrSet; import netscape.security.x509.Extension; import netscape.security.x509.OIDMap; @@ -73,9 +72,9 @@ public class GenericASN1Extension extends Extension * Identifier for this attribute, to be used with the * get, set, delete methods of Certificate, x509 type. */ - public static String NAME = null; + private String name; public static String OID = null; - public static Hashtable mConfig = null; + public static Hashtable<String, String> mConfig = null; public static String pattern = null; private int index = 0; @@ -177,10 +176,11 @@ public class GenericASN1Extension extends Extension * * @param the values to be set for the extension. */ - public GenericASN1Extension(String name, String oid, String pattern, boolean critical, Hashtable config) + public GenericASN1Extension(String name, String oid, String pattern, boolean critical, + Hashtable<String, String> config) throws IOException, ParseException { ObjectIdentifier tmpid = new ObjectIdentifier(oid); - NAME = name; + this.name = name; OID = oid; mConfig = config; this.pattern = pattern; @@ -202,17 +202,17 @@ public class GenericASN1Extension extends Extension * * @param the values to be set for the extension. */ - public GenericASN1Extension(Hashtable config) + public GenericASN1Extension(Hashtable<String, String> config) throws IOException, ParseException { mConfig = config; ObjectIdentifier tmpid = new ObjectIdentifier((String) mConfig.get(PROP_OID)); - NAME = (String) mConfig.get(PROP_NAME); + name = (String) mConfig.get(PROP_NAME); OID = (String) mConfig.get(PROP_OID); pattern = (String) mConfig.get(PROP_PATTERN); try { if (OIDMap.getName(tmpid) == null) - OIDMap.addAttribute("GenericASN1Extension", OID, NAME); + OIDMap.addAttribute("GenericASN1Extension", OID, name); } catch (CertificateException e) { } @@ -311,14 +311,14 @@ public class GenericASN1Extension extends Extension * Return the name of this attribute. */ public String getName() { - return (NAME); + return name; } /** * Set the name of this attribute. */ public void setName(String name) { - NAME = name; + this.name = name; } /** @@ -339,7 +339,7 @@ public class GenericASN1Extension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement("octet"); diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java index a09e089c3..81b8cf5b5 100644 --- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -131,7 +131,7 @@ public class InhibitAnyPolicyExtension return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/pki/base/util/src/netscape/security/extensions/KerberosName.java index 269775d31..0a6a6e213 100644 --- a/pki/base/util/src/netscape/security/extensions/KerberosName.java +++ b/pki/base/util/src/netscape/security/extensions/KerberosName.java @@ -53,9 +53,9 @@ public class KerberosName { private String m_realm = null; private int m_name_type = 0; - private Vector m_name_strings = null; + private Vector<String> m_name_strings = null; - public KerberosName(String realm, int name_type, Vector name_strings) { + public KerberosName(String realm, int name_type, Vector<String> name_strings) { m_realm = realm; m_name_type = name_type; m_name_strings = name_strings; @@ -119,7 +119,7 @@ public class KerberosName { } public static void main(String[] argv) { - Vector strings = new Vector(); + Vector<String> strings = new Vector<String>(); strings.addElement("name"); KerberosName k = new KerberosName("realm", 0, strings); diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java index 1415478bb..04b3038e5 100644 --- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -114,7 +114,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { new MapEntry(OBJECT_SIGNING_CA, 7), }; - private static Vector mAttributeNames = new Vector(); + private static Vector<String> mAttributeNames = new Vector<String>(); static { for (int i = 0; i < mMapData.length; ++i) { @@ -361,7 +361,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return mAttributeNames.elements(); } diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index 46abc3c1f..28da8085f 100644 --- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -137,7 +137,7 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet { return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java index 1dafed19a..a90abe7e3 100644 --- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -230,7 +230,7 @@ public class PresenceServerExtension extends Extension implements CertAttrSet { throw new IOException("Method not to be called directly."); } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index 2e9d7935d..d78ad0344 100644 --- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -44,9 +44,6 @@ import netscape.security.x509.URIName; * @version $Revision$, $Date$ */ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet { - /** - * - */ private static final long serialVersionUID = 7237321566602583325L; public static final String NAME = "SubjectInfoAccessExtension"; @@ -62,7 +59,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet public static final int OID[] = { 1, 3, 6, 1, 5, 5, 7, 1, 11 }; public static final ObjectIdentifier ID = new ObjectIdentifier(OID); - private Vector mDesc = new Vector(); + private Vector<AccessDescription> mDesc = new Vector<AccessDescription>(); /** * Create the extension from the passed DER encoded value of the same. @@ -118,7 +115,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } @@ -141,7 +138,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet } public AccessDescription getAccessDescription(int pos) { - return (AccessDescription) mDesc.elementAt(pos); + return mDesc.elementAt(pos); } /** @@ -172,7 +169,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet for (int i = 0; i < mDesc.size(); i++) { DerOutputStream tmp0 = new DerOutputStream(); - AccessDescription ad = (AccessDescription) mDesc.elementAt(i); + AccessDescription ad = mDesc.elementAt(i); tmp0.putOID(ad.getMethod()); ad.getLocation().encode(tmp0); @@ -205,7 +202,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet String s = super.toString() + "AuthInfoAccess [\n"; for (int i = 0; i < mDesc.size(); i++) { - AccessDescription ad = (AccessDescription) mDesc.elementAt(i); + AccessDescription ad = mDesc.elementAt(i); s += "(" + i + ")"; s += " "; diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java index 520b3e969..a649c395a 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java @@ -114,17 +114,18 @@ public class PKCS10Attribute implements DerEncoder, Serializable { } } byte[] val = inAttrValue.toByteArray(); - Class[] params = { Object.class }; + Class<?>[] params = { Object.class }; try { - Class extClass = OIDMap.getClass(attributeId); + @SuppressWarnings("unchecked") + Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(attributeId); if (extClass != null) { - Constructor cons = extClass.getConstructor(params); + Constructor<CertAttrSet> cons = (Constructor<CertAttrSet>) extClass.getConstructor(params); Object value = Array.newInstance(byte.class, val.length); for (int i = 0; i < val.length; i++) { Array.setByte(value, i, val[i]); } Object[] passed = new Object[] { value }; - attributeValue = (CertAttrSet) cons.newInstance(passed); + attributeValue = cons.newInstance(passed); } else { // attribute classes are usable for PKCS10 attributes. // this is used where the attributes are not actual diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java index ef0f6a481..6a6fd7dc9 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -100,7 +100,8 @@ public class PKCS9Attribute implements DerEncoder { * attributes to their OIDs. This table contains all name forms * that occur in PKCS9, in lower case. */ - private static final Hashtable NAME_OID_TABLE = new Hashtable(28); + private static final Hashtable<String, ObjectIdentifier> NAME_OID_TABLE = new Hashtable<String, ObjectIdentifier>( + 28); static { // static initializer for PCKS9_NAMES NAME_OID_TABLE.put("emailaddress", PKCS9_OIDS[1]); @@ -124,7 +125,8 @@ public class PKCS9Attribute implements DerEncoder { * Hashtable mapping attribute OIDs defined in PKCS9 to the * corresponding attribute value type. */ - private static final Hashtable OID_NAME_TABLE = new Hashtable(14); + private static final Hashtable<ObjectIdentifier, String> OID_NAME_TABLE = new Hashtable<ObjectIdentifier, String>( + 14); static { OID_NAME_TABLE.put(PKCS9_OIDS[1], EMAIL_ADDRESS_STR); OID_NAME_TABLE.put(PKCS9_OIDS[2], UNSTRUCTURED_NAME_STR); @@ -167,7 +169,7 @@ public class PKCS9Attribute implements DerEncoder { null, //PublicKey null, //SigningDescription { Byte.valueOf(DerValue.tag_Sequence) } //ExtensionRequest - }; + }; /** * Class types required for values for a given PKCS9 @@ -286,35 +288,25 @@ public class PKCS9Attribute implements DerEncoder { * * </TABLE> */ - private static final Class[] VALUE_CLASSES = new Class[15]; + private static final Class<?>[] VALUE_CLASSES = new Class[15]; static { - try { - Class str = Class.forName("[Ljava.lang.String;"); - - VALUE_CLASSES[0] = null; // not used - VALUE_CLASSES[1] = str; // EMailAddress - VALUE_CLASSES[2] = str; // UnstructuredName - VALUE_CLASSES[3] = // ContentType - Class.forName("netscape.security.util.ObjectIdentifier"); - VALUE_CLASSES[4] = Class.forName("[B"); // MessageDigest (byte[]) - VALUE_CLASSES[5] = Class.forName("java.util.Date"); // SigningTime - VALUE_CLASSES[6] = // Countersignature - Class.forName("[Lnetscape.security.pkcs.SignerInfo;"); - VALUE_CLASSES[7] = // ChallengePassword - Class.forName("java.lang.String"); - VALUE_CLASSES[8] = str; // UnstructuredAddress - VALUE_CLASSES[9] = null; // ExtendedCertificateAttributes - - VALUE_CLASSES[10] = null; // IssuerAndSerialNumber - VALUE_CLASSES[11] = null; // PasswordCheck - VALUE_CLASSES[12] = null; // PublicKey - VALUE_CLASSES[13] = null; // SigningDescription - VALUE_CLASSES[14] = // ExtensionRequest - Class.forName("netscape.security.x509.CertificateExtensions"); //xxxx - } catch (ClassNotFoundException e) { - throw new ExceptionInInitializerError(e.toString()); - } + VALUE_CLASSES[0] = null; // not used + VALUE_CLASSES[1] = String[].class; // EMailAddress + VALUE_CLASSES[2] = String[].class; // UnstructuredName + VALUE_CLASSES[3] = ObjectIdentifier.class; // ContentType + VALUE_CLASSES[4] = byte[].class; // MessageDigest (byte[]) + VALUE_CLASSES[5] = Date.class; // SigningTime + VALUE_CLASSES[6] = SignerInfo[].class; // Countersignature + VALUE_CLASSES[7] = String.class; // ChallengePassword + VALUE_CLASSES[8] = String[].class; // UnstructuredAddress + VALUE_CLASSES[9] = null; // ExtendedCertificateAttributes + + VALUE_CLASSES[10] = null; // IssuerAndSerialNumber + VALUE_CLASSES[11] = null; // PasswordCheck + VALUE_CLASSES[12] = null; // PublicKey + VALUE_CLASSES[13] = null; // SigningDescription + VALUE_CLASSES[14] = CertificateExtensions.class; // ExtensionRequest } /** diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java index 4c5ab00d8..9780983a5 100644 --- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java +++ b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java @@ -36,7 +36,7 @@ public class X509CertificateFactory extends CertificateFactorySpi { return new X509CertImpl(inStream); } - public Collection engineGenerateCertificates(InputStream inStream) + public Collection<Certificate> engineGenerateCertificates(InputStream inStream) throws CertificateException { return null; } @@ -53,7 +53,7 @@ public class X509CertificateFactory extends CertificateFactorySpi { return crl; } - public Collection engineGenerateCRLs(InputStream inStream) + public Collection<CRL> engineGenerateCRLs(InputStream inStream) throws CRLException { return null; } diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java index 86449c232..3a8c65fd0 100644 --- a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -125,8 +125,8 @@ public class CertPrettyPrint { SET certs = sd.getCertificates(); for (int i = 0; i < certs.size(); i++) { - org.mozilla.jss.pkix.cert.Certificate cert = (org.mozilla.jss.pkix.cert.Certificate) certs - .elementAt(i); + org.mozilla.jss.pkix.cert.Certificate cert = + (org.mozilla.jss.pkix.cert.Certificate) certs.elementAt(i); X509CertImpl certImpl = null; try { certImpl = new X509CertImpl( diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java index afb5d352a..edf1217ea 100644 --- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -26,7 +26,7 @@ import java.util.TimeZone; import netscape.security.x509.CRLExtensions; import netscape.security.x509.Extension; -import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.RevokedCertificate; import netscape.security.x509.X509CRLImpl; /** @@ -174,15 +174,14 @@ public class CrlPrettyPrint { } sb.append("\n"); - Set revokedCerts = mCRL.getRevokedCertificates(); + Set<RevokedCertificate> revokedCerts = mCRL.getRevokedCertificates(); if (revokedCerts != null) { - Iterator i = revokedCerts.iterator(); + Iterator<RevokedCertificate> i = revokedCerts.iterator(); long l = 1; while ((i.hasNext()) && ((crlSize == 0) || (pageStart + pageSize > l))) { - RevokedCertImpl revokedCert = - (RevokedCertImpl) i.next(); + RevokedCertificate revokedCert = i.next(); if ((crlSize == 0) || ((pageStart <= l) && (pageStart + pageSize > l))) { sb.append(pp.indent(16) + resource.getString( diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java index 51ddf2321..90d0d094f 100644 --- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -504,7 +504,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString( PrettyPrintResources.TOKEN_EXTENDED_KEY_USAGE) + "\n"); ExtendedKeyUsageExtension usage = (ExtendedKeyUsageExtension) mExt; - Enumeration e = usage.getOIDs(); + Enumeration<ObjectIdentifier> e = usage.getOIDs(); if (e != null) { while (e.hasMoreElements()) { @@ -589,8 +589,8 @@ public class ExtPrettyPrint { try { sb.append(pp.indent(mIndentSize) + mResource.getString(PrettyPrintResources.TOKEN_IDENTIFIER)); - sb.append(mResource.getString(PrettyPrintResources.TOKEN_CERT_TYPE) + "- " - + mExt.getExtensionId().toString() + "\n"); + sb.append(mResource.getString(PrettyPrintResources.TOKEN_CERT_TYPE) + + "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); @@ -619,8 +619,8 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 8) + mResource.getString(NSCertTypeExtension.EMAIL_CA) + "\n"); } if (((Boolean) type.get(NSCertTypeExtension.OBJECT_SIGNING_CA)).booleanValue()) { - sb.append(pp.indent(mIndentSize + 8) + mResource.getString(NSCertTypeExtension.OBJECT_SIGNING_CA) - + "\n"); + sb.append(pp.indent(mIndentSize + 8) + + mResource.getString(NSCertTypeExtension.OBJECT_SIGNING_CA) + "\n"); } return sb.toString(); } catch (Exception e) { @@ -637,8 +637,8 @@ public class ExtPrettyPrint { try { sb.append(pp.indent(mIndentSize) + mResource.getString(PrettyPrintResources.TOKEN_IDENTIFIER)); - sb.append(mResource.getString(PrettyPrintResources.TOKEN_SKI) + "- " + mExt.getExtensionId().toString() - + "\n"); + sb.append(mResource.getString(PrettyPrintResources.TOKEN_SKI) + + "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); @@ -666,8 +666,8 @@ public class ExtPrettyPrint { try { sb.append(pp.indent(mIndentSize) + mResource.getString(PrettyPrintResources.TOKEN_IDENTIFIER)); - sb.append(mResource.getString(PrettyPrintResources.TOKEN_AKI) + "- " + mExt.getExtensionId().toString() - + "\n"); + sb.append(mResource.getString(PrettyPrintResources.TOKEN_AKI) + + "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); @@ -973,12 +973,12 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); CertificateScopeOfUseExtension ext = (CertificateScopeOfUseExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); } - Vector entries = ext.getCertificateScopeEntries(); + Vector<CertificateScopeEntry> entries = ext.getCertificateScopeEntries(); if (entries != null) { sb.append(pp.indent(mIndentSize + 4) + @@ -1474,7 +1474,7 @@ public class ExtPrettyPrint { } PolicyMappingsExtension ext = (PolicyMappingsExtension) mExt; - Enumeration maps = ext.getMappings(); + Enumeration<CertificatePolicyMap> maps = ext.getMappings(); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_MAPPINGS)); @@ -1530,7 +1530,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_ATTRIBUTES)); - Enumeration attrs = ext.getAttributesList(); + Enumeration<Attribute> attrs = ext.getAttributesList(); if (attrs == null || !attrs.hasMoreElements()) { sb.append( @@ -1550,7 +1550,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 12) + mResource.getString( PrettyPrintResources.TOKEN_VALUES)); - Enumeration values = attr.getValues(); + Enumeration<String> values = attr.getValues(); if (values == null || !values.hasMoreElements()) { sb.append(mResource.getString( @@ -1593,15 +1593,16 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString( PrettyPrintResources.TOKEN_CERT_POLICIES) + "\n"); CertificatePoliciesExtension cp = (CertificatePoliciesExtension) mExt; - Vector cpv = (Vector) cp.get("infos"); - Enumeration e = cpv.elements(); + @SuppressWarnings("unchecked") + Vector<CertificatePolicyInfo> cpv = (Vector<CertificatePolicyInfo>) cp.get("infos"); + Enumeration<CertificatePolicyInfo> e = cpv.elements(); if (e != null) { while (e.hasMoreElements()) { - CertificatePolicyInfo cpi = (CertificatePolicyInfo) e.nextElement(); + CertificatePolicyInfo cpi = e.nextElement(); - sb.append(pp.indent(mIndentSize + 8) + "Policy Identifier: " - + cpi.getPolicyIdentifier().getIdentifier().toString() + "\n"); + sb.append(pp.indent(mIndentSize + 8) + + "Policy Identifier: " + cpi.getPolicyIdentifier().getIdentifier().toString() + "\n"); PolicyQualifiers cpq = cpi.getPolicyQualifiers(); if (cpq != null) { for (int i = 0; i < cpq.size(); i++) { @@ -1611,8 +1612,8 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Identifier: CPS Pointer Qualifier - " + pq.getId() + "\n"); - sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Data: " - + ((CPSuri) q).getURI() + "\n"); + sb.append(pp.indent(mIndentSize + 12) + + "Policy Qualifier Data: " + ((CPSuri) q).getURI() + "\n"); } else if (q instanceof UserNotice) { sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Identifier: CPS User Notice Qualifier - " @@ -1621,8 +1622,8 @@ public class ExtPrettyPrint { DisplayText dt = ((UserNotice) q).getDisplayText(); sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Data: \n"); if (nref != null) { - sb.append(pp.indent(mIndentSize + 16) + "Organization: " - + nref.getOrganization().toString() + "\n"); + sb.append(pp.indent(mIndentSize + 16) + + "Organization: " + nref.getOrganization().toString() + "\n"); sb.append(pp.indent(mIndentSize + 16) + "Notice Numbers: "); int[] nums = nref.getNumbers(); for (int k = 0; k < nums.length; k++) { diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java index 57d9445c3..8a757d7f5 100755 --- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -126,7 +126,7 @@ public class ACertAttrSet implements CertAttrSet { * * @return an enumeration of the attribute names. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/pki/base/util/src/netscape/security/x509/AlgorithmId.java index a30d45ca0..b0113af41 100644 --- a/pki/base/util/src/netscape/security/x509/AlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/AlgorithmId.java @@ -760,7 +760,8 @@ public class AlgorithmId implements Serializable, DerEncoder { * All supported signing algorithms. */ public static final String[] ALL_SIGNING_ALGORITHMS = new String[] - { "SHA1withRSA", "MD5withRSA", "MD2withRSA", "SHA1withDSA", "SHA256withRSA", "SHA512withRSA", "SHA1withEC", + { + "SHA1withRSA", "MD5withRSA", "MD2withRSA", "SHA1withDSA", "SHA256withRSA", "SHA512withRSA", "SHA1withEC", "SHA256withEC", "SHA384withEC", "SHA512withEC" }; } diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index b7f84f9f7..91b6c2598 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -322,7 +322,7 @@ public class AuthorityKeyIdentifierExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); elements.addElement(AUTH_NAME); diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 5846296d1..2688e961d 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -278,7 +278,7 @@ public class BasicConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(IS_CA); elements.addElement(PATH_LEN); diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index a15c1099f..c939a7431 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -227,8 +227,11 @@ public class CRLDistributionPointsExtension extends Extension "CertAttrSet:CRLDistributionPointsExtension"); } - public Enumeration getElements() { - return (new Vector()).elements(); + /* + * TODO use an empty collection to generate these + */ + public Enumeration<String> getAttributeNames() { + return (new Vector<String>()).elements(); } public String getName() { diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index e3965753c..7c89b179f 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -211,7 +211,7 @@ public class CRLNumberExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 22fbe894f..3c11fc70b 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -207,7 +207,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(REASON); diff --git a/pki/base/util/src/netscape/security/x509/CertAttrSet.java b/pki/base/util/src/netscape/security/x509/CertAttrSet.java index 958432668..7e8d6db82 100755 --- a/pki/base/util/src/netscape/security/x509/CertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/CertAttrSet.java @@ -109,7 +109,7 @@ public interface CertAttrSet { * * @return an enumeration of the attribute names. */ - Enumeration getElements(); + Enumeration<String> getAttributeNames(); /** * Returns the name (identifier) of this CertAttrSet. diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 1105dc4fd..41610844e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -174,7 +174,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 7cd2b73c6..b9667d8f6 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -43,7 +43,7 @@ import netscape.security.util.DerValue; * @version 1.11 * @see CertAttrSet */ -public class CertificateExtensions extends Vector +public class CertificateExtensions extends Vector<Extension> implements CertAttrSet, Serializable { /** * @@ -59,12 +59,13 @@ public class CertificateExtensions extends Vector */ public static final String NAME = "extensions"; - private Hashtable<String, Object> map; + private Hashtable<String, Extension> map; // Parse the encoded extension public void parseExtension(Extension ext) throws IOException { try { - Class extClass = OIDMap.getClass(ext.getExtensionId()); + @SuppressWarnings("unchecked") + Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -75,8 +76,8 @@ public class CertificateExtensions extends Vector return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<CertAttrSet> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -87,7 +88,7 @@ public class CertificateExtensions extends Vector } Object[] passed = new Object[] { new Boolean(ext.isCritical()), value }; - CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); + CertAttrSet certExt = cons.newInstance(passed); if (certExt != null && certExt.getName() != null) { map.put(certExt.getName(), (Extension) certExt); addElement((Extension) certExt); @@ -105,7 +106,7 @@ public class CertificateExtensions extends Vector * Default constructor for the certificate attribute. */ public CertificateExtensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -117,7 +118,7 @@ public class CertificateExtensions extends Vector public CertificateExtensions(DerInputStream in) throws IOException { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = in.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -136,7 +137,7 @@ public class CertificateExtensions 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++) { @@ -160,7 +161,7 @@ public class CertificateExtensions extends Vector str = val.toDerInputStream(); } - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -217,8 +218,8 @@ public class CertificateExtensions extends Vector * @exception IOException if the object could not be cached. */ public void set(String name, Object obj) throws IOException { - map.put(name, obj); - addElement(obj); + map.put(name, (Extension) obj); + addElement((Extension) obj); } /** @@ -250,7 +251,7 @@ public class CertificateExtensions extends Vector removeElement(obj); } - public Enumeration getNames() { + public Enumeration<String> getNames() { return map.keys(); } @@ -258,10 +259,14 @@ public class CertificateExtensions extends Vector * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<Extension> getAttributes() { return (map.elements()); } + public Enumeration<String> getAttributeNames() { + return (map.keys()); + } + /** * Return the name of this attribute. */ diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index 490c087bb..774116bcc 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -226,7 +226,7 @@ public class CertificateIssuerExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(CERTIFICATE_ISSUER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index 83bea856c..a2f9026c1 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -156,7 +156,7 @@ public class CertificateIssuerName implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index f54b1e0b9..351116ffb 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -169,7 +169,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ID); diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index d4e1cf86a..1c72e7fa3 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.Collections; import java.util.Enumeration; import java.util.Vector; @@ -221,15 +223,23 @@ public class CertificatePoliciesExtension extends Extension } /** - * Return an enumeration of names of attributes existing within this + * Return an enumeration of attributes existing within this * attribute. */ - public Enumeration<Vector<CertificatePolicyInfo>> getElements() { + public Enumeration<Vector<CertificatePolicyInfo>> getAttributes() { Vector<Vector<CertificatePolicyInfo>> elements = new Vector<Vector<CertificatePolicyInfo>>(); elements.addElement(mInfos); return (elements.elements()); } + private static final String[] NAMES = { INFOS }; + + @Override + public Enumeration<String> getAttributeNames() { + // TODO Auto-generated method stub + return Collections.enumeration(Arrays.asList(NAMES)); + } + /** * Return the name of this attribute. */ @@ -322,4 +332,5 @@ public class CertificatePoliciesExtension extends Extension System.out.println(e.toString()); } } + } diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java index de1e794d5..e9655178f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -175,7 +175,7 @@ public class CertificateSerialNumber implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java index 227dc41e1..6159638b9 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -187,7 +187,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index c8e06fb38..51687e86d 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -169,7 +169,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ID); diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java index c54da58b2..0c2c841b0 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -247,7 +247,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 9b976e202..d3659779f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java @@ -224,7 +224,7 @@ public class CertificateVersion implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java index 58c18f084..c7003bb8e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -174,7 +174,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY); diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index 6e8f9fa02..da870f4fd 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -224,7 +224,7 @@ public class DeltaCRLIndicatorExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java index 63856300e..622367ab6 100644 --- a/pki/base/util/src/netscape/security/x509/Extensions.java +++ b/pki/base/util/src/netscape/security/x509/Extensions.java @@ -40,7 +40,7 @@ import netscape.security.util.DerValue; * @version 1.11 * @see CertAttrSet */ -public class Extensions extends Vector +public class Extensions extends Vector<Extension> implements CertAttrSet { /** * @@ -56,12 +56,13 @@ public class Extensions extends Vector */ public static final String NAME = "extensions"; - private Hashtable map; + private Hashtable<String, Extension> map; // Parse the encoded extension public void parseExtension(Extension ext) throws IOException { try { - Class extClass = OIDMap.getClass(ext.getExtensionId()); + @SuppressWarnings("unchecked") + Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -72,8 +73,8 @@ public class Extensions extends Vector return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<CertAttrSet> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -84,9 +85,9 @@ public class Extensions extends Vector } Object[] passed = new Object[] { new Boolean(ext.isCritical()), value }; - CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); - map.put(certExt.getName(), certExt); - addElement(certExt); + CertAttrSet certExt = cons.newInstance(passed); + map.put(certExt.getName(), (Extension) certExt); + addElement((Extension) certExt); } catch (NoSuchMethodException nosuch) { throw new IOException(nosuch.toString()); @@ -101,7 +102,7 @@ public class Extensions extends Vector * Default constructor for the certificate attribute. */ public Extensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -113,7 +114,7 @@ public class Extensions extends Vector public Extensions(DerInputStream in) throws IOException { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = in.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -132,7 +133,7 @@ public class Extensions 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++) { @@ -175,8 +176,8 @@ public class Extensions extends Vector * @exception IOException if the object could not be cached. */ public void set(String name, Object obj) throws IOException { - map.put(name, obj); - addElement(obj); + map.put(name, (Extension) obj); + addElement((Extension) obj); } /** @@ -212,8 +213,8 @@ public class Extensions extends Vector * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - return (map.elements()); + public Enumeration<String> getAttributeNames() { + return map.keys(); } /** diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index 5d7bd50b6..320bbf3df 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -233,8 +233,11 @@ public class FreshestCRLExtension extends Extension "CertAttrSet:FreshestCRLExtension"); } - public Enumeration getElements() { - return (new Vector()).elements(); + /* + * TODO replacewith empty collection + */ + public Enumeration<String> getAttributeNames() { + return (new Vector<String>()).elements(); } public String getName() { diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index 80324f8d8..b42bb6ac9 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -339,7 +339,7 @@ public class HoldInstructionExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 73e76087f..44c76275f 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -226,7 +226,7 @@ public class InvalidityDateExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 a21d3ac32..df0289f9e 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -224,7 +224,7 @@ public class IssuerAlternativeNameExtension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ISSUER_NAME); diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 9eb9d14a9..fc7e837ce 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -340,7 +340,7 @@ public class IssuingDistributionPointExtension extends Extension } } - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ISSUING_DISTRIBUTION_POINT); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 043208806..56084dbcf 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -386,7 +386,7 @@ public class KeyUsageExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DIGITAL_SIGNATURE); elements.addElement(NON_REPUDIATION); diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index 5ac3357ce..b24ce1158 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -58,7 +58,7 @@ public class NSCCommentExtension extends Extension public String mComment = null; // Private data members - private Vector mInfos; + private Vector<Object> mInfos; private PrettyPrintFormat pp = new PrettyPrintFormat(":"); @@ -90,7 +90,7 @@ public class NSCCommentExtension extends Extension public NSCCommentExtension(boolean critical) { this.extensionId = new ObjectIdentifier("2.16.840.1.113730.1.13"); this.critical = critical; - mInfos = new Vector(1, 1); + mInfos = new Vector<Object>(1, 1); } /** @@ -171,6 +171,7 @@ public class NSCCommentExtension extends Extension /** * Set the attribute value. */ + @SuppressWarnings("unchecked") public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(INFOS)) { @@ -178,7 +179,7 @@ public class NSCCommentExtension extends Extension throw new IOException("Attribute value should be of" + " type Vector."); } - mInfos = (Vector) obj; + mInfos = (Vector<Object>) obj; } else { throw new IOException("Attribute name not recognized by " + "CertAttrSet:NSCCommentExtension."); @@ -213,9 +214,9 @@ public class NSCCommentExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - Vector elements = new Vector(); - elements.addElement(mInfos); + public Enumeration<String> getAttributeNames() { + Vector<String> elements = new Vector<String>(); + elements.addElement(INFOS); 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 d3ca8c116..948d0d8c9 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -298,7 +298,7 @@ public class NameConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(PERMITTED_SUBTREES); elements.addElement(EXCLUDED_SUBTREES); diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java index d97d060ba..9c732d938 100644 --- a/pki/base/util/src/netscape/security/x509/OIDMap.java +++ b/pki/base/util/src/netscape/security/x509/OIDMap.java @@ -78,13 +78,13 @@ public class OIDMap { private static final String POLICY_CONSTRAINTS = ROOT + "." + PolicyConstraintsExtension.NAME; private static final String CERT_POLICIES = //ROOT + "." + - CertificatePoliciesExtension.NAME; + CertificatePoliciesExtension.NAME; private static final String SUBJ_DIR_ATTR = //ROOT + "." + - SubjectDirAttributesExtension.NAME; + SubjectDirAttributesExtension.NAME; public static final String EXT_KEY_USAGE_NAME = "ExtendedKeyUsageExtension"; public static final String EXT_INHIBIT_ANY_POLICY_NAME = "InhibitAnyPolicyExtension"; private static final String EXT_KEY_USAGE = //ROOT + "." + - EXT_KEY_USAGE_NAME; + EXT_KEY_USAGE_NAME; private static final String CRL_NUMBER = ROOT + "." + CRLNumberExtension.NAME; diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 194903dd5..7d98b21ba 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -275,7 +275,7 @@ public class PolicyConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 6f2e583bc..9bdfb611b 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -190,6 +190,7 @@ public class PolicyMappingsExtension extends Extension /** * Set the attribute value. */ + @SuppressWarnings("unchecked") public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(MAP)) { @@ -232,7 +233,7 @@ public class PolicyMappingsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(MAP); diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index a38443644..e3ecdb33d 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -322,7 +322,7 @@ public class PrivateKeyUsageExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NOT_BEFORE); elements.addElement(NOT_AFTER); diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index 3271768f7..345694fb1 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -66,13 +66,13 @@ import netscape.security.util.ObjectIdentifier; * @version 1.6 97/12/10 */ -public class RevokedCertImpl extends RevokedCertificate - implements Serializable { +public class RevokedCertImpl extends RevokedCertificate implements Serializable { /** * */ private static final long serialVersionUID = -3449642360223397701L; + private SerialNumber serialNumber; private Date revocationDate; private CRLExtensions extensions = null; @@ -86,11 +86,13 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Constructs a revoked certificate entry using the - * serial number and revocation date. + * Constructs a revoked certificate entry using the serial number and + * revocation date. * - * @param num the serial number of the revoked certificate. - * @param date the Date on which revocation took place. + * @param num + * the serial number of the revoked certificate. + * @param date + * the Date on which revocation took place. */ public RevokedCertImpl(BigInteger num, Date date) { this.serialNumber = new SerialNumber(num); @@ -98,16 +100,17 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Constructs a revoked certificate entry using the - * serial number, revocation date and the entry - * extensions. + * Constructs a revoked certificate entry using the serial number, + * revocation date and the entry extensions. * - * @param num the serial number of the revoked certificate. - * @param date the Date on which revocation took place. - * @param crlEntryExts the extensions for this entry. + * @param num + * the serial number of the revoked certificate. + * @param date + * the Date on which revocation took place. + * @param crlEntryExts + * the extensions for this entry. */ - public RevokedCertImpl(BigInteger num, Date date, - CRLExtensions crlEntryExts) { + public RevokedCertImpl(BigInteger num, Date date, CRLExtensions crlEntryExts) { this.serialNumber = new SerialNumber(num); this.revocationDate = date; this.extensions = crlEntryExts; @@ -120,7 +123,7 @@ public class RevokedCertImpl extends RevokedCertificate try { encode(os); } catch (Exception e) { - // revokedCert = null; + // revokedCert = null; } revokedCert = os.toByteArray(); } @@ -135,7 +138,8 @@ public class RevokedCertImpl extends RevokedCertificate /** * Sets extensions for this impl. * - * @param crlEntryExts CRLExtensions + * @param crlEntryExts + * CRLExtensions */ public void setExtensions(CRLExtensions crlEntryExts) { this.extensions = crlEntryExts; @@ -144,12 +148,15 @@ public class RevokedCertImpl extends RevokedCertificate /** * Unmarshals a revoked certificate from its encoded form. * - * @param revokedCert the encoded bytes. - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param revokedCert + * the encoded bytes. + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public RevokedCertImpl(byte[] revokedCert) - throws CRLException, X509ExtensionException { + public RevokedCertImpl(byte[] revokedCert) throws CRLException, + X509ExtensionException { try { DerValue derValue = new DerValue(revokedCert); parse(derValue); @@ -161,21 +168,23 @@ public class RevokedCertImpl extends RevokedCertificate /** * Unmarshals a revoked certificate from its encoded form. * - * @param derValue the DER value containing the revoked certificate. - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param derValue + * the DER value containing the revoked certificate. + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public RevokedCertImpl(DerValue derValue) - throws CRLException, X509ExtensionException { + public RevokedCertImpl(DerValue derValue) throws CRLException, + X509ExtensionException { parse(derValue); } /** - * Returns true if this revoked certificate entry has - * extensions, otherwise false. + * Returns true if this revoked certificate entry has extensions, otherwise + * false. * - * @return true if this CRL entry has extensions, otherwise - * false. + * @return true if this CRL entry has extensions, otherwise false. */ public boolean hasExtensions() { if (extensions == null) @@ -187,13 +196,15 @@ public class RevokedCertImpl extends RevokedCertificate /** * Decode a revoked certificate from an input stream. * - * @param inStrm an input stream holding at least one revoked - * certificate - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param inStrm + * an input stream holding at least one revoked certificate + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public void decode(InputStream inStrm) - throws CRLException, X509ExtensionException { + public void decode(InputStream inStrm) throws CRLException, + X509ExtensionException { try { DerValue derValue = new DerValue(inStrm); parse(derValue); @@ -205,13 +216,16 @@ public class RevokedCertImpl extends RevokedCertificate /** * Encodes the revoked certificate to an output stream. * - * @param outStrm an output stream to which the encoded revoked - * certificate is written. - * @exception CRLException on encoding errors. - * @exception X509ExtensionException on extension handling errors. + * @param outStrm + * an output stream to which the encoded revoked certificate is + * written. + * @exception CRLException + * on encoding errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public void encode(DerOutputStream outStrm) - throws CRLException, X509ExtensionException { + public void encode(DerOutputStream outStrm) throws CRLException, + X509ExtensionException { try { if (revokedCert == null) { DerOutputStream tmp = new DerOutputStream(); @@ -236,8 +250,7 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Gets the serial number for this RevokedCertificate, - * the <em>userCertificate</em>. + * Gets the serial number for this RevokedCertificate, the <em>userCertificate</em>. * * @return the serial number. */ @@ -246,8 +259,7 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Gets the revocation date for this RevokedCertificate, - * the <em>revocationDate</em>. + * Gets the revocation date for this RevokedCertificate, the <em>revocationDate</em>. * * @return the revocation date. */ @@ -277,8 +289,8 @@ public class RevokedCertImpl extends RevokedCertificate if (extensions != null) { sb.append("\n"); for (int i = 0; i < extensions.size(); i++) - sb.append("Entry Extension[" + i + "]: " + - ((Extension) (extensions.elementAt(i))).toString()); + sb.append("Entry Extension[" + i + "]: " + + ((Extension) (extensions.elementAt(i))).toString()); } sb.append("\n"); return (sb.toString()); @@ -299,7 +311,7 @@ public class RevokedCertImpl extends RevokedCertificate for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -317,9 +329,9 @@ public class RevokedCertImpl extends RevokedCertificate Set<String> extSet = new LinkedHashSet<String>(); Extension ex; for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -348,7 +360,7 @@ public class RevokedCertImpl extends RevokedCertificate Extension ex = null; ObjectIdentifier inCertOID; for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { crlExt = ex; @@ -419,10 +431,9 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Serialization write ... X.509 certificates serialize as - * themselves, and they're parsed when they get read back. - * (Actually they serialize as some type data from the - * serialization subsystem, then the cert data.) + * Serialization write ... X.509 certificates serialize as themselves, and + * they're parsed when they get read back. (Actually they serialize as some + * type data from the serialization subsystem, then the cert data.) */ private synchronized void writeObject(ObjectOutputStream stream) throws CRLException, X509ExtensionException, IOException { @@ -432,8 +443,8 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Serialization read ... X.509 certificates serialize as - * themselves, and they're parsed when they get read back. + * Serialization read ... X.509 certificates serialize as themselves, and + * they're parsed when they get read back. */ private synchronized void readObject(ObjectInputStream stream) throws CRLException, X509ExtensionException, IOException { diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java index 64eed427e..2087d064a 100644 --- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -89,4 +89,7 @@ public abstract class RevokedCertificate extends X509CRLEntry { * @return a string representation of this revoked certificate. */ public abstract String toString(); + + public abstract CRLExtensions getExtensions(); + } diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index 779503e60..c30ae1576 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -226,7 +226,7 @@ public class SubjectAlternativeNameExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(SUBJECT_NAME); diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index 40e7a3f0d..b249ef600 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -263,7 +263,7 @@ public class SubjectDirAttributesExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { 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 fd22b20f0..ea0ebae82 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -206,7 +206,7 @@ public class SubjectKeyIdentifierExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java index 180ed9a5c..920b0e1e4 100644 --- a/pki/base/util/src/netscape/security/x509/X500Name.java +++ b/pki/base/util/src/netscape/security/x509/X500Name.java @@ -694,7 +694,7 @@ public class X500Name implements Principal, GeneralNameInterface { */ private static final int ipAddress_data[] = // SKIP - { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 }; + { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 }; /** OID for "IP=" IP address attributes, used with SKIP. */ public static final ObjectIdentifier ipAddress_oid = new ObjectIdentifier(ipAddress_data); diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java index aac89e21a..1c87c79b8 100644 --- a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -206,7 +206,8 @@ public class X500NameAttrMap { Hashtable<String, ObjectIdentifier> name2OID = new Hashtable<String, ObjectIdentifier>(); Hashtable<ObjectIdentifier, String> oid2Name = new Hashtable<ObjectIdentifier, String>(); - Hashtable<ObjectIdentifier, AVAValueConverter> oid2ValueConverter = new Hashtable<ObjectIdentifier, AVAValueConverter>(); + Hashtable<ObjectIdentifier, AVAValueConverter> oid2ValueConverter = + new Hashtable<ObjectIdentifier, AVAValueConverter>(); // // global defaults. diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index 360028734..d2d77cb3a 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -912,8 +912,8 @@ public class X509CertImpl extends X509Certificate return null; Set<String> extSet = new LinkedHashSet<String>(); Extension ex; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); if (ex.isCritical()) extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); } @@ -941,8 +941,8 @@ public class X509CertImpl extends X509Certificate Set<String> extSet = new LinkedHashSet<String>(); Extension ex; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); if (!ex.isCritical()) extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); } @@ -962,8 +962,8 @@ public class X509CertImpl extends X509Certificate Extension ex = null; ; ObjectIdentifier inCertOID; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { return ex; @@ -996,8 +996,8 @@ public class X509CertImpl extends X509Certificate Extension ex = null; ; ObjectIdentifier inCertOID; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { certExt = ex; diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java index 9dd43de3f..4777cd958 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -223,7 +223,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); elements.addElement(SERIAL_NUMBER); |