2003-04-30 Michael Koch <konqueror@gmx.de>

	* gnu/java/security/Engine.java,
	gnu/java/security/OID.java,
	gnu/java/security/der/BitString.java,
	gnu/java/security/der/DER.java,
	gnu/java/security/der/DERReader.java,
	gnu/java/security/der/DERValue.java,
	gnu/java/security/der/DERWriter.java,
	gnu/java/security/provider/DSAKeyFactory.java,
	gnu/java/security/provider/X509CertificateFactory.java,
	gnu/java/security/x509/X500DistinguishedName.java,
	gnu/java/security/x509/X509CRL.java,
	gnu/java/security/x509/X509CRLEntry.java,
	gnu/java/security/x509/X509Certificate.java,
	java/security/cert/CRLSelector.java,
	java/security/cert/CertPathBuilder.java,
	java/security/cert/CertPathBuilderResult.java,
	java/security/cert/CertPathBuilderSpi.java,
	java/security/cert/CertPathParameters.java,
	java/security/cert/CertPathValidator.java,
	java/security/cert/CertPathValidatorResult.java,
	java/security/cert/CertPathValidatorSpi.java,
	java/security/cert/CertSelector.java,
	java/security/cert/CertStore.java,
	java/security/cert/CertStoreParameters.java,
	java/security/cert/CertStoreSpi.java,
	java/security/cert/CollectionCertStoreParameters.java,
	java/security/cert/LDAPCertStoreParameters.java,
	java/security/cert/PKIXBuilderParameters.java,
	java/security/cert/PKIXCertPathBuilderResult.java,
	java/security/cert/PKIXCertPathChecker.java,
	java/security/cert/PKIXCertPathValidatorResult.java,
	java/security/cert/PKIXParameters.java,
	java/security/cert/PolicyNode.java,
	java/security/cert/PolicyQualifierInfo.java,
	java/security/cert/TrustAnchor.java,
	javax/security/auth/x500/X500Principal.java:
	New files from classpath.
	* gnu/java/io/ASN1ParsingException.java,
	gnu/java/io/Base64InputStream.java,
	gnu/java/security/der/DEREncodingException.java,
	gnu/java/security/provider/DSAParameters.java,
	gnu/java/security/provider/DSASignature.java,
	gnu/java/security/provider/Gnu.java,
	gnu/java/security/provider/GnuDSAPrivateKey.java,
	gnu/java/security/provider/GnuDSAPublicKey.java,
	java/security/AlgorithmParameterGenerator.java,
	java/security/AlgorithmParameters.java,
	java/security/KeyFactory.java,
	java/security/KeyPairGenerator.java,
	java/security/KeyStore.java,
	java/security/MessageDigest.java,
	java/security/SecureClassLoader.java,
	java/security/SecureRandom.java,
	java/security/Security.java,
	java/security/Signature.java,
	java/security/cert/Certificate.java,
	java/security/cert/CertificateFactory.java,
	java/security/cert/CertificateFactorySpi.java,
	java/security/cert/X509CRL.java,
	java/security/cert/X509Certificate.java,
	java/security/spec/DSAPublicKeySpec.java:
	New versions from classpath.
	* gnu/java/security/provider/DERReader.java,
	gnu/java/security/provider/DERWriter.java,
	java/security/Engine.java: Removed.
	* Makefile.am
	(java_source_files, javax_source_files): Added new files.
	* Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66283 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 134 insertions, 0 deletions

diff --git a/libjava/gnu/java/security/provider/DSAKeyFactory.java b/libjava/gnu/java/security/provider/DSAKeyFactory.java
new file mode 100644
index 00000000000..3414f423c48
--- /dev/null
+++ b/libjava/gnu/java/security/provider/DSAKeyFactory.java
@@ -0,0 +1,134 @@
+/* DSAKeyFactory.java -- DSA key factory.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.security.provider;
+
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.KeyFactorySpi;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.DSAPublicKey;
+import java.security.spec.DSAPrivateKeySpec;
+import java.security.spec.DSAPublicKeySpec;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+
+/**
+ * DSA key factory.
+ *
+ * @author Casey Marshall (rsdio@metastatic.org)
+ */
+public class DSAKeyFactory extends KeyFactorySpi
+{
+
+  // Constructor.
+  // ------------------------------------------------------------------------
+
+  public DSAKeyFactory()
+  {
+    super();
+  }
+
+  // Instance methods.
+  // ------------------------------------------------------------------------
+
+  protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
+    throws InvalidKeySpecException
+  {
+    if (!(keySpec instanceof DSAPrivateKeySpec))
+      throw new InvalidKeySpecException();
+    return new GnuDSAPrivateKey(
+      ((DSAPrivateKeySpec) keySpec).getX(),
+      ((DSAPrivateKeySpec) keySpec).getP(),
+      ((DSAPrivateKeySpec) keySpec).getQ(),
+      ((DSAPrivateKeySpec) keySpec).getG());
+  }
+
+  protected PublicKey engineGeneratePublic(KeySpec keySpec)
+    throws InvalidKeySpecException
+  {
+    if (!(keySpec instanceof DSAPublicKeySpec))
+      throw new InvalidKeySpecException();
+    return new GnuDSAPublicKey(
+      ((DSAPublicKeySpec) keySpec).getY(),
+      ((DSAPublicKeySpec) keySpec).getP(),
+      ((DSAPublicKeySpec) keySpec).getQ(),
+      ((DSAPublicKeySpec) keySpec).getG());
+  }
+
+  protected KeySpec engineGetKeySpec(Key key, Class keySpec)
+    throws InvalidKeySpecException
+  {
+    if ((key instanceof DSAPublicKey) &&
+         keySpec.isAssignableFrom(DSAPublicKeySpec.class))
+      {
+        return new DSAPublicKeySpec(((DSAPublicKey) key).getY(),
+          ((DSAPublicKey) key).getParams().getP(),
+          ((DSAPublicKey) key).getParams().getQ(),
+          ((DSAPublicKey) key).getParams().getG());
+      }
+    if ((key instanceof DSAPrivateKey) &&
+         keySpec.isAssignableFrom(DSAPrivateKeySpec.class))
+      {
+        return new DSAPrivateKeySpec(((DSAPrivateKey) key).getX(),
+          ((DSAPrivateKey) key).getParams().getP(),
+          ((DSAPrivateKey) key).getParams().getQ(),
+          ((DSAPrivateKey) key).getParams().getG());
+      }
+    throw new InvalidKeySpecException();
+  }
+
+  protected Key engineTranslateKey(Key key) throws InvalidKeyException
+  {
+    if ((key instanceof GnuDSAPublicKey) || (key instanceof GnuDSAPrivateKey))
+      return key;
+    if (key instanceof DSAPublicKey)
+      return new GnuDSAPublicKey(((DSAPublicKey) key).getY(),
+        ((DSAPublicKey) key).getParams().getP(),
+        ((DSAPublicKey) key).getParams().getQ(),
+        ((DSAPublicKey) key).getParams().getG());
+    if (key instanceof DSAPrivateKey)
+      return new GnuDSAPrivateKey(((DSAPrivateKey) key).getX(),
+        ((DSAPrivateKey) key).getParams().getP(),
+        ((DSAPrivateKey) key).getParams().getQ(),
+        ((DSAPrivateKey) key).getParams().getG());
+    throw new InvalidKeyException();
+  } 
+}