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.


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

1 files changed, 217 insertions, 47 deletions

diff --git a/libjava/java/security/KeyPairGenerator.java b/libjava/java/security/KeyPairGenerator.java
index 7954c3270ac..aff73103575 100644
--- a/libjava/java/security/KeyPairGenerator.java
+++ b/libjava/java/security/KeyPairGenerator.java
@@ -1,86 +1,256 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* KeyPairGenerator.java --- Key Pair Generator 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 Warren Levy <warrenl@cygnus.com>
- * @date February 10, 2000.
- */
+   KeyPairGenerator is the class used to generate key pairs
+   for a security algorithm.
 
-/**
- * Written using on-line Java Platform 1.2 API Specification.
- * Status:  Partially implemented to the 1.1 spec.
- * It is known not to comply with the 1.2 spec.
- */
+   The KeyPairGenerator is created with the getInstance()
+   methods. The class is used to generate public and private
+   keys for an algorithm and associate it with 
+   algorithm parameters.
 
+   @author Mark Benvenuto
+ */
 public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
 {
+  private Provider provider;
+  private String algorithm;
+
+  /**
+     Constructs a new KeyPairGenerator
+
+     @param algorithm the algorithm to use
+   */
   protected KeyPairGenerator(String algorithm)
   {
-    name = algorithm;
+    this.algorithm = algorithm;
+    this.provider = null;
   }
 
-  public static KeyPairGenerator getInstance(String algorithm)
-    throws NoSuchAlgorithmException
+  /**
+     Returns the name of the algorithm used
+
+     @return A string with the name of the algorithm
+   */
+  public String getAlgorithm()
   {
+    return algorithm;
+  }
+
+  /** 
+     Gets an instance of the KeyPairGenerator class 
+     which generates key pairs for the specified algorithm. 
+     If the algorithm is not found then, it throws NoSuchAlgorithmException.
+
+     @param algorithm the name of algorithm to choose
+     @return a AlgorithmParameterGenerator repesenting the desired algorithm
+
+     @throws NoSuchAlgorithmException if the algorithm is not implemented by providers
+   */
+  public static KeyPairGenerator getInstance(String algorithm) throws
+    NoSuchAlgorithmException
+  {
+    Provider[] p = Security.getProviders();
+
     String name = "KeyPairGenerator." + algorithm;
-    Provider[] provs = Security.getProviders();
-    for (int i = 0; i < provs.length; ++i)
+    for (int i = 0; i < p.length; i++)
       {
-	String val = provs[i].getProperty(name);
-	if (val != null)
-	  {
-	    try
-	      {
-		return (KeyPairGenerator) 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);
   }
 
+  /** 
+     Gets an instance of the KeyPairGenerator class 
+     which generates key pairs for the specified algorithm. 
+     If the algorithm is not found then, it throws NoSuchAlgorithmException.
+
+     @param algorithm the name of algorithm to choose
+     @param provider the name of the provider to find the algorithm in
+     @return a AlgorithmParameterGenerator 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 KeyPairGenerator getInstance(String algorithm, String provider)
     throws NoSuchAlgorithmException, NoSuchProviderException
   {
-    String name = "KeyPairGenerator." + algorithm;
     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("KeyPairGenerator." + algorithm),
+		       algorithm, p);
+  }
+
+  private static KeyPairGenerator getInstance(String classname,
+					      String algorithm,
+					      Provider provider)
+    throws NoSuchAlgorithmException
+  {
+    try
       {
-	try
-	  {
-	    return (KeyPairGenerator) Class.forName(val).newInstance();
-	  }
-	catch (Throwable _)
+	Object o = Class.forName(classname).newInstance();
+	KeyPairGenerator kpg;
+	if (o instanceof KeyPairGeneratorSpi)
+	  kpg =
+	    (KeyPairGenerator) (new
+				DummyKeyPairGenerator((KeyPairGeneratorSpi) o,
+						      algorithm));
+	else
 	  {
-	    // Nothing.
+	    kpg = (KeyPairGenerator) o;
+	    kpg.algorithm = algorithm;
 	  }
+
+	kpg.provider = provider;
+	return kpg;
+      }
+    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");
+      }
+  }
 
-    throw new NoSuchAlgorithmException(algorithm);
+  /**
+     Gets the provider that the class is from.
+
+     @return the provider of this class
+   */
+  public final Provider getProvider()
+  {
+    return provider;
   }
 
-  public String getAlgorithm()
+  /**
+     Initializes the KeyPairGenerator for the specified key size.
+     (Since no source of randomness is specified, a default one is
+     provided.)
+
+     @param keysize Size of key to generate
+   */
+  public void initialize(int keysize)
+  {
+    initialize(keysize, new SecureRandom());
+  }
+
+  /**
+     Initializes the KeyPairGenerator for the specified key size
+     and specified SecureRandom.
+
+     @param keysize Size of key to generate
+     @param random SecureRandom to use
+
+     @since JDK 1.2
+   */
+  public void initialize(int keysize, SecureRandom random)
+  {
+    initialize(keysize, random);
+  }
+
+  /**
+     Initializes the KeyPairGenerator with the specified
+     AlgorithmParameterSpec class.
+     (Since no source of randomness is specified, a default one is
+     provided.)
+
+     @param params AlgorithmParameterSpec to initialize with
+
+     @since JDK 1.2
+   */
+  public void initialize(AlgorithmParameterSpec params)
+    throws InvalidAlgorithmParameterException
   {
-    return name;
+    initialize(params, new SecureRandom());
   }
 
-  public abstract void initialize(int strength, SecureRandom random);
-  public abstract KeyPair generateKeyPair();
+  /**
+     Initializes the KeyPairGenerator with the specified
+     AlgorithmParameterSpec class and specified SecureRandom.
 
-  // Algorithm name.
-  private String name;
+     @param params AlgorithmParameterSpec to initialize with
+     @param random SecureRandom to use
+
+     @since JDK 1.2
+   */
+  public void initialize(AlgorithmParameterSpec params, SecureRandom random)
+    throws InvalidAlgorithmParameterException
+  {
+    super.initialize(params, random);
+  }
+
+  /**
+     Generates a KeyPair according the rules for the algorithm.
+     Unless intialized, algorithm defaults will be used. It 
+     creates a unique key pair each time.
+
+     Same as generateKeyPair();
+
+     @return a key pair
+   */
+  public final KeyPair genKeyPair()
+  {
+    try
+      {
+	return getInstance("DSA", "GNU").generateKeyPair();
+      }
+    catch (Exception e)
+      {
+	System.err.println("genKeyPair failed: " + e);
+	e.printStackTrace();
+	return null;
+      }
+  }
+
+  /**
+     Generates a KeyPair according the rules for the algorithm.
+     Unless intialized, algorithm defaults will be used. It 
+     creates a unique key pair each time.
+
+     Same as genKeyPair();
+
+     @return a key pair
+   */
+  public KeyPair generateKeyPair()
+  {
+    return genKeyPair();
+  }
 }