decl.c (init_decl_processing): Add new class "protectionDomain" field.

gcc/java:

2001-04-25  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>

	* decl.c (init_decl_processing): Add new class "protectionDomain"
	field.
	* class.c (make_class_data): Set initial value for "protectionDomain".

libjava:

2001-04-25  Bryce McKinlay  <bryce@albatross.co.nz>

	java.security merge and ClassLoader compliance fixes.

	* java/lang/Class.h (Class): Include ProtectionDomain.h.
	New protectionDomain field.
	(forName): Add initialize parameter. Fixes declaration to comply with
	JDK spec.
	* java/lang/natClass.cc (forName): Correct declaration of the three-arg
	variant. Honour	"initialize" flag.
	(getProtectionDomain0): New method.
	* java/lang/Class.java: Fix forName() declaration.
	(getPackage): New method based on Classpath implementation.
	(getProtectionDomain0): New native method decl.
	(getProtectionDomain): New method.
	* java/lang/ClassLoader.java (getParent): Now final.
	(definedPackages): New field.
	(getPackage): New.
	(defineClass): New variant with protectionDomain argument.
	(definePackage): New.
	(getPackages): New.
	(findSystemClass): Now final.
	(getSystemResourceAsStream): Remove redundant "final" modifier.
	(getSystemResource): Remove redundant "final" modifier.
	(getResources): Now final.
	(protectionDomainPermission): New static field.
	(unknownProtectionDomain): Ditto.
	(defaultProtectionDomain): Ditto.
	(getSystemClassLoader): Now non-native.
	* java/util/ResourceBundle.java (tryGetSomeBundle): Use the correct
	arguments for Class.forName().
	* java/lang/Package.java: New file.
	* gnu/gcj/runtime/VMClassLoader.java (getVMClassLoader): Removed.
	(instance): Static initialize singleton.
	(findClass): Override this, not findSystemClass.
	* java/lang/natClassLoader.cc (defineClass0): Set class's
	protectionDomain field as specified.
	(getSystemClassLoader): Removed.
	(findClass): Renamed from findSystemClass. Call the interpreter via
	URLClassLoader.findClass if loading class via dlopen fails.

	* java/security/*.java: java.security import/merge with Classpath.
	* java/security/acl/*.java: Likewise.
	* java/security/interfaces/*.java: Likewise.
	* java/security/spec/*.java: Likewise.
	* java/net/NetPermission.java: Likewise.
	* java/net/SocketPermission.java: Likewise.
	* gnu/java/security/provider/DefaultPolicy.java: Likewise.

	* Makefile.am: Add new classes.
	* Makefile.in: Rebuilt.
	* gcj/javaprims.h: CNI namespace rebuild.

From-SVN: r41543

1 files changed, 414 insertions, 99 deletions

diff --git a/libjava/java/security/Signature.java b/libjava/java/security/Signature.java
index 760f625..e9ea5cc 100644
--- a/libjava/java/security/Signature.java
+++ b/libjava/java/security/Signature.java
@@ -1,173 +1,488 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Signature.java --- Signature Class
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+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.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
 package java.security;
+import java.security.spec.AlgorithmParameterSpec;
 
 /**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date February 11, 2000.
- */
+   Signature is used to provide an interface to digital signature 
+   algorithms. Digital signatures provide authentication and data 
+   integrity of digital data. 
 
-/**
- * Written using on-line Java Platform 1.1 API Specification.
- * Status:  Believed complete and correct to 1.1 spec.
- * It is known not to comply with the 1.2 spec.
- */
+   The GNU provider provides the NIST standard DSA which uses DSA 
+   and SHA-1. It can be specified by SHA/DSA, SHA-1/DSA or its 
+   OID. If the RSA signature algorithm is provided then
+   it could be MD2/RSA. MD5/RSA, or SHA-1/RSA. The algorithm must
+   be specified because there is no default.
+
+   Signature provides implementation-independent algorithms which 
+   are requested by the user through getInstance. It can be 
+   requested by specifying just the algorithm name or by 
+   specifying both the algorithm name and provider name. 
 
-public abstract class Signature
+   The three phases of using Signature are:
+
+   1. Initialing
+
+   * It must be initialized with a private key for 
+   signing. 
+   * It must be initialized with a public key for 
+   verifying.
+
+   2. Updating
+
+   Update the bytes for signing or verifying with calls 
+   to update.
+
+   3. Signing or Verify the signature on the currently stored
+   bytes by calling sign or verify.
+
+   @author Mark Benvenuto <ivymccough@worldnet.att.net>
+   @since JDK 1.1
+ */
+public abstract class Signature extends SignatureSpi
 {
-  protected Signature (String name)
+  /**
+     Possible state variable which signifies if it has not been 
+     initialized.
+   */
+  protected static final int UNINITIALIZED = 1;
+
+  /**
+     Possible state variable which signifies if it has been 
+     initialized for signing.
+   */
+  protected static final int SIGN = 2;
+
+  /**
+     Possible state variable which signifies if it has been 
+     initialized for verifying.
+   */
+  protected static final int VERIFY = 3;
+
+  /**
+     State of this Signature class.
+   */
+  protected int state = UNINITIALIZED;
+
+  private String algorithm;
+  private Provider provider;
+
+  /**
+     Creates a new signature for this algorithm.
+
+     @param algorithm the algorithm to use
+   */
+  protected Signature(String algorithm)
   {
+    this.algorithm = algorithm;
     state = UNINITIALIZED;
-    this.name = name;
   }
 
-  public static Signature getInstance (String algorithm)
+  /** 
+     Gets an instance of the Signature class representing
+     the specified signature. If the algorithm is not found then, 
+     it throws NoSuchAlgorithmException.
+
+     @param algorithm the name of signature algorithm to choose
+     @return a Signature repesenting the desired algorithm
+
+     @throws NoSuchAlgorithmException if the algorithm is not implemented by providers
+   */
+  public static Signature getInstance(String algorithm)
     throws NoSuchAlgorithmException
   {
     String name = "Signature." + algorithm;
-    Provider[] provs = Security.getProviders ();
-    for (int i = 0; i < provs.length; ++i)
+    Provider[] p = Security.getProviders();
+
+    for (int i = 0; i < p.length; i++)
       {
-	String val = provs[i].getProperty (name);
-	if (val != null)
-	  {
-	    try
-	      {
-		return (Signature) Class.forName(val).newInstance ();
-	      }
-	    catch (Throwable _)
-	      {
-		// We just ignore failures.
-	      }
-	  }
+	String classname = p[i].getProperty(name);
+	if (classname != null)
+	  return getInstance(classname, algorithm, p[i]);
       }
 
-    throw new NoSuchAlgorithmException (algorithm);
+    throw new NoSuchAlgorithmException(algorithm);
   }
 
-  public static Signature getInstance (String algorithm, String provider)
+  /** 
+     Gets an instance of the Signature class representing
+     the specified signature from the specified provider. If the 
+     algorithm is not found then, it throws NoSuchAlgorithmException.
+     If the provider is not found, then it throws
+     NoSuchProviderException.
+
+     @param algorithm the name of signature algorithm to choose
+     @param provider the name of the provider to find the algorithm in
+     @return a Signature repesenting the desired algorithm
+
+     @throws NoSuchAlgorithmException if the algorithm is not implemented by the provider
+     @throws NoSuchProviderException if the provider is not found
+   */
+  public static Signature getInstance(String algorithm, String provider)
     throws NoSuchAlgorithmException, NoSuchProviderException
   {
-    String name = "Signature." + algorithm;
-    Provider p = Security.getProvider (provider);
+    Provider p = Security.getProvider(provider);
     if (p == null)
-      throw new NoSuchProviderException (provider);
-    String val = p.getProperty (name);
-    if (val != null)
+      throw new NoSuchProviderException();
+
+    return getInstance(p.getProperty("Signature." + algorithm), algorithm, p);
+  }
+
+  private static Signature getInstance(String classname,
+				       String algorithm,
+				       Provider provider)
+    throws NoSuchAlgorithmException
+  {
+    try
       {
-	try
-	  {
-	    return (Signature) Class.forName(val).newInstance ();
-	  }
-	catch (Throwable _)
+	Object o = Class.forName(classname).newInstance();
+	Signature sig;
+	if (o instanceof SignatureSpi)
+	  sig = (Signature) (new DummySignature((SignatureSpi) o, algorithm));
+	else
 	  {
-	    // Nothing.
+	    sig = (Signature) o;
+	    sig.algorithm = algorithm;
 	  }
+
+	sig.provider = provider;
+	return sig;
+      }
+    catch (ClassNotFoundException cnfe)
+      {
+	throw new NoSuchAlgorithmException("Class not found");
+      }
+    catch (InstantiationException ie)
+      {
+	throw new NoSuchAlgorithmException("Class instantiation failed");
+      }
+    catch (IllegalAccessException iae)
+      {
+	throw new NoSuchAlgorithmException("Illegal Access");
       }
+  }
+
+  /**
+     Gets the provider that the Signature is from.
+
+     @return the provider the this Signature 
+   */
+  public final Provider getProvider()
+  {
+    return provider;
+  }
+
+  /**
+     Initializes this class with the public key for 
+     verification purposes.
+
+     @param publicKey the public key to verify with
 
-    throw new NoSuchAlgorithmException (algorithm);
+     @throws InvalidKeyException invalid key
+   */
+  public final void initVerify(PublicKey publicKey) throws InvalidKeyException
+  {
+    state = VERIFY;
+    engineInitVerify(publicKey);
   }
 
-  public final void initVerify (PublicKey publicKey)
+  /**
+     Verify Signature with a certificate. This is a FIPS 140-1 compatible method
+     since it verifies a signature with a certificate.
+
+     If the certificate is an X.509 certificate, has a KeyUsage parameter and
+     the parameter indicates this key is not to be used for signing then an 
+     error is returned.
+
+     @param certificate a certificate containing a public key to verify with
+   */
+  public final void initVerify(java.security.cert.Certificate certificate)
     throws InvalidKeyException
   {
-    engineInitVerify (publicKey);
+    state = VERIFY;
+    if (certificate.getType().equals("X509"))
+      {
+	java.security.cert.X509Certificate cert =
+	  (java.security.cert.X509Certificate) certificate;
+
+	boolean[]array = cert.getKeyUsage();
+	if (array != null && array[0] == false)
+	  throw new InvalidKeyException
+	    ("KeyUsage of this Certificate indicates it cannot be used for digital signing");
+      }
+    this.initVerify(certificate.getPublicKey());
   }
 
-  public final void initSign (PrivateKey privateKey)
+  /**
+     Initializes this class with the private key for 
+     signing purposes.
+
+     @param privateKey the private key to sign with
+
+     @throws InvalidKeyException invalid key
+   */
+  public final void initSign(PrivateKey privateKey) throws InvalidKeyException
+  {
+    state = SIGN;
+    engineInitSign(privateKey);
+  }
+
+  /**
+     Initializes this class with the private key and source 
+     of randomness for signing purposes.
+
+     @param privateKey the private key to sign with
+     @param random Source of randomness
+
+     @throws InvalidKeyException invalid key
+
+     @since JDK 1.2
+   */
+  public final void initSign(PrivateKey privateKey, SecureRandom random)
     throws InvalidKeyException
   {
-    engineInitSign (privateKey);
+    state = SIGN;
+    engineInitSign(privateKey, random);
   }
 
-  public final byte[] sign ()
-    throws SignatureException
+
+  /**
+     Returns the signature bytes of all the data fed to this class.
+     The format of the output depends on the underlying signature
+     algorithm.
+
+     @return the signature
+
+     @throws SignatureException engine not properly initialized
+   */
+  public final byte[] sign() throws SignatureException
   {
-    return engineSign ();
+    if (state == SIGN)
+      {
+	state = UNINITIALIZED;
+	return engineSign();
+      }
+    else
+      throw new SignatureException();
   }
 
-  public final boolean verify (byte[] signature)
+  /**
+     Generates signature bytes of all the data fed to this class 
+     and outputs it to the passed array. The format of the 
+     output depends on the underlying signature algorithm.
+
+     After calling this method, the signature is reset to its
+     initial state and can be used to generate additional
+     signatures.
+
+     @param outbuff array of bytes
+     @param offset the offset to start at in the array
+     @param len the length of the bytes to put into the array. 
+     Neither this method or the GNU provider will 
+     return partial digests. If len is less than the 
+     signature length, this method will throw 
+     SignatureException. If it is greater than or equal
+     then it is ignored.
+
+     @return number of bytes in outbuf
+
+     @throws SignatureException engine not properly initialized
+
+     @since JDK 1.2
+   */
+  public final int sign(byte[]outbuf, int offset, int len)
     throws SignatureException
   {
-    return engineVerify (signature);
+    if (state == SIGN)
+      {
+	state = UNINITIALIZED;
+	return engineSign(outbuf, offset, len);
+      }
+    else
+      throw new SignatureException();
   }
 
-  public final void update (byte b)
-    throws SignatureException
+  /**
+     Verifies the passed signature.
+
+     @param signature the signature bytes to verify
+
+     @return true if verified, false otherwise
+
+     @throws SignatureException engine not properly initialized
+     or wrong signature
+   */
+  public final boolean verify(byte[]signature) throws SignatureException
   {
-    engineUpdate (b);
+    if (state == VERIFY)
+      {
+	state = UNINITIALIZED;
+	return engineVerify(signature);
+      }
+    else
+      throw new SignatureException();
   }
 
-  public final void update (byte[] data)
-    throws SignatureException
+  /**
+     Updates the data to be signed or verified with the specified 
+     byte.
+
+     @param b byte to update with
+
+     @throws SignatureException Engine not properly initialized
+   */
+  public final void update(byte b) throws SignatureException
   {
-    engineUpdate (data, 0, data.length);
+    if (state != UNINITIALIZED)
+      engineUpdate(b);
+    else
+      throw new SignatureException();
   }
 
-  public final void update (byte[] data, int off, int len)
+  /**
+     Updates the data to be signed or verified with the specified 
+     bytes.
+
+     @param data array of bytes
+
+     @throws SignatureException engine not properly initialized
+   */
+  public final void update(byte[]data) throws SignatureException
+  {
+    if (state != UNINITIALIZED)
+      engineUpdate(data, 0, data.length);
+    else
+      throw new SignatureException();
+  }
+
+  /**
+     Updates the data to be signed or verified with the specified 
+     bytes.
+
+     @param data array of bytes
+     @param off the offset to start at in the array
+     @param len the length of the bytes to use in the array
+
+     @throws SignatureException engine not properly initialized
+   */
+  public final void update(byte[]data, int off, int len)
     throws SignatureException
   {
-    engineUpdate (data, off, len);
+    if (state != UNINITIALIZED)
+      engineUpdate(data, off, len);
+    else
+      throw new SignatureException();
   }
 
-  public final String getAlgorithm ()
+  /** 
+     Gets the name of the algorithm currently used.
+     The names of algorithms are usually SHA/DSA or SHA/RSA.
+
+     @return name of algorithm.
+   */
+  public final String getAlgorithm()
   {
-    return name;
+    return algorithm;
   }
 
-  public String toString ()
+  /**
+     Returns a representation of the Signature as a String
+
+     @return a string representing the signature
+   */
+  public String toString()
   {
-    // There is no spec for this.  FIXME: this is a bad choice.
-    return name + "; state = " + state;
+    return (algorithm + " Signature");
   }
 
-  public final void setParameter (String param, Object value)
+  /**
+     Sets the specified algorithm parameter to the specified value.
+
+     @param param parameter name
+     @param value parameter value
+
+     @throws InvalidParameterException invalid parameter, parameter 
+     already set and cannot set again, a security exception, 
+     etc.
+
+     @deprecated use the other setParameter
+   */
+  public final void setParameter(String param, Object value)
     throws InvalidParameterException
   {
-    engineSetParameter (param, value);
+    engineSetParameter(param, value);
   }
 
-  public final Object getParameter (String param)
-    throws InvalidParameterException
+  /**
+     Sets the signature engine with the specified 
+     AlgorithmParameterSpec;
+
+     By default this always throws UnsupportedOperationException 
+     if not overridden;
+
+     @param params the parameters
+
+     @throws InvalidParameterException invalid parameter, parameter 
+     already set and cannot set again, a security exception, 
+     etc.
+   */
+  public final void setParameter(AlgorithmParameterSpec params)
+    throws InvalidAlgorithmParameterException
   {
-    return engineGetParameter (param);
-  }
-
-  protected abstract void engineInitVerify (PublicKey publicKey)
-    throws InvalidKeyException;
-  protected abstract void engineInitSign (PrivateKey privateKey)
-    throws InvalidKeyException;
-  protected abstract void engineUpdate (byte b)
-    throws SignatureException;
-  protected abstract void engineUpdate (byte[] b, int off, int len)
-    throws SignatureException;
-  protected abstract byte[] engineSign ()
-    throws SignatureException;
-  protected abstract boolean engineVerify (byte[] sigBytes)
-    throws SignatureException;
-  protected abstract void engineSetParameter (String param, Object value)
-    throws InvalidParameterException;
-  protected abstract Object engineGetParameter (String param)
-    throws InvalidParameterException;
+    engineSetParameter(params);
+  }
 
-  public Object clone() throws CloneNotSupportedException
+  /**
+     Gets the value for the specified algorithm parameter.
+
+     @param param parameter name
+
+     @return parameter value
+
+     @throws InvalidParameterException invalid parameter
+
+     @deprecated use the other getParameter
+   */
+  public final Object getParameter(String param)
+    throws InvalidParameterException
   {
-    return super.clone ();
+    return engineGetParameter(param);
   }
 
-  protected static final int UNINITIALIZED = 0;
-  protected static final int SIGN          = 2;
-  protected static final int VERIFY        = 3;
+  /**
+     Returns a clone if cloneable.
 
-  // Current state.
-  protected int state;
+     @return a clone if cloneable.
 
-  // Name of this object.
-  private String name;
+     @throws CloneNotSupportedException if the implementation does 
+     not support cloning
+   */
+  public Object clone() throws CloneNotSupportedException
+  {
+    throw new CloneNotSupportedException();
+  }
 }