diff options
Diffstat (limited to 'pki/base/util/src/netscape/security/x509')
43 files changed, 184 insertions, 143 deletions
diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java index 57d9445c3..8a757d7f5 100755 --- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -126,7 +126,7 @@ public class ACertAttrSet implements CertAttrSet { * * @return an enumeration of the attribute names. */ - public Enumeration getElements() { + public Enumeration<String> getAttributeNames() { return null; } diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/pki/base/util/src/netscape/security/x509/AlgorithmId.java index a30d45ca0..b0113af41 100644 --- a/pki/base/util/src/netscape/security/x509/AlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/AlgorithmId.java @@ -760,7 +760,8 @@ public class AlgorithmId implements Serializable, DerEncoder { * All supported signing algorithms. */ public static final String[] ALL_SIGNING_ALGORITHMS = new String[] - { "SHA1withRSA", "MD5withRSA", "MD2withRSA", "SHA1withDSA", "SHA256withRSA", "SHA512withRSA", "SHA1withEC", + { + "SHA1withRSA", "MD5withRSA", "MD2withRSA", "SHA1withDSA", "SHA256withRSA", "SHA512withRSA", "SHA1withEC", "SHA256withEC", "SHA384withEC", "SHA512withEC" }; } diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index b7f84f9f7..91b6c2598 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -322,7 +322,7 @@ public class AuthorityKeyIdentifierExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); elements.addElement(AUTH_NAME); diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 5846296d1..2688e961d 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -278,7 +278,7 @@ public class BasicConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(IS_CA); elements.addElement(PATH_LEN); diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index a15c1099f..c939a7431 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -227,8 +227,11 @@ public class CRLDistributionPointsExtension extends Extension "CertAttrSet:CRLDistributionPointsExtension"); } - public Enumeration getElements() { - return (new Vector()).elements(); + /* + * TODO use an empty collection to generate these + */ + public Enumeration<String> getAttributeNames() { + return (new Vector<String>()).elements(); } public String getName() { diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index e3965753c..7c89b179f 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -211,7 +211,7 @@ public class CRLNumberExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java index 22fbe894f..3c11fc70b 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -207,7 +207,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(REASON); diff --git a/pki/base/util/src/netscape/security/x509/CertAttrSet.java b/pki/base/util/src/netscape/security/x509/CertAttrSet.java index 958432668..7e8d6db82 100755 --- a/pki/base/util/src/netscape/security/x509/CertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/CertAttrSet.java @@ -109,7 +109,7 @@ public interface CertAttrSet { * * @return an enumeration of the attribute names. */ - Enumeration getElements(); + Enumeration<String> getAttributeNames(); /** * Returns the name (identifier) of this CertAttrSet. diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 1105dc4fd..41610844e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -174,7 +174,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ALGORITHM); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java index 7cd2b73c6..b9667d8f6 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -43,7 +43,7 @@ import netscape.security.util.DerValue; * @version 1.11 * @see CertAttrSet */ -public class CertificateExtensions extends Vector +public class CertificateExtensions extends Vector<Extension> implements CertAttrSet, Serializable { /** * @@ -59,12 +59,13 @@ public class CertificateExtensions extends Vector */ public static final String NAME = "extensions"; - private Hashtable<String, Object> map; + private Hashtable<String, Extension> map; // Parse the encoded extension public void parseExtension(Extension ext) throws IOException { try { - Class extClass = OIDMap.getClass(ext.getExtensionId()); + @SuppressWarnings("unchecked") + Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -75,8 +76,8 @@ public class CertificateExtensions extends Vector return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<CertAttrSet> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -87,7 +88,7 @@ public class CertificateExtensions extends Vector } Object[] passed = new Object[] { new Boolean(ext.isCritical()), value }; - CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); + CertAttrSet certExt = cons.newInstance(passed); if (certExt != null && certExt.getName() != null) { map.put(certExt.getName(), (Extension) certExt); addElement((Extension) certExt); @@ -105,7 +106,7 @@ public class CertificateExtensions extends Vector * Default constructor for the certificate attribute. */ public CertificateExtensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -117,7 +118,7 @@ public class CertificateExtensions extends Vector public CertificateExtensions(DerInputStream in) throws IOException { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = in.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -136,7 +137,7 @@ public class CertificateExtensions extends Vector DerValue val = new DerValue(in); DerInputStream str = val.toDerInputStream(); - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -160,7 +161,7 @@ public class CertificateExtensions extends Vector str = val.toDerInputStream(); } - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -217,8 +218,8 @@ public class CertificateExtensions extends Vector * @exception IOException if the object could not be cached. */ public void set(String name, Object obj) throws IOException { - map.put(name, obj); - addElement(obj); + map.put(name, (Extension) obj); + addElement((Extension) obj); } /** @@ -250,7 +251,7 @@ public class CertificateExtensions extends Vector removeElement(obj); } - public Enumeration getNames() { + public Enumeration<String> getNames() { return map.keys(); } @@ -258,10 +259,14 @@ public class CertificateExtensions extends Vector * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { + public Enumeration<Extension> getAttributes() { return (map.elements()); } + public Enumeration<String> getAttributeNames() { + return (map.keys()); + } + /** * Return the name of this attribute. */ diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index 490c087bb..774116bcc 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -226,7 +226,7 @@ public class CertificateIssuerExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(CERTIFICATE_ISSUER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index 83bea856c..a2f9026c1 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -156,7 +156,7 @@ public class CertificateIssuerName implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index f54b1e0b9..351116ffb 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -169,7 +169,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ID); diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index d4e1cf86a..1c72e7fa3 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.Collections; import java.util.Enumeration; import java.util.Vector; @@ -221,15 +223,23 @@ public class CertificatePoliciesExtension extends Extension } /** - * Return an enumeration of names of attributes existing within this + * Return an enumeration of attributes existing within this * attribute. */ - public Enumeration<Vector<CertificatePolicyInfo>> getElements() { + public Enumeration<Vector<CertificatePolicyInfo>> getAttributes() { Vector<Vector<CertificatePolicyInfo>> elements = new Vector<Vector<CertificatePolicyInfo>>(); elements.addElement(mInfos); return (elements.elements()); } + private static final String[] NAMES = { INFOS }; + + @Override + public Enumeration<String> getAttributeNames() { + // TODO Auto-generated method stub + return Collections.enumeration(Arrays.asList(NAMES)); + } + /** * Return the name of this attribute. */ @@ -322,4 +332,5 @@ public class CertificatePoliciesExtension extends Extension System.out.println(e.toString()); } } + } diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java index de1e794d5..e9655178f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -175,7 +175,7 @@ public class CertificateSerialNumber implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java index 227dc41e1..6159638b9 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -187,7 +187,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DN_NAME); diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index c8e06fb38..51687e86d 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -169,7 +169,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ID); diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java index c54da58b2..0c2c841b0 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -247,7 +247,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NOT_BEFORE); elements.addElement(NOT_AFTER); diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/pki/base/util/src/netscape/security/x509/CertificateVersion.java index 9b976e202..d3659779f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java @@ -224,7 +224,7 @@ public class CertificateVersion implements CertAttrSet { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java index 58c18f084..c7003bb8e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -174,7 +174,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY); diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index 6e8f9fa02..da870f4fd 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -224,7 +224,7 @@ public class DeltaCRLIndicatorExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NUMBER); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java index 63856300e..622367ab6 100644 --- a/pki/base/util/src/netscape/security/x509/Extensions.java +++ b/pki/base/util/src/netscape/security/x509/Extensions.java @@ -40,7 +40,7 @@ import netscape.security.util.DerValue; * @version 1.11 * @see CertAttrSet */ -public class Extensions extends Vector +public class Extensions extends Vector<Extension> implements CertAttrSet { /** * @@ -56,12 +56,13 @@ public class Extensions extends Vector */ public static final String NAME = "extensions"; - private Hashtable map; + private Hashtable<String, Extension> map; // Parse the encoded extension public void parseExtension(Extension ext) throws IOException { try { - Class extClass = OIDMap.getClass(ext.getExtensionId()); + @SuppressWarnings("unchecked") + Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(ext.getExtensionId()); if (extClass == null) { // Unsupported extension if (ext.isCritical()) { throw new IOException("Unsupported CRITICAL extension: " @@ -72,8 +73,8 @@ public class Extensions extends Vector return; } } - Class[] params = { Boolean.class, Object.class }; - Constructor cons = extClass.getConstructor(params); + Class<?>[] params = { Boolean.class, Object.class }; + Constructor<CertAttrSet> cons = extClass.getConstructor(params); byte[] extData = ext.getExtensionValue(); int extLen = extData.length; @@ -84,9 +85,9 @@ public class Extensions extends Vector } Object[] passed = new Object[] { new Boolean(ext.isCritical()), value }; - CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed); - map.put(certExt.getName(), certExt); - addElement(certExt); + CertAttrSet certExt = cons.newInstance(passed); + map.put(certExt.getName(), (Extension) certExt); + addElement((Extension) certExt); } catch (NoSuchMethodException nosuch) { throw new IOException(nosuch.toString()); @@ -101,7 +102,7 @@ public class Extensions extends Vector * Default constructor for the certificate attribute. */ public Extensions() { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); } /** @@ -113,7 +114,7 @@ public class Extensions extends Vector public Extensions(DerInputStream in) throws IOException { - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = in.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -132,7 +133,7 @@ public class Extensions extends Vector DerValue val = new DerValue(in); DerInputStream str = val.toDerInputStream(); - map = new Hashtable(); + map = new Hashtable<String, Extension>(); DerValue[] exts = str.getSequence(5); for (int i = 0; i < exts.length; i++) { @@ -175,8 +176,8 @@ public class Extensions extends Vector * @exception IOException if the object could not be cached. */ public void set(String name, Object obj) throws IOException { - map.put(name, obj); - addElement(obj); + map.put(name, (Extension) obj); + addElement((Extension) obj); } /** @@ -212,8 +213,8 @@ public class Extensions extends Vector * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - return (map.elements()); + public Enumeration<String> getAttributeNames() { + return map.keys(); } /** diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index 5d7bd50b6..320bbf3df 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -233,8 +233,11 @@ public class FreshestCRLExtension extends Extension "CertAttrSet:FreshestCRLExtension"); } - public Enumeration getElements() { - return (new Vector()).elements(); + /* + * TODO replacewith empty collection + */ + public Enumeration<String> getAttributeNames() { + return (new Vector<String>()).elements(); } public String getName() { diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index 80324f8d8..b42bb6ac9 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -339,7 +339,7 @@ public class HoldInstructionExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(HOLD_INSTRUCTION); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java index 73e76087f..44c76275f 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -226,7 +226,7 @@ public class InvalidityDateExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(INVALIDITY_DATE); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index a21d3ac32..df0289f9e 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -224,7 +224,7 @@ public class IssuerAlternativeNameExtension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ISSUER_NAME); diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 9eb9d14a9..fc7e837ce 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -340,7 +340,7 @@ public class IssuingDistributionPointExtension extends Extension } } - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(ISSUING_DISTRIBUTION_POINT); return (elements.elements()); diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 043208806..56084dbcf 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -386,7 +386,7 @@ public class KeyUsageExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(DIGITAL_SIGNATURE); elements.addElement(NON_REPUDIATION); diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index 5ac3357ce..b24ce1158 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -58,7 +58,7 @@ public class NSCCommentExtension extends Extension public String mComment = null; // Private data members - private Vector mInfos; + private Vector<Object> mInfos; private PrettyPrintFormat pp = new PrettyPrintFormat(":"); @@ -90,7 +90,7 @@ public class NSCCommentExtension extends Extension public NSCCommentExtension(boolean critical) { this.extensionId = new ObjectIdentifier("2.16.840.1.113730.1.13"); this.critical = critical; - mInfos = new Vector(1, 1); + mInfos = new Vector<Object>(1, 1); } /** @@ -171,6 +171,7 @@ public class NSCCommentExtension extends Extension /** * Set the attribute value. */ + @SuppressWarnings("unchecked") public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(INFOS)) { @@ -178,7 +179,7 @@ public class NSCCommentExtension extends Extension throw new IOException("Attribute value should be of" + " type Vector."); } - mInfos = (Vector) obj; + mInfos = (Vector<Object>) obj; } else { throw new IOException("Attribute name not recognized by " + "CertAttrSet:NSCCommentExtension."); @@ -213,9 +214,9 @@ public class NSCCommentExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration getElements() { - Vector elements = new Vector(); - elements.addElement(mInfos); + public Enumeration<String> getAttributeNames() { + Vector<String> elements = new Vector<String>(); + elements.addElement(INFOS); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java index d3ca8c116..948d0d8c9 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -298,7 +298,7 @@ public class NameConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(PERMITTED_SUBTREES); elements.addElement(EXCLUDED_SUBTREES); diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java index d97d060ba..9c732d938 100644 --- a/pki/base/util/src/netscape/security/x509/OIDMap.java +++ b/pki/base/util/src/netscape/security/x509/OIDMap.java @@ -78,13 +78,13 @@ public class OIDMap { private static final String POLICY_CONSTRAINTS = ROOT + "." + PolicyConstraintsExtension.NAME; private static final String CERT_POLICIES = //ROOT + "." + - CertificatePoliciesExtension.NAME; + CertificatePoliciesExtension.NAME; private static final String SUBJ_DIR_ATTR = //ROOT + "." + - SubjectDirAttributesExtension.NAME; + SubjectDirAttributesExtension.NAME; public static final String EXT_KEY_USAGE_NAME = "ExtendedKeyUsageExtension"; public static final String EXT_INHIBIT_ANY_POLICY_NAME = "InhibitAnyPolicyExtension"; private static final String EXT_KEY_USAGE = //ROOT + "." + - EXT_KEY_USAGE_NAME; + EXT_KEY_USAGE_NAME; private static final String CRL_NUMBER = ROOT + "." + CRLNumberExtension.NAME; diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 194903dd5..7d98b21ba 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -275,7 +275,7 @@ public class PolicyConstraintsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(REQUIRE); elements.addElement(INHIBIT); diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index 6f2e583bc..9bdfb611b 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -190,6 +190,7 @@ public class PolicyMappingsExtension extends Extension /** * Set the attribute value. */ + @SuppressWarnings("unchecked") public void set(String name, Object obj) throws IOException { clearValue(); if (name.equalsIgnoreCase(MAP)) { @@ -232,7 +233,7 @@ public class PolicyMappingsExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(MAP); diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index a38443644..e3ecdb33d 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -322,7 +322,7 @@ public class PrivateKeyUsageExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(NOT_BEFORE); elements.addElement(NOT_AFTER); diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index 3271768f7..345694fb1 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -66,13 +66,13 @@ import netscape.security.util.ObjectIdentifier; * @version 1.6 97/12/10 */ -public class RevokedCertImpl extends RevokedCertificate - implements Serializable { +public class RevokedCertImpl extends RevokedCertificate implements Serializable { /** * */ private static final long serialVersionUID = -3449642360223397701L; + private SerialNumber serialNumber; private Date revocationDate; private CRLExtensions extensions = null; @@ -86,11 +86,13 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Constructs a revoked certificate entry using the - * serial number and revocation date. + * Constructs a revoked certificate entry using the serial number and + * revocation date. * - * @param num the serial number of the revoked certificate. - * @param date the Date on which revocation took place. + * @param num + * the serial number of the revoked certificate. + * @param date + * the Date on which revocation took place. */ public RevokedCertImpl(BigInteger num, Date date) { this.serialNumber = new SerialNumber(num); @@ -98,16 +100,17 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Constructs a revoked certificate entry using the - * serial number, revocation date and the entry - * extensions. + * Constructs a revoked certificate entry using the serial number, + * revocation date and the entry extensions. * - * @param num the serial number of the revoked certificate. - * @param date the Date on which revocation took place. - * @param crlEntryExts the extensions for this entry. + * @param num + * the serial number of the revoked certificate. + * @param date + * the Date on which revocation took place. + * @param crlEntryExts + * the extensions for this entry. */ - public RevokedCertImpl(BigInteger num, Date date, - CRLExtensions crlEntryExts) { + public RevokedCertImpl(BigInteger num, Date date, CRLExtensions crlEntryExts) { this.serialNumber = new SerialNumber(num); this.revocationDate = date; this.extensions = crlEntryExts; @@ -120,7 +123,7 @@ public class RevokedCertImpl extends RevokedCertificate try { encode(os); } catch (Exception e) { - // revokedCert = null; + // revokedCert = null; } revokedCert = os.toByteArray(); } @@ -135,7 +138,8 @@ public class RevokedCertImpl extends RevokedCertificate /** * Sets extensions for this impl. * - * @param crlEntryExts CRLExtensions + * @param crlEntryExts + * CRLExtensions */ public void setExtensions(CRLExtensions crlEntryExts) { this.extensions = crlEntryExts; @@ -144,12 +148,15 @@ public class RevokedCertImpl extends RevokedCertificate /** * Unmarshals a revoked certificate from its encoded form. * - * @param revokedCert the encoded bytes. - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param revokedCert + * the encoded bytes. + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public RevokedCertImpl(byte[] revokedCert) - throws CRLException, X509ExtensionException { + public RevokedCertImpl(byte[] revokedCert) throws CRLException, + X509ExtensionException { try { DerValue derValue = new DerValue(revokedCert); parse(derValue); @@ -161,21 +168,23 @@ public class RevokedCertImpl extends RevokedCertificate /** * Unmarshals a revoked certificate from its encoded form. * - * @param derValue the DER value containing the revoked certificate. - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param derValue + * the DER value containing the revoked certificate. + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public RevokedCertImpl(DerValue derValue) - throws CRLException, X509ExtensionException { + public RevokedCertImpl(DerValue derValue) throws CRLException, + X509ExtensionException { parse(derValue); } /** - * Returns true if this revoked certificate entry has - * extensions, otherwise false. + * Returns true if this revoked certificate entry has extensions, otherwise + * false. * - * @return true if this CRL entry has extensions, otherwise - * false. + * @return true if this CRL entry has extensions, otherwise false. */ public boolean hasExtensions() { if (extensions == null) @@ -187,13 +196,15 @@ public class RevokedCertImpl extends RevokedCertificate /** * Decode a revoked certificate from an input stream. * - * @param inStrm an input stream holding at least one revoked - * certificate - * @exception CRLException on parsing errors. - * @exception X509ExtensionException on extension handling errors. + * @param inStrm + * an input stream holding at least one revoked certificate + * @exception CRLException + * on parsing errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public void decode(InputStream inStrm) - throws CRLException, X509ExtensionException { + public void decode(InputStream inStrm) throws CRLException, + X509ExtensionException { try { DerValue derValue = new DerValue(inStrm); parse(derValue); @@ -205,13 +216,16 @@ public class RevokedCertImpl extends RevokedCertificate /** * Encodes the revoked certificate to an output stream. * - * @param outStrm an output stream to which the encoded revoked - * certificate is written. - * @exception CRLException on encoding errors. - * @exception X509ExtensionException on extension handling errors. + * @param outStrm + * an output stream to which the encoded revoked certificate is + * written. + * @exception CRLException + * on encoding errors. + * @exception X509ExtensionException + * on extension handling errors. */ - public void encode(DerOutputStream outStrm) - throws CRLException, X509ExtensionException { + public void encode(DerOutputStream outStrm) throws CRLException, + X509ExtensionException { try { if (revokedCert == null) { DerOutputStream tmp = new DerOutputStream(); @@ -236,8 +250,7 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Gets the serial number for this RevokedCertificate, - * the <em>userCertificate</em>. + * Gets the serial number for this RevokedCertificate, the <em>userCertificate</em>. * * @return the serial number. */ @@ -246,8 +259,7 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Gets the revocation date for this RevokedCertificate, - * the <em>revocationDate</em>. + * Gets the revocation date for this RevokedCertificate, the <em>revocationDate</em>. * * @return the revocation date. */ @@ -277,8 +289,8 @@ public class RevokedCertImpl extends RevokedCertificate if (extensions != null) { sb.append("\n"); for (int i = 0; i < extensions.size(); i++) - sb.append("Entry Extension[" + i + "]: " + - ((Extension) (extensions.elementAt(i))).toString()); + sb.append("Entry Extension[" + i + "]: " + + ((Extension) (extensions.elementAt(i))).toString()); } sb.append("\n"); return (sb.toString()); @@ -299,7 +311,7 @@ public class RevokedCertImpl extends RevokedCertificate for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -317,9 +329,9 @@ public class RevokedCertImpl extends RevokedCertificate Set<String> extSet = new LinkedHashSet<String>(); Extension ex; for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -348,7 +360,7 @@ public class RevokedCertImpl extends RevokedCertificate Extension ex = null; ObjectIdentifier inCertOID; for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { crlExt = ex; @@ -419,10 +431,9 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Serialization write ... X.509 certificates serialize as - * themselves, and they're parsed when they get read back. - * (Actually they serialize as some type data from the - * serialization subsystem, then the cert data.) + * Serialization write ... X.509 certificates serialize as themselves, and + * they're parsed when they get read back. (Actually they serialize as some + * type data from the serialization subsystem, then the cert data.) */ private synchronized void writeObject(ObjectOutputStream stream) throws CRLException, X509ExtensionException, IOException { @@ -432,8 +443,8 @@ public class RevokedCertImpl extends RevokedCertificate } /** - * Serialization read ... X.509 certificates serialize as - * themselves, and they're parsed when they get read back. + * Serialization read ... X.509 certificates serialize as themselves, and + * they're parsed when they get read back. */ private synchronized void readObject(ObjectInputStream stream) throws CRLException, X509ExtensionException, IOException { diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java index 64eed427e..2087d064a 100644 --- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -89,4 +89,7 @@ public abstract class RevokedCertificate extends X509CRLEntry { * @return a string representation of this revoked certificate. */ public abstract String toString(); + + public abstract CRLExtensions getExtensions(); + } diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index 779503e60..c30ae1576 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -226,7 +226,7 @@ public class SubjectAlternativeNameExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(SUBJECT_NAME); diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index 40e7a3f0d..b249ef600 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -263,7 +263,7 @@ public class SubjectDirAttributesExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); return (elements.elements()); } diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index fd22b20f0..ea0ebae82 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -206,7 +206,7 @@ public class SubjectKeyIdentifierExtension extends Extension * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(KEY_ID); diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java index 180ed9a5c..920b0e1e4 100644 --- a/pki/base/util/src/netscape/security/x509/X500Name.java +++ b/pki/base/util/src/netscape/security/x509/X500Name.java @@ -694,7 +694,7 @@ public class X500Name implements Principal, GeneralNameInterface { */ private static final int ipAddress_data[] = // SKIP - { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 }; + { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 }; /** OID for "IP=" IP address attributes, used with SKIP. */ public static final ObjectIdentifier ipAddress_oid = new ObjectIdentifier(ipAddress_data); diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java index aac89e21a..1c87c79b8 100644 --- a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -206,7 +206,8 @@ public class X500NameAttrMap { Hashtable<String, ObjectIdentifier> name2OID = new Hashtable<String, ObjectIdentifier>(); Hashtable<ObjectIdentifier, String> oid2Name = new Hashtable<ObjectIdentifier, String>(); - Hashtable<ObjectIdentifier, AVAValueConverter> oid2ValueConverter = new Hashtable<ObjectIdentifier, AVAValueConverter>(); + Hashtable<ObjectIdentifier, AVAValueConverter> oid2ValueConverter = + new Hashtable<ObjectIdentifier, AVAValueConverter>(); // // global defaults. diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index 360028734..d2d77cb3a 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -912,8 +912,8 @@ public class X509CertImpl extends X509Certificate return null; Set<String> extSet = new LinkedHashSet<String>(); Extension ex; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); if (ex.isCritical()) extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); } @@ -941,8 +941,8 @@ public class X509CertImpl extends X509Certificate Set<String> extSet = new LinkedHashSet<String>(); Extension ex; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); if (!ex.isCritical()) extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); } @@ -962,8 +962,8 @@ public class X509CertImpl extends X509Certificate Extension ex = null; ; ObjectIdentifier inCertOID; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { return ex; @@ -996,8 +996,8 @@ public class X509CertImpl extends X509Certificate Extension ex = null; ; ObjectIdentifier inCertOID; - for (Enumeration e = exts.getElements(); e.hasMoreElements();) { - ex = (Extension) e.nextElement(); + for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { + ex = e.nextElement(); inCertOID = ex.getExtensionId(); if (inCertOID.equals(findOID)) { certExt = ex; diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java index 9dd43de3f..4777cd958 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -223,7 +223,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Return an enumeration of names of attributes existing within this * attribute. */ - public Enumeration<String> getElements() { + public Enumeration<String> getAttributeNames() { Vector<String> elements = new Vector<String>(); elements.addElement(VERSION); elements.addElement(SERIAL_NUMBER); |