004-11-15 Andreas Tobler <a.tobler@schweiz.ch>

	Import/Merge the X.509 certificate code from Classpath.

	* Makefile.am: Add imported files.
	* Makefile.in: Regenerate.

	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.

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

	* gnu/java/security/x509/X509CRL.java:
	Missed import statements in previous checkin.

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

	* gnu/java/security/x509/X509CertPath.java (parse): Fixed reference
	to 'X509CertificateImpl' from previous checkin.

From-SVN: r90682

1 files changed, 166 insertions, 0 deletions

diff --git a/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java
new file mode 100644
index 0000000..455326d
--- /dev/null
+++ b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java
@@ -0,0 +1,166 @@
+/* GnuRSAPrivateKey.java -- GNU RSA private key.
+   Copyright (C) 2004  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.math.BigInteger;
+
+import java.security.interfaces.RSAPrivateCrtKey;
+import java.security.spec.RSAPrivateCrtKeySpec;
+
+import java.util.ArrayList;
+
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERValue;
+
+class GnuRSAPrivateKey implements RSAPrivateCrtKey
+{
+
+  // Fields.
+  // -------------------------------------------------------------------------
+
+  private final RSAPrivateCrtKeySpec spec;
+  private byte[] encodedKey;
+
+  // Constructor.
+  // -------------------------------------------------------------------------
+
+  public GnuRSAPrivateKey(RSAPrivateCrtKeySpec spec)
+  {
+    this.spec = spec;
+  }
+
+  // Instance methods.
+  // -------------------------------------------------------------------------
+
+  public BigInteger getModulus()
+  {
+    return spec.getModulus();
+  }
+
+  public BigInteger getPrivateExponent()
+  {
+    return spec.getPrivateExponent();
+  }
+
+  public BigInteger getCrtCoefficient()
+  {
+    return spec.getCrtCoefficient();
+  }
+
+  public BigInteger getPrimeExponentP()
+  {
+    return spec.getPrimeExponentP();
+  }
+
+  public BigInteger getPrimeExponentQ()
+  {
+    return spec.getPrimeExponentQ();
+  }
+
+  public BigInteger getPrimeP()
+  {
+    return spec.getPrimeP();
+  }
+
+  public BigInteger getPrimeQ()
+  {
+    return spec.getPrimeQ();
+  }
+
+  public BigInteger getPublicExponent()
+  {
+    return spec.getPublicExponent();
+  }
+
+  public String getAlgorithm()
+  {
+    return "RSA";
+  }
+
+  public String getFormat()
+  {
+    return "PKCS#8";
+  }
+
+  /**
+   * The encoded form is:
+   *
+   * <pre>
+   * RSAPrivateKey ::= SEQUENCE {
+   *   version Version,
+   *   modulus INTEGER, -- n
+   *   publicExponent INTEGER, -- e
+   *   privateExponent INTEGER, -- d
+   *   prime1 INTEGER, -- p
+   *   prime2 INTEGER, -- q
+   *   exponent1 INTEGER, -- d mod (p-1)
+   *   exponent2 INTEGER, -- d mod (q-1)
+   *   coefficient INTEGER -- (inverse of q) mod p }
+   * </pre>
+   *
+   * <p>Which is in turn encoded in a PrivateKeyInfo structure from PKCS#8.
+   */
+  public byte[] getEncoded()
+  {
+    if (encodedKey != null)
+      return (byte[]) encodedKey.clone();
+    ArrayList key = new ArrayList(9);
+    key.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
+    key.add(new DERValue(DER.INTEGER, getModulus()));
+    key.add(new DERValue(DER.INTEGER, getPublicExponent()));
+    key.add(new DERValue(DER.INTEGER, getPrivateExponent()));
+    key.add(new DERValue(DER.INTEGER, getPrimeP()));
+    key.add(new DERValue(DER.INTEGER, getPrimeQ()));
+    key.add(new DERValue(DER.INTEGER, getPrimeExponentP()));
+    key.add(new DERValue(DER.INTEGER, getPrimeExponentQ()));
+    key.add(new DERValue(DER.INTEGER, getCrtCoefficient()));
+    DERValue pk = new DERValue(DER.SEQUENCE|DER.CONSTRUCTED, key);
+    ArrayList pki = new ArrayList(3);
+    pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
+    ArrayList alg = new ArrayList(2);
+    alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
+                         new OID("1.2.840.113549.1.1.1")));
+    alg.add(new DERValue(DER.NULL, null));
+    pki.add(new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, alg));
+    pki.add(new DERValue(DER.OCTET_STRING, pk.getEncoded()));
+    encodedKey = new DERValue(DER.SEQUENCE|DER.CONSTRUCTED, pki).getEncoded();
+    return (byte[]) encodedKey.clone();
+  }
+}