diff options
Diffstat (limited to 'pki/base/util/src/netscape/security/x509')
41 files changed, 375 insertions, 471 deletions
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); |