2004-11-07 Casey Marshall <csm@gnu.org>

	* gnu/java/security/provider/Gnu.java
	(<init>): add entries in a priviliged action.
	Add new algorithms.
	* gnu/java/security/provider/X509CertificateFactory.java
	(engineGenerateCertificate): chain exceptions.
	(engineGenerateCertificates): likewise.
	(engineGenerateCRL): likewise.
	(engineGenerateCRLs): likewise.
	(engineGenerateCertPath): new methods.
	(generateCert): throw exception if 'inStream' is null.
	(generateCRL): likewise.
	* gnu/java/security/x509/X500DistinguishedName.java: replaced with
	version from GNU Crypto CVS.
	* gnu/java/security/x509/X509CRL.java: likewise.
	* gnu/java/security/x509/X509CRLEntry.java: likewise.
	* gnu/java/security/x509/X509Certificate.java: likewise.
	* java/security/cert/TrustAnchor.java: call 'toString' and not
	toRFC2253.
	* gnu/java/security/provider/CollectionCertStoreImpl.java,
	* gnu/java/security/provider/EncodedKeyFactory.java,
	* gnu/java/security/provider/GnuDHPublicKey.java,
	* gnu/java/security/provider/GnuRSAPrivateKey.java,
	* gnu/java/security/provider/GnuRSAPublicKey.java,
	* gnu/java/security/provider/MD2withRSA.java,
	* gnu/java/security/provider/MD4withRSA.java,
	* gnu/java/security/provider/MD5withRSA.java,
	* gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
	* gnu/java/security/provider/RSA.java,
	* gnu/java/security/provider/RSAKeyFactory.java,
	* gnu/java/security/provider/SHA1withRSA.java,
	* gnu/java/security/x509/GnuPKIExtension.java,
	* gnu/java/security/x509/PolicyNodeImpl.java,
	* gnu/java/security/x509/Util.java,
	* gnu/java/security/x509/X509CRLSelectorImpl.java,
	* gnu/java/security/x509/X509CertPath.java,
	* gnu/java/security/x509/X509CertSelectorImpl.java,
	* gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
	* gnu/java/security/x509/ext/BasicConstraints.java,
	* gnu/java/security/x509/ext/CRLNumber.java,
	* gnu/java/security/x509/ext/CertificatePolicies.java,
	* gnu/java/security/x509/ext/ExtendedKeyUsage.java,
	* gnu/java/security/x509/ext/Extension.java,
	* gnu/java/security/x509/ext/GeneralNames.java,
	* gnu/java/security/x509/ext/IssuerAlternativeNames.java,
	* gnu/java/security/x509/ext/KeyUsage.java,
	* gnu/java/security/x509/ext/PolicyConstraint.java,
	* gnu/java/security/x509/ext/PolicyMappings.java,
	* gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
	* gnu/java/security/x509/ext/ReasonCode.java,
	* gnu/java/security/x509/ext/SubjectAlternativeNames.java,
	* gnu/java/security/x509/ext/SubjectKeyIdentifier.java:
	new files.

1 files changed, 121 insertions, 65 deletions

diff --git a/gnu/java/security/provider/Gnu.java b/gnu/java/security/provider/Gnu.java
index 70a7d1df1..02f509dc2 100644
--- a/gnu/java/security/provider/Gnu.java
+++ b/gnu/java/security/provider/Gnu.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -37,75 +37,131 @@ exception statement from your version. */
 
 
 package gnu.java.security.provider;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.security.Provider;
 
 public final class Gnu extends Provider
 {
   public Gnu()
   {
-    super("GNU", 1.0, "GNU provider v1.0 implementing SHA-1, MD5, DSA, X.509 Certificates");
-
-    // Note that all implementation class names are referenced by using
-    // Class.getName(). That way when we staticly link the Gnu provider
-    // we automatically get all the implementation classes.
-
-    // Signature
-    put("Signature.SHA1withDSA",
-        gnu.java.security.provider.DSASignature.class.getName());
-
-    put("Alg.Alias.Signature.DSS", "SHA1withDSA");
-    put("Alg.Alias.Signature.DSA", "SHA1withDSA");
-    put("Alg.Alias.Signature.SHAwithDSA", "SHA1withDSA");
-    put("Alg.Alias.Signature.DSAwithSHA", "SHA1withDSA");
-    put("Alg.Alias.Signature.DSAwithSHA1", "SHA1withDSA");
-    put("Alg.Alias.Signature.SHA/DSA", "SHA1withDSA");
-    put("Alg.Alias.Signature.SHA-1/DSA", "SHA1withDSA");
-    put("Alg.Alias.Signature.SHA1/DSA", "SHA1withDSA");
-    put("Alg.Alias.Signature.OID.1.2.840.10040.4.3", "SHA1withDSA");
-    put("Alg.Alias.Signature.1.2.840.10040.4.3", "SHA1withDSA");
-    put("Alg.Alias.Signature.1.3.14.3.2.13", "SHA1withDSA");
-    put("Alg.Alias.Signature.1.3.14.3.2.27", "SHA1withDSA");
-
-    // Key Pair Generator
-    put("KeyPairGenerator.DSA",
-        gnu.java.security.provider.DSAKeyPairGenerator.class.getName());
-
-    put("Alg.Alias.KeyPairGenerator.OID.1.2.840.10040.4.1", "DSA");
-    put("Alg.Alias.KeyPairGenerator.1.2.840.10040.4.1", "DSA");
-    put("Alg.Alias.KeyPairGenerator.1.3.14.3.2.12", "DSA");
-
-    // Key Factory
-    put("KeyFactory.DSA",
-        gnu.java.security.provider.DSAKeyFactory.class.getName());
-
-    put("Alg.Alias.KeyFactory.OID.1.2.840.10040.4.1", "DSA");
-    put("Alg.Alias.KeyFactory.1.2.840.10040.4.1", "DSA");
-    put("Alg.Alias.KeyFactory.1.3.14.3.2.12", "DSA");
-
-    // Message Digests
-    put("MessageDigest.SHA", gnu.java.security.provider.SHA.class.getName());
-    put("MessageDigest.MD5", gnu.java.security.provider.MD5.class.getName());
-
-    // Format "Alias", "Actual Name"
-    put("Alg.Alias.MessageDigest.SHA1", "SHA");
-    put("Alg.Alias.MessageDigest.SHA-1", "SHA");
-
-    // Algorithm Parameters
-    put("AlgorithmParameters.DSA",
-        gnu.java.security.provider.DSAParameters.class.getName());
-
-    // Algorithm Parameter Generator
-    put("AlgorithmParameterGenerator.DSA",
-        gnu.java.security.provider.DSAParameterGenerator.class.getName());
-
-    // SecureRandom
-    put("SecureRandom.SHA1PRNG",
-        gnu.java.security.provider.SHA1PRNG.class.getName());
-
-    // CertificateFactory
-    put("CertificateFactory.X.509",
-        gnu.java.security.provider.X509CertificateFactory.class.getName());
-
-    put("Alg.Alias.CertificateFactory.X509", "X.509");
+    super("GNU", 1.0, "GNU provider v1.0 implementing SHA-1, MD5, DSA, RSA, X.509 Certificates and CRLs, PKIX certificate path validators, Collection cert stores");
+
+    AccessController.doPrivileged (new PrivilegedAction()
+    {
+      public Object run()
+      {
+        // Note that all implementation class names are referenced by using
+        // Class.getName(). That way when we staticly link the Gnu provider
+        // we automatically get all the implementation classes.
+
+        // Signature
+        put("Signature.SHA1withDSA",
+            gnu.java.security.provider.DSASignature.class.getName());
+
+        put("Alg.Alias.Signature.DSS", "SHA1withDSA");
+        put("Alg.Alias.Signature.DSA", "SHA1withDSA");
+        put("Alg.Alias.Signature.SHAwithDSA", "SHA1withDSA");
+        put("Alg.Alias.Signature.DSAwithSHA", "SHA1withDSA");
+        put("Alg.Alias.Signature.DSAwithSHA1", "SHA1withDSA");
+        put("Alg.Alias.Signature.SHA/DSA", "SHA1withDSA");
+        put("Alg.Alias.Signature.SHA-1/DSA", "SHA1withDSA");
+        put("Alg.Alias.Signature.SHA1/DSA", "SHA1withDSA");
+        put("Alg.Alias.Signature.OID.1.2.840.10040.4.3", "SHA1withDSA");
+        put("Alg.Alias.Signature.1.2.840.10040.4.3", "SHA1withDSA");
+        put("Alg.Alias.Signature.1.3.14.3.2.13", "SHA1withDSA");
+        put("Alg.Alias.Signature.1.3.14.3.2.27", "SHA1withDSA");
+
+        put("Signature.MD2withRSA", MD2withRSA.class.getName());
+        put("Signature.MD2withRSA ImplementedIn", "Software");
+        put("Alg.Alias.Signature.md2WithRSAEncryption", "MD2withRSA");
+        put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.2", "MD2withRSA");
+        put("Alg.Alias.Signature.1.2.840.113549.1.1.2", "MD2withRSA");
+
+        put("Signature.MD4withRSA", MD4withRSA.class.getName());
+        put("Signature.MD4withRSA ImplementedIn", "Software");
+        put("Alg.Alias.Signature.md4WithRSAEncryption", "MD4withRSA");
+        put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.3", "MD4withRSA");
+        put("Alg.Alias.Signature.1.2.840.113549.1.1.3", "MD4withRSA");
+
+        put("Signature.MD5withRSA", MD5withRSA.class.getName());
+        put("Signature.MD5withRSA ImplementedIn", "Software");
+        put("Alg.Alias.Signature.md5WithRSAEncryption", "MD5withRSA");
+        put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.4", "MD5withRSA");
+        put("Alg.Alias.Signature.1.2.840.113549.1.1.4", "MD5withRSA");
+
+        put("Signature.SHA1withRSA", SHA1withRSA.class.getName());
+        put("Signature.SHA1withRSA ImplementedIn", "Software");
+        put("Alg.Alias.Signature.sha-1WithRSAEncryption", "SHA1withRSA");
+        put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.5", "SHA1withRSA");
+        put("Alg.Alias.Signature.1.2.840.113549.1.1.5", "SHA1withRSA");
+
+        // Key Pair Generator
+        put("KeyPairGenerator.DSA",
+            gnu.java.security.provider.DSAKeyPairGenerator.class.getName());
+
+        put("Alg.Alias.KeyPairGenerator.OID.1.2.840.10040.4.1", "DSA");
+        put("Alg.Alias.KeyPairGenerator.1.2.840.10040.4.1", "DSA");
+        put("Alg.Alias.KeyPairGenerator.1.3.14.3.2.12", "DSA");
+
+        // Key Factory
+        put("KeyFactory.DSA",
+            gnu.java.security.provider.DSAKeyFactory.class.getName());
+
+        put("KeyFactory.Encoded", EncodedKeyFactory.class.getName());
+        put("KeyFactory.Encoded ImplementedIn", "Software");
+        put("Alg.Alias.KeyFactory.X.509", "Encoded");
+        put("Alg.Alias.KeyFactory.X509", "Encoded");
+        put("Alg.Alias.KeyFactory.PKCS#8", "Encoded");
+        put("Alg.Alias.KeyFactory.PKCS8", "Encoded");
+
+        put("KeyFactory.RSA", RSAKeyFactory.class.getName());
+
+        put("Alg.Alias.KeyFactory.OID.1.2.840.10040.4.1", "DSA");
+        put("Alg.Alias.KeyFactory.1.2.840.10040.4.1", "DSA");
+        put("Alg.Alias.KeyFactory.1.3.14.3.2.12", "DSA");
+
+        // Message Digests
+        put("MessageDigest.SHA", gnu.java.security.provider.SHA.class.getName());
+        put("MessageDigest.MD5", gnu.java.security.provider.MD5.class.getName());
+
+        // Format "Alias", "Actual Name"
+        put("Alg.Alias.MessageDigest.SHA1", "SHA");
+        put("Alg.Alias.MessageDigest.SHA-1", "SHA");
+
+        // Algorithm Parameters
+        put("AlgorithmParameters.DSA",
+            gnu.java.security.provider.DSAParameters.class.getName());
+
+        put("Alg.Alias.AlgorithmParameters.DSS", "DSA");
+        put("Alg.Alias.AlgorithmParameters.SHAwithDSA", "DSA");
+        put("Alg.Alias.AlgorithmParameters.OID.1.2.840.10040.4.3", "DSA");
+        put("Alg.Alias.AlgorithmParameters.1.2.840.10040.4.3", "DSA");
+
+        // Algorithm Parameter Generator
+        put("AlgorithmParameterGenerator.DSA",
+            gnu.java.security.provider.DSAParameterGenerator.class.getName());
+
+        // SecureRandom
+        put("SecureRandom.SHA1PRNG",
+            gnu.java.security.provider.SHA1PRNG.class.getName());
+
+        // CertificateFactory
+        put("CertificateFactory.X509", X509CertificateFactory.class.getName());
+
+        put("CertificateFactory.X509 ImplementedIn", "Software");
+        put("Alg.Alias.CertificateFactory.X.509", "X509");
+
+        // CertPathValidator
+        put("CertPathValidator.PKIX", PKIXCertPathValidatorImpl.class.getName());
+        put("CertPathValidator.PKIX ImplementedIn", "Software");
+
+        // CertStore
+        put("CertStore.Collection", CollectionCertStoreImpl.class.getName());
+
+        return null;
+      }
+    });
   }
 }