2006-12-30 Casey Marshall <csm@gnu.org>

	* gnu/java/security/x509/X509Certificate.java (serialVersionUID):
	new constant.
	(extensions): parameterize.
	(getExtendedKeyUsage): parameterize return type.
	(getSubjectAlternativeNames): parameterize return type; handle changes
	to `SubjectAlternativeNames' class.
	(getIssuerAlternativeNames): parameterize return type; handle changes
	to `IssuerAlternativeNames' class.
	(getCriticalExtensionOIDs, getNonCriticalExtensionOIDs): parameterize
	return type.
	* gnu/java/security/x509/ext/CertificatePolicies.java
	(policies, policyQualifierInfos): parameterize.
	* gnu/java/security/x509/ext/ExtendedKeyUsage.java (purposeIds):
	parameterize.
	* gnu/java/security/x509/ext/Extension.java (<init>): add support
	for NameConstraints extension.
	* gnu/java/security/x509/ext/GeneralName.java: new class.
	* gnu/java/security/x509/ext/GeneralNames.java (names): parameterize;
	retrofit to use the GeneralName class.
	* gnu/java/security/x509/ext/GeneralSubtree.java: new class.
	* gnu/java/security/x509/ext/IssuerAlternativeNames.java (getNames):
	change return type to GeneralName parameterized list.
	* gnu/java/security/x509/ext/NameConstraints.java: new class.
	* gnu/java/security/x509/ext/SubjectAlternativeNames.java (getNames):
	change return type to GeneralName parameterized list.
	* java/security/cert/X509CertSelector.java: re-sorted methods.
	(makeName): new method.
	(addPathToName, addPathToName, getPathToNames, getPolicy,
	getSubjectAlternativeNames, setPathToNames, setPolicy): implemented.
	(keyPurposeSet, altNames, policy): parametized.
	(pathToNames): new field.

1 files changed, 5 insertions, 5 deletions

diff --git a/gnu/java/security/x509/ext/ExtendedKeyUsage.java b/gnu/java/security/x509/ext/ExtendedKeyUsage.java
index 37b08acf4..428013d04 100644
--- a/gnu/java/security/x509/ext/ExtendedKeyUsage.java
+++ b/gnu/java/security/x509/ext/ExtendedKeyUsage.java
@@ -1,5 +1,5 @@
 /* ExtendedKeyUsage.java -- the extended key usage extension.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -56,7 +56,7 @@ public class ExtendedKeyUsage extends Extension.Value
 
   public static final OID ID = new OID("2.5.29.37");
 
-  private final List purposeIds;
+  private final List<OID> purposeIds;
 
   // Constructor.
   // -------------------------------------------------------------------------
@@ -69,13 +69,13 @@ public class ExtendedKeyUsage extends Extension.Value
     if (!usageList.isConstructed())
       throw new IOException("malformed ExtKeyUsageSyntax");
     int len = 0;
-    purposeIds = new LinkedList();
+    purposeIds = new LinkedList<OID>();
     while (len < usageList.getLength())
       {
         DERValue val = der.read();
         if (val.getTag() != DER.OBJECT_IDENTIFIER)
           throw new IOException("malformed KeyPurposeId");
-        purposeIds.add(val.getValue());
+        purposeIds.add((OID) val.getValue());
         len += val.getEncodedLength();
       }
   }
@@ -83,7 +83,7 @@ public class ExtendedKeyUsage extends Extension.Value
   // Instance method.
   // -------------------------------------------------------------------------
 
-  public List getPurposeIds()
+  public List<OID> getPurposeIds()
   {
     return Collections.unmodifiableList(purposeIds);
   }