diff options
Diffstat (limited to 'pki/base/util')
59 files changed, 465 insertions, 622 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 e659da9b..29a1ffb3 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -954,10 +954,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(); @@ -979,9 +980,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 16406e2a..ae93d2b6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -26,6 +26,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; @@ -193,9 +195,9 @@ 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 *** // @@ -203,7 +205,7 @@ public class CRSPKIMessage { public void debug() { } - public void put(Object a, Object b) { + public void put(String a, Object b) { attrs.put(a, b); } @@ -612,11 +614,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; } @@ -725,11 +727,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 108dab07..5f21db5b 100644 --- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -64,11 +64,8 @@ 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"; public static final int OID_OCSP[] = { 1, 3, 6, 1, 5, 5, 7, 48, 1 }; @@ -82,7 +79,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. @@ -138,17 +135,11 @@ 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; } - /** - * Return the name of this attribute. - */ - public String getName() { - return NAME; - } /** * Adds Access Description. @@ -161,7 +152,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { } public AccessDescription getAccessDescription(int pos) { - return (AccessDescription) mDesc.elementAt(pos); + return mDesc.elementAt(pos); } /** @@ -192,7 +183,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); @@ -225,7 +216,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 634e2d57..8a1e0a6f 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -45,11 +45,7 @@ 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}; public static final ObjectIdentifier ID = new ObjectIdentifier(OID); @@ -79,10 +75,6 @@ public class CertificateRenewalWindowExtension extends Extension decodeThis(); } - public String getName() { - return NAME; - } - /** * Sets extension attribute. */ @@ -116,7 +108,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 b6b8a87a..b50e55d9 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; @@ -87,11 +87,7 @@ public class CertificateScopeOfUseExtension extends Extension decodeThis(); } - public String getName() { - return NAME; - } - - public Vector getCertificateScopeEntries() { + public Vector<CertificateScopeEntry> getCertificateScopeEntries() { return mEntries; } @@ -128,7 +124,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 +135,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 71ff031f..73602f6b 100644 --- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -43,7 +43,6 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet */ private static final long serialVersionUID = 765403075764697489L; public static final String OID = "2.5.29.37"; - public static final String NAME = OIDMap.EXT_KEY_USAGE_NAME; public static final String OID_OCSPSigning = "1.3.6.1.5.5.7.3.9"; public static final String OID_CODESigning = "1.3.6.1.5.5.7.3.3"; @@ -57,13 +56,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.class.getSimpleName()); } catch (CertificateException e) { } } @@ -72,7 +71,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) { @@ -80,9 +79,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(); } @@ -102,7 +101,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet } } - public Enumeration getOIDs() { + public Enumeration<ObjectIdentifier> getOIDs() { if (oidSet == null) return null; return oidSet.elements(); @@ -116,7 +115,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)) return; @@ -173,13 +172,10 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } - public String getName() { - return NAME; - } public void delete(String name) throws CertificateException, IOException { @@ -194,7 +190,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet ); } if (oidSet == null) - oidSet = new Vector(); + oidSet = new Vector<ObjectIdentifier>(); while (val.data.available() != 0) { DerValue oidVal = val.data.getDerValue(); @@ -207,7 +203,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 bd0fd7e1..9caa8dc8 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; @@ -75,12 +74,13 @@ implements CertAttrSet { * 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; + // Encode this value private void encodeThis() throws IOException, ParseException @@ -191,11 +191,11 @@ implements CertAttrSet { * * @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; @@ -216,18 +216,18 @@ implements CertAttrSet { * * @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); + this.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, this.name); } catch (CertificateException e) {} this.extensionId = tmpid; @@ -323,17 +323,12 @@ implements CertAttrSet { out.write(tmp.toByteArray()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } + /** * Set the name of this attribute. */ public void setName (String name) { - NAME = name; + this.name = name; } /** * Return the OID of this attribute. @@ -351,7 +346,7 @@ implements CertAttrSet { * 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 626d126b..ce1268ad 100644 --- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -51,14 +51,13 @@ public class InhibitAnyPolicyExtension */ private static final long serialVersionUID = -8963439897419343166L; public static final String OID = "2.5.29.54"; - public static final String NAME = OIDMap.EXT_INHIBIT_ANY_POLICY_NAME; private BigInt mSkipCerts = new BigInt(-1); static { try { OIDMap.addAttribute(InhibitAnyPolicyExtension.class.getName(), - OID, NAME); + OID, InhibitAnyPolicyExtension.class.getSimpleName()); } catch (CertificateException e) { } } @@ -133,13 +132,10 @@ public class InhibitAnyPolicyExtension return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } - public String getName() { - return NAME; - } public void delete(String name) throws CertificateException, IOException { diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/pki/base/util/src/netscape/security/extensions/KerberosName.java index c60ceb0d..0aeda430 100644 --- a/pki/base/util/src/netscape/security/extensions/KerberosName.java +++ b/pki/base/util/src/netscape/security/extensions/KerberosName.java @@ -54,9 +54,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; @@ -120,7 +120,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 e470d4dc..f8b357e8 100644 --- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -62,7 +62,6 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "NSCertType"; public static final String SSL_CLIENT = "ssl_client"; public static final String SSL_SERVER = "ssl_server"; public static final String EMAIL = "email"; @@ -116,7 +115,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) { @@ -364,16 +363,10 @@ 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(); } - /** - * Return the name of this attribute. - */ - public String getName() { - return (NAME); - } public static void main(String[] argv) { } diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index ec3dbbb8..544d5959 100644 --- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -41,14 +41,13 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet { */ private static final long serialVersionUID = -4692759557964594790L; public static final String OID = "1.3.6.1.5.5.7.48.1.5"; - public static final String NAME = "OCSPNoCheckExtension"; private byte mCached[] = null; static { try { OIDMap.addAttribute(OCSPNoCheckExtension.class.getName(), - OID, NAME); + OID, OCSPNoCheckExtension.class.getSimpleName()); } catch (CertificateException e) { } } @@ -139,15 +138,11 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet { return null; } - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { // NOT USED return null; } - public String getName() { - return NAME; - } - public void delete(String name) throws CertificateException, IOException { // NOT USED diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java index 084e1d69..ecd8f4f6 100644 --- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -243,18 +243,11 @@ 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; } /** - * Return the name of this attribute. - */ - public String getName () { - return "PresenceServerExtension"; - } - - /** * Set the name of this attribute. */ public void setName (String name) { diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index 26d048dc..36be1fff 100644 --- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -46,13 +46,8 @@ 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"; - public static final int OID_OCSP[] = { 1, 3, 6, 1, 5, 5, 7, 48, 1 }; public static final ObjectIdentifier METHOD_OCSP = new ObjectIdentifier(OID_OCSP); @@ -64,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. @@ -120,17 +115,11 @@ 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; } - /** - * Return the name of this attribute. - */ - public String getName() { - return NAME; - } /** * Adds Access Description. @@ -143,7 +132,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet } public AccessDescription getAccessDescription(int pos) { - return (AccessDescription) mDesc.elementAt(pos); + return mDesc.elementAt(pos); } /** @@ -174,7 +163,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); @@ -207,7 +196,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 e3eee809..dd74ead9 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 683514a7..fc25e8d8 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -112,7 +112,7 @@ 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]); @@ -136,7 +136,7 @@ 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); @@ -298,15 +298,13 @@ 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[1] = java.lang.String.class; // EMailAddress + VALUE_CLASSES[2] = java.lang.String.class; // UnstructuredName VALUE_CLASSES[3] = // ContentType Class.forName("netscape.security.util.ObjectIdentifier"); VALUE_CLASSES[4] = Class.forName("[B"); // MessageDigest (byte[]) @@ -315,7 +313,7 @@ public class PKCS9Attribute implements DerEncoder { Class.forName("[Lnetscape.security.pkcs.SignerInfo;"); VALUE_CLASSES[7] = // ChallengePassword Class.forName("java.lang.String"); - VALUE_CLASSES[8] = str; // UnstructuredAddress + VALUE_CLASSES[8] = java.lang.String.class; // UnstructuredAddress VALUE_CLASSES[9] = null; // ExtendedCertificateAttributes VALUE_CLASSES[10] = null; // IssuerAndSerialNumber diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java index 22d25329..8e21350b 100644 --- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java +++ b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java @@ -35,7 +35,7 @@ public class X509CertificateFactory extends CertificateFactorySpi { throws CertificateException { 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/CrlPrettyPrint.java b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java index ba74a0d7..ade21420 100644 --- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -27,7 +27,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; @@ -177,15 +177,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 2e57eac1..0c62012d 100644 --- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -506,7 +506,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()) { @@ -969,12 +969,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) + @@ -1466,7 +1466,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)); @@ -1522,7 +1522,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( @@ -1542,7 +1542,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( @@ -1585,12 +1585,13 @@ 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"); PolicyQualifiers cpq = cpi.getPolicyQualifiers(); diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java index b5ce1773..098a5f2d 100755 --- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -125,7 +125,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/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index c0eff9b3..6e330f8a 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -66,7 +66,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "AuthorityKeyIdentifier"; public static final String KEY_ID = "key_id"; public static final String AUTH_NAME = "auth_name"; public static final String SERIAL_NUMBER = "serial_number"; @@ -321,7 +320,7 @@ 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(KEY_ID); elements.addElement(AUTH_NAME); @@ -330,10 +329,4 @@ implements CertAttrSet { return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 7314c2ac..a92625a8 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -62,7 +62,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "BasicConstraints"; public static final String IS_CA = "is_ca"; public static final String PATH_LEN = "path_len"; @@ -277,7 +276,7 @@ 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(IS_CA); elements.addElement(PATH_LEN); @@ -285,10 +284,4 @@ implements CertAttrSet { return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName() { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 0f64c58b..812d2e76 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -177,17 +177,16 @@ public class CRLDistributionPointsExtension extends Extension // because it is so complicated. Therefore, we only provide a // minimal implementation. ///////////////////////////////////////////////////////////// - public static final String NAME = "CRLDistributionPoints"; static { try { OIDMap.addAttribute(CRLDistributionPointsExtension.class.getName(), - OID, NAME); + OID, CRLDistributionPointsExtension.class.getSimpleName()); } catch (CertificateException e) {} } public String toString() { - return NAME; + return this.getClass().getSimpleName(); } /** @@ -231,15 +230,14 @@ public class CRLDistributionPointsExtension extends Extension throw new IOException("Attribute name not recognized by " + "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() { - return NAME; - } /** * Test driver. diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index 67baf106..8376662f 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -53,7 +53,6 @@ implements CertAttrSet { /** * Attribute name. */ - public static final String NAME = "CRLNumber"; public static final String NUMBER = "value"; private BigInt crlNumber = null; @@ -210,16 +209,10 @@ 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); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); } -} diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java index 8f10ac6a..363e54bf 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -61,7 +61,6 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet /** * Attribute names. */ - public static final String NAME = "CRLReason"; public static final String REASON = "value"; private RevocationReason mReason = null; @@ -206,19 +205,13 @@ 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); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } public boolean equals(Object other) { if (this == other) diff --git a/pki/base/util/src/netscape/security/x509/CertAttrSet.java b/pki/base/util/src/netscape/security/x509/CertAttrSet.java index 53401132..4b9352c6 100755 --- a/pki/base/util/src/netscape/security/x509/CertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/CertAttrSet.java @@ -111,8 +111,9 @@ 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 48fcb454..676df900 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -173,7 +173,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 1f616d67..6075715a 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 @@ implements CertAttrSet, Serializable { */ 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<Extension> extClass = (Class<Extension>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -75,8 +76,8 @@ implements CertAttrSet, Serializable { return; } } - Class[] params = {Boolean.class, Object.class}; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = {Boolean.class, Object.class}; + Constructor<Extension> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -87,7 +88,7 @@ implements CertAttrSet, Serializable { } Object[] passed = new Object[]{new Boolean(ext.isCritical()), value}; - CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); + Extension certExt = cons.newInstance(passed); if (certExt != null && certExt.getName() != null) { map.put(certExt.getName(), (Extension) certExt); addElement((Extension) certExt); @@ -105,7 +106,7 @@ implements CertAttrSet, Serializable { * Default constructor for the certificate attribute. */ public CertificateExtensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension> (); } /** @@ -117,7 +118,7 @@ implements CertAttrSet, Serializable { 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 @@ implements CertAttrSet, Serializable { 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 @@ implements CertAttrSet, Serializable { str = val.toDerInputStream(); } - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -216,8 +217,8 @@ implements CertAttrSet, Serializable { * @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); } /** @@ -247,7 +248,7 @@ implements CertAttrSet, Serializable { removeElement(obj); } - public Enumeration getNames() + public Enumeration<String> getNames() { return map.keys(); } @@ -256,10 +257,15 @@ implements CertAttrSet, Serializable { * 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 73d9c1d1..55f21d2a 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -51,7 +51,6 @@ public class CertificateIssuerExtension extends Extension /** * Attribute name. */ - public static final String NAME = "CertificateIssuer"; public static final String CERTIFICATE_ISSUER = "value"; /** @@ -65,7 +64,7 @@ public class CertificateIssuerExtension extends Extension static { try { OIDMap.addAttribute(CertificateIssuerExtension.class.getName(), - OID, NAME); + OID, CertificateIssuerExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -231,18 +230,12 @@ 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); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName() { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index 22d05d07..47c44ed4 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -155,7 +155,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 687aedb4..52baa621 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -168,7 +168,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 4c3c4fa0..19a986b3 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; @@ -65,7 +67,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "CertificatePolicies"; public static final String INFOS = "infos"; @@ -224,22 +225,23 @@ implements CertAttrSet { } /** - * 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()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } - + private static final String[] NAMES = {INFOS}; + @Override + public Enumeration<String> getAttributeNames() { + // TODO Auto-generated method stub + return Collections.enumeration(Arrays.asList(NAMES)); + } + + public static void main(String args[]) { @@ -326,4 +328,6 @@ implements CertAttrSet { 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 eeebb873..a73a9ec2 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -174,7 +174,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 a4dac169..e9c558ef 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -186,7 +186,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 c214546a..7a3294cb 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -168,7 +168,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 e0b26428..8188e8b3 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -246,7 +246,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 d35a012e..951509c7 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 cf888eea..f3507a14 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -173,7 +173,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 96f7167c..5a56547a 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -53,7 +53,6 @@ implements CertAttrSet { /** * Attribute name. */ - public static final String NAME = "DeltaCRLIndicator"; public static final String NUMBER = "value"; /** @@ -66,7 +65,7 @@ implements CertAttrSet { static { try { OIDMap.addAttribute(DeltaCRLIndicatorExtension.class.getName(), - OID, NAME); + OID, DeltaCRLIndicatorExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -223,17 +222,11 @@ 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); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java index e52a0be7..431a60f6 100644 --- a/pki/base/util/src/netscape/security/x509/Extension.java +++ b/pki/base/util/src/netscape/security/x509/Extension.java @@ -195,4 +195,9 @@ public class Extension implements Serializable { } return (s); } + + public final String getName(){ + return this.getClass().getSimpleName(); + } + } diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java index 1e728a0a..328f4a2e 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 @@ implements CertAttrSet { */ 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<Extension> extClass = (Class<Extension>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -72,8 +73,8 @@ implements CertAttrSet { return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<Extension> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -84,7 +85,7 @@ implements CertAttrSet { } Object[] passed = new Object[] {new Boolean(ext.isCritical()), value}; - CertAttrSet certExt = (CertAttrSet)cons.newInstance(passed); + Extension certExt = cons.newInstance(passed); map.put(certExt.getName(), certExt); addElement(certExt); @@ -101,7 +102,7 @@ implements CertAttrSet { * Default constructor for the certificate attribute. */ public Extensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -113,7 +114,7 @@ implements CertAttrSet { 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 @@ implements CertAttrSet { 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 @@ implements CertAttrSet { * @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); } /** @@ -210,14 +211,14 @@ implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements () { - return (map.elements()); + public Enumeration<String> getAttributeNames () { + return map.keys(); } /** * Return the name of this attribute. */ public String getName () { - return (NAME); + return getClass().getSimpleName(); } } diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index dd4bdd17..2a479cfc 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -82,8 +82,6 @@ public class FreshestCRLExtension extends Extension // Cached DER-encoding to improve performance. private byte[] cachedEncoding=null; - // Attribute name - public static final String NAME = "FreshestCRL"; // The Object Identifier for this extension. public static final String OID = "2.5.29.46"; @@ -91,7 +89,7 @@ public class FreshestCRLExtension extends Extension static { try { OIDMap.addAttribute(FreshestCRLExtension.class.getName(), - OID, NAME); + OID, FreshestCRLExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -193,7 +191,7 @@ public class FreshestCRLExtension extends Extension // minimal implementation. ///////////////////////////////////////////////////////////// public String toString() { - return NAME; + return FreshestCRLExtension.class.getSimpleName(); } /** @@ -238,15 +236,14 @@ 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() { - return NAME; - } - /** * Test driver. */ diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index ee93e4be..7f996250 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -54,7 +54,6 @@ implements CertAttrSet { /** * Attribute name. */ - public static final String NAME = "HoldInstruction"; public static final String HOLD_INSTRUCTION = "value"; /** @@ -90,7 +89,7 @@ implements CertAttrSet { static { try { OIDMap.addAttribute(HoldInstructionExtension.class.getName(), - OID, NAME); + OID, HoldInstructionExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -351,17 +350,11 @@ 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(HOLD_INSTRUCTION); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java index cb568c7f..30909664 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -54,7 +54,6 @@ implements CertAttrSet { /** * Attribute name. */ - public static final String NAME = "InvalidityDate"; public static final String INVALIDITY_DATE = "value"; /** @@ -68,7 +67,7 @@ implements CertAttrSet { static { try { OIDMap.addAttribute(InvalidityDateExtension.class.getName(), - OID, NAME); + OID, InvalidityDateExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -230,17 +229,11 @@ 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(INVALIDITY_DATE); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index dd599ca6..eeb05c91 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -59,7 +59,6 @@ extends Extension implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "IssuerAlternativeName"; public static final String ISSUER_NAME = "issuer_name"; // private data members @@ -223,17 +222,11 @@ 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(ISSUER_NAME); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName() { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 51b7001e..2477591e 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -106,7 +106,6 @@ public class IssuingDistributionPointExtension extends Extension /** * Attribute names. */ - public static final String NAME = "IssuingDistributionPoint"; public static final String ISSUING_DISTRIBUTION_POINT = "issuing_distribution_point"; // Private data members @@ -119,7 +118,7 @@ public class IssuingDistributionPointExtension extends Extension static { try { OIDMap.addAttribute(IssuingDistributionPointExtension.class.getName(), - OID, NAME); + OID, IssuingDistributionPointExtension.class.getSimpleName()); } catch (CertificateException e) {} } @@ -285,7 +284,7 @@ public class IssuingDistributionPointExtension extends Extension */ public String toString() { - return NAME; + return IssuingDistributionPointExtension.class.getSimpleName(); } /** @@ -345,7 +344,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()); @@ -353,10 +352,6 @@ public class IssuingDistributionPointExtension extends Extension } - public String getName() { - return NAME; - } - /** * Test driver. */ diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 7cef5923..8d3aa21f 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -58,7 +58,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "KeyUsage"; public static final String DIGITAL_SIGNATURE = "digital_signature"; public static final String NON_REPUDIATION = "non_repudiation"; public static final String KEY_ENCIPHERMENT = "key_encipherment"; @@ -386,7 +385,7 @@ 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(DIGITAL_SIGNATURE); elements.addElement(NON_REPUDIATION); @@ -406,10 +405,4 @@ implements CertAttrSet { return (boolean[]) bitString.clone(); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index 040126bf..bc68dadc 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -51,7 +51,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "NSCCommentExtension"; public static final String INFOS = "infos"; public static final ObjectIdentifier OID = new ObjectIdentifier("2.16.840.1.113730.1.13"); @@ -59,7 +58,7 @@ implements CertAttrSet { // Private data members - private Vector mInfos; + private Vector<Object> mInfos; private PrettyPrintFormat pp = new PrettyPrintFormat(":"); @@ -91,7 +90,7 @@ implements CertAttrSet { 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); } /** @@ -170,14 +169,15 @@ implements CertAttrSet { /** * Set the attribute value. */ - public void set(String name, Object obj) throws IOException { + @SuppressWarnings("unchecked") + public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(INFOS)) { if (!(obj instanceof Vector)) { 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."); @@ -212,17 +212,11 @@ implements CertAttrSet { * 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()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 9a2ac91c..c7928b85 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -73,7 +73,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "NameConstraints"; public static final String PERMITTED_SUBTREES = "permitted_subtrees"; public static final String EXCLUDED_SUBTREES = "excluded_subtrees"; @@ -301,7 +300,7 @@ 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(PERMITTED_SUBTREES); elements.addElement(EXCLUDED_SUBTREES); @@ -309,10 +308,4 @@ implements CertAttrSet { return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java index be1e088e..97e8d26e 100644 --- a/pki/base/util/src/netscape/security/x509/OIDMap.java +++ b/pki/base/util/src/netscape/security/x509/OIDMap.java @@ -58,38 +58,38 @@ public class OIDMap { X509CertInfo.NAME + "." + X509CertInfo.EXTENSIONS; private static final String AUTH_KEY_IDENTIFIER = ROOT + "." + - AuthorityKeyIdentifierExtension.NAME; + AuthorityKeyIdentifierExtension.class.getSimpleName(); private static final String SUB_KEY_IDENTIFIER = ROOT + "." + - SubjectKeyIdentifierExtension.NAME; + SubjectKeyIdentifierExtension.class.getSimpleName(); private static final String KEY_USAGE = ROOT + "." + - KeyUsageExtension.NAME; + KeyUsageExtension.class.getSimpleName(); private static final String PRIVATE_KEY_USAGE = ROOT + "." + - PrivateKeyUsageExtension.NAME; + PrivateKeyUsageExtension.class.getSimpleName(); private static final String POLICY_MAPPINGS = ROOT + "." + - PolicyMappingsExtension.NAME; + PolicyMappingsExtension.class.getSimpleName(); private static final String SUB_ALT_NAME = ROOT + "." + - SubjectAlternativeNameExtension.NAME; + SubjectAlternativeNameExtension.class.getSimpleName(); private static final String ISSUER_ALT_NAME = ROOT + "." + - IssuerAlternativeNameExtension.NAME; + IssuerAlternativeNameExtension.class.getSimpleName(); private static final String BASIC_CONSTRAINTS = ROOT + "." + - BasicConstraintsExtension.NAME; + BasicConstraintsExtension.class.getSimpleName(); private static final String NAME_CONSTRAINTS = ROOT + "." + - NameConstraintsExtension.NAME; + NameConstraintsExtension.class.getSimpleName(); private static final String POLICY_CONSTRAINTS = ROOT + "." + - PolicyConstraintsExtension.NAME; + PolicyConstraintsExtension.class.getSimpleName(); private static final String CERT_POLICIES = //ROOT + "." + - CertificatePoliciesExtension.NAME; + CertificatePoliciesExtension.class.getSimpleName(); private static final String SUBJ_DIR_ATTR = //ROOT + "." + - SubjectDirAttributesExtension.NAME; + SubjectDirAttributesExtension.class.getSimpleName(); 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; private static final String CRL_NUMBER = ROOT + "." + - CRLNumberExtension.NAME; + CRLNumberExtension.class.getSimpleName(); private static final String CRL_REASON = ROOT + "." + - CRLReasonExtension.NAME; + CRLReasonExtension.class.getSimpleName(); private static final Hashtable<ObjectIdentifier, String> oid2Name = new Hashtable<ObjectIdentifier, String>(); private static final Hashtable<String, ObjectIdentifier> name2OID = new Hashtable<String, ObjectIdentifier>(); diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 681d449b..39e7fbfb 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -67,7 +67,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "PolicyConstraints"; public static final String REQUIRE = "require"; public static final String INHIBIT = "inhibit"; @@ -275,7 +274,7 @@ 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(REQUIRE); elements.addElement(INHIBIT); @@ -283,12 +282,6 @@ implements CertAttrSet { return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } /** * returns the requireExplicitMapping parameter. diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index 48f0b042..c31acf92 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -61,7 +61,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "PolicyMappings"; public static final String MAP = "map"; // Private data members @@ -189,6 +188,7 @@ implements CertAttrSet { /** * Set the attribute value. */ + @SuppressWarnings("unchecked") public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(MAP)) { @@ -231,19 +231,13 @@ 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(MAP); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } /** * Returns an enumeration of the mappings in the extension. diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index 30944495..98a7a4d3 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -70,7 +70,6 @@ implements CertAttrSet { /** * Sub attributes name for this CertAttrSet. */ - public static final String NAME = "PrivateKeyUsage"; public static final String NOT_BEFORE = "not_before"; public static final String NOT_AFTER = "not_after"; @@ -321,7 +320,7 @@ 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(NOT_BEFORE); elements.addElement(NOT_AFTER); @@ -329,10 +328,5 @@ implements CertAttrSet { return(elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName() { - return(NAME); - } + } diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index ed78be9b..b588a368 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -36,10 +36,11 @@ import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; /** - * <p>Abstract class for a revoked certificate in a CRL. - * This class is for each entry in the <code>revokedCertificates</code>, - * so it deals with the inner <em>SEQUENCE</em>. - * The ASN.1 definition for this is: + * <p> + * Abstract class for a revoked certificate in a CRL. This class is for each + * entry in the <code>revokedCertificates</code>, so it deals with the inner + * <em>SEQUENCE</em>. The ASN.1 definition for this is: + * * <pre> * revokedCertificates SEQUENCE OF SEQUENCE { * userCertificate CertificateSerialNumber, @@ -47,11 +48,11 @@ import netscape.security.util.ObjectIdentifier; * crlEntryExtensions Extensions OPTIONAL * -- if present, must be v2 * } OPTIONAL - * + * * CertificateSerialNumber ::= INTEGER - * + * * Extensions ::= SEQUENCE SIZE (1..MAX) OF Extension - * + * * Extension ::= SEQUENCE { * extnId OBJECT IDENTIFIER, * critical BOOLEAN DEFAULT FALSE, @@ -61,65 +62,70 @@ import netscape.security.util.ObjectIdentifier; * -- the extnId object identifier value * } * </pre> - * + * * @author Hemma Prafullchandra * @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; - private byte[] revokedCert; - private final static boolean isExplicit = false; - - /** - * Default constructor. - */ - public RevokedCertImpl() { } + private static final long serialVersionUID = -3449642360223397701L; + + + private SerialNumber serialNumber; + private Date revocationDate; + private CRLExtensions extensions = null; + private byte[] revokedCert; + private final static boolean isExplicit = false; + + /** + * Default constructor. + */ + public RevokedCertImpl() { + } - /** - * 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. - */ - public RevokedCertImpl(BigInteger num, Date date) { - this.serialNumber = new SerialNumber(num); - this.revocationDate = 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. + */ + public RevokedCertImpl(BigInteger num, Date date) { + this.serialNumber = new SerialNumber(num); + this.revocationDate = date; + } - /** - * 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. - */ - public RevokedCertImpl(BigInteger num, Date date, - CRLExtensions crlEntryExts) { - this.serialNumber = new SerialNumber(num); - this.revocationDate = date; - this.extensions = crlEntryExts; - } + /** + * 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. + */ + public RevokedCertImpl(BigInteger num, Date date, CRLExtensions crlEntryExts) { + this.serialNumber = new SerialNumber(num); + this.revocationDate = date; + this.extensions = crlEntryExts; + } public byte[] getEncoded() throws CRLException { // XXX NOT IMPLEMENTED if (revokedCert == null) { - DerOutputStream os = new DerOutputStream(); + DerOutputStream os = new DerOutputStream(); try { encode(os); } catch (Exception e) { - // revokedCert = null; + // revokedCert = null; } revokedCert = os.toByteArray(); } @@ -131,158 +137,168 @@ public class RevokedCertImpl extends RevokedCertificate return true; } - /** - * Sets extensions for this impl. - * - * @param crlEntryExts CRLExtensions - */ - public void setExtensions(CRLExtensions crlEntryExts) { - this.extensions = crlEntryExts; - } - - /** - * Unmarshals a revoked certificate from its encoded form. - * - * @param revokedCert the encoded bytes. - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. - */ - public RevokedCertImpl(byte[] revokedCert) - throws CRLException, X509ExtensionException { - try { - DerValue derValue = new DerValue(revokedCert); - parse(derValue); - } catch (IOException e) { - throw new CRLException("Parsing error: " + e.toString()); - } - } - - /** - * 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. - */ - public RevokedCertImpl(DerValue derValue) - throws CRLException, X509ExtensionException { - parse(derValue); - } - - /** - * Returns true if this revoked certificate entry has - * extensions, otherwise false. - * - * @return true if this CRL entry has extensions, otherwise - * false. - */ - public boolean hasExtensions() { - if (extensions == null) - return false; - else - return true; - } - - /** - * 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. - */ - public void decode(InputStream inStrm) - throws CRLException, X509ExtensionException { - try { - DerValue derValue = new DerValue(inStrm); - parse(derValue); - } catch (IOException e) { - throw new CRLException("Parsing error: " + e.toString()); - } - } - - /** - * 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. - */ - public void encode(DerOutputStream outStrm) - throws CRLException, X509ExtensionException { - try { - if (revokedCert == null) { - DerOutputStream tmp = new DerOutputStream(); - // sequence { serialNumber, revocationDate, extensions } - serialNumber.encode(tmp); + /** + * Sets extensions for this impl. + * + * @param crlEntryExts + * CRLExtensions + */ + public void setExtensions(CRLExtensions crlEntryExts) { + this.extensions = crlEntryExts; + } - // from 2050 should encode GeneralizedTime - tmp.putUTCTime(revocationDate); + /** + * Unmarshals a revoked certificate from its encoded form. + * + * @param revokedCert + * the encoded bytes. + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. + */ + public RevokedCertImpl(byte[] revokedCert) throws CRLException, + X509ExtensionException { + try { + DerValue derValue = new DerValue(revokedCert); + parse(derValue); + } catch (IOException e) { + throw new CRLException("Parsing error: " + e.toString()); + } + } - if (extensions != null) - extensions.encode(tmp, isExplicit); + /** + * 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. + */ + public RevokedCertImpl(DerValue derValue) throws CRLException, + X509ExtensionException { + parse(derValue); + } - DerOutputStream seq = new DerOutputStream(); - seq.write(DerValue.tag_Sequence, tmp); + /** + * Returns true if this revoked certificate entry has extensions, otherwise + * false. + * + * @return true if this CRL entry has extensions, otherwise false. + */ + public boolean hasExtensions() { + if (extensions == null) + return false; + else + return true; + } - revokedCert = seq.toByteArray(); - } - outStrm.write(revokedCert); - } catch (IOException e) { - throw new CRLException("Encoding error: " + e.toString()); - } - } + /** + * 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. + */ + public void decode(InputStream inStrm) throws CRLException, + X509ExtensionException { + try { + DerValue derValue = new DerValue(inStrm); + parse(derValue); + } catch (IOException e) { + throw new CRLException("Parsing error: " + e.toString()); + } + } - /** - * Gets the serial number for this RevokedCertificate, - * the <em>userCertificate</em>. - * - * @return the serial number. - */ - public BigInteger getSerialNumber() { - return ((BigInt)serialNumber.getNumber()).toBigInteger(); - } + /** + * 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. + */ + public void encode(DerOutputStream outStrm) throws CRLException, + X509ExtensionException { + try { + if (revokedCert == null) { + DerOutputStream tmp = new DerOutputStream(); + // sequence { serialNumber, revocationDate, extensions } + serialNumber.encode(tmp); + + // from 2050 should encode GeneralizedTime + tmp.putUTCTime(revocationDate); + + if (extensions != null) + extensions.encode(tmp, isExplicit); + + DerOutputStream seq = new DerOutputStream(); + seq.write(DerValue.tag_Sequence, tmp); + + revokedCert = seq.toByteArray(); + } + outStrm.write(revokedCert); + } catch (IOException e) { + throw new CRLException("Encoding error: " + e.toString()); + } + } - /** - * Gets the revocation date for this RevokedCertificate, - * the <em>revocationDate</em>. - * - * @return the revocation date. - */ - public Date getRevocationDate() { - return (new Date(revocationDate.getTime())); - } + /** + * Gets the serial number for this RevokedCertificate, the + * <em>userCertificate</em>. + * + * @return the serial number. + */ + public BigInteger getSerialNumber() { + return ((BigInt) serialNumber.getNumber()).toBigInteger(); + } - /** - * Returns extensions for this impl. - * - * @return the CRLExtensions - */ - public CRLExtensions getExtensions() { - return extensions; - } + /** + * Gets the revocation date for this RevokedCertificate, the + * <em>revocationDate</em>. + * + * @return the revocation date. + */ + public Date getRevocationDate() { + return (new Date(revocationDate.getTime())); + } + /** + * Returns extensions for this impl. + * + * @return the CRLExtensions + */ + public CRLExtensions getExtensions() { + return extensions; + } - /** - * Returns a printable string of this revoked certificate. - * - * @return value of this revoked certificate in a printable form. - */ - public String toString() { - StringBuffer sb = new StringBuffer(); - - sb.append(serialNumber.toString()); - sb.append(" On: " + revocationDate.toString()); - 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("\n"); - return (sb.toString()); - } + /** + * Returns a printable string of this revoked certificate. + * + * @return value of this revoked certificate in a printable form. + */ + public String toString() { + StringBuffer sb = new StringBuffer(); + + sb.append(serialNumber.toString()); + sb.append(" On: " + revocationDate.toString()); + 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("\n"); + return (sb.toString()); + } /** * Gets a Set of the extension(s) marked CRITICAL in the @@ -300,7 +316,7 @@ public class RevokedCertImpl extends RevokedCertificate e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) - extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -319,9 +335,9 @@ public class RevokedCertImpl extends RevokedCertificate 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; } @@ -351,7 +367,7 @@ public class RevokedCertImpl extends RevokedCertificate 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; @@ -421,26 +437,25 @@ 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.) - */ - private synchronized void writeObject(ObjectOutputStream stream) - throws CRLException, X509ExtensionException, IOException { - DerOutputStream dos = new DerOutputStream(); - encode(dos); - dos.derEncode(stream); - } + /** + * 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 { + DerOutputStream dos = new DerOutputStream(); + encode(dos); + dos.derEncode(stream); + } - /** - * 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 { - decode(stream); - } + /** + * 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 { + decode(stream); + } } diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java index 41f18d9b..7db553ad 100644 --- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -82,10 +82,15 @@ public abstract class RevokedCertificate extends X509CRLEntry { */ public abstract boolean hasExtensions(); + + /** * Returns a string representation of this revoked certificate. * * @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 5c3ad35e..53f4eadb 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -64,7 +64,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "SubjectAlternativeName"; public static final String SUBJECT_NAME = "subject_name"; // private data members @@ -222,17 +221,11 @@ 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(SUBJECT_NAME); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index e5ece1be..134f0435 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -74,7 +74,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "SubjectDirectoryAttributes"; // Private data members private Vector<Attribute> attrList = new Vector<Attribute>(); @@ -104,7 +103,7 @@ implements CertAttrSet { } if (derVal.data.available() == 0) { - throw new IOException(NAME+" No data available in " + throw new IOException(this.getClass().getSimpleName()+" No data available in " + "passed DER encoded value."); } @@ -161,7 +160,7 @@ implements CertAttrSet { this.critical = crit.booleanValue(); if (!(value instanceof byte[])) - throw new IOException(NAME+"Illegal argument type"); + throw new IOException(this.getClass().getSimpleName()+"Illegal argument type"); int len = Array.getLength(value); byte[] extValue = new byte[len]; System.arraycopy(value, 0, extValue, 0, len); @@ -263,17 +262,11 @@ 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>(); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName() { - return (NAME); - } /** * Returns an enumeration of attributes in the extension. diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index fc65ec31..cbaf2ce5 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -64,7 +64,6 @@ implements CertAttrSet { /** * Attribute names. */ - public static final String NAME = "SubjectKeyIdentifier"; public static final String KEY_ID = "key_id"; // Private data member @@ -203,17 +202,11 @@ 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(KEY_ID); return (elements.elements()); } - /** - * Return the name of this attribute. - */ - public String getName () { - return (NAME); - } } diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index c916a5d7..220f32d8 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -915,8 +915,8 @@ implements Serializable, DerEncoder { return null; Set<String> extSet = new TreeSet<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()); } @@ -944,8 +944,8 @@ implements Serializable, DerEncoder { Set<String> extSet = new TreeSet<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()); } @@ -964,8 +964,8 @@ implements Serializable, DerEncoder { ObjectIdentifier findOID = new ObjectIdentifier(oid); 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; @@ -997,8 +997,8 @@ implements Serializable, DerEncoder { ObjectIdentifier findOID = new ObjectIdentifier(oid); 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 4ece0df8..1178d6a3 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -222,7 +222,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); |