* gnu/java/security/provider/DefaultPolicy.java: New file, from libgcj.

	* java/security: Merge from libgcj. These are mostly formatting
	fixes, with a few fixes and enhancements.

1 files changed, 74 insertions, 57 deletions

diff --git a/java/security/AlgorithmParameterGenerator.java b/java/security/AlgorithmParameterGenerator.java
index ec2b8e8ff..b10cb48d1 100644
--- a/java/security/AlgorithmParameterGenerator.java
+++ b/java/security/AlgorithmParameterGenerator.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
@@ -24,7 +24,6 @@ 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;
 
@@ -33,10 +32,10 @@ import java.security.spec.AlgorithmParameterSpec;
    algorithm parameters for specified algorithms.
    This class is used to generate the algorithm parameters
    for a specific algorithm.
-   
+
    @since JDK 1.2
    @author Mark Benvenuto
-*/
+ */
 public class AlgorithmParameterGenerator
 {
   private AlgorithmParameterGeneratorSpi paramGenSpi;
@@ -49,8 +48,10 @@ public class AlgorithmParameterGenerator
      @param paramSpi A parameters engine to use
      @param provider A provider to use
      @param algorithm The algorithm 
-  */
-  protected AlgorithmParameterGenerator(AlgorithmParameterGeneratorSpi paramGenSpi, Provider provider, String algorithm)
+   */
+  protected AlgorithmParameterGenerator(AlgorithmParameterGeneratorSpi
+					paramGenSpi, Provider provider,
+					String algorithm)
   {
     this.paramGenSpi = paramGenSpi;
     this.provider = provider;
@@ -61,82 +62,95 @@ public class AlgorithmParameterGenerator
      Returns the name of the algorithm used
 
      @return A string with the name of the algorithm
-  */
+   */
   public final String getAlgorithm()
   {
     return algorithm;
   }
 
   /** 
-      Gets an instance of the AlgorithmParameterGenerator class 
-      which generates algorithm parameters for the specified algorithm. 
-      If the algorithm is not found then, it throws NoSuchAlgorithmException.
+     Gets an instance of the AlgorithmParameterGenerator class 
+     which generates algorithm parameters 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
+     @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
-  */
+     @throws NoSuchAlgorithmException if the algorithm is not implemented by providers
+   */
   public static AlgorithmParameterGenerator getInstance(String algorithm)
     throws NoSuchAlgorithmException
   {
-    Provider[] p = Security.getProviders ();
+    Provider[] p = Security.getProviders();
 
     for (int i = 0; i < p.length; i++)
       {
-	String classname = p[i].getProperty ("AlgorithmParameterGenerator." + algorithm);
+	String classname =
+	  p[i].getProperty("AlgorithmParameterGenerator." + algorithm);
 	if (classname != null)
-	  return getInstance (classname, algorithm, p[i]);
+	  return getInstance(classname, algorithm, p[i]);
       }
 
-    throw new NoSuchAlgorithmException (algorithm);
+    throw new NoSuchAlgorithmException(algorithm);
   }
 
   /** 
-      Gets an instance of the AlgorithmParameterGenerator class 
-      which generates algorithm parameters 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 AlgorithmParameterGenerator getInstance(String algorithm, String provider) 
+     Gets an instance of the AlgorithmParameterGenerator class 
+     which generates algorithm parameters 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 AlgorithmParameterGenerator getInstance(String algorithm,
+							String provider)
     throws NoSuchAlgorithmException, NoSuchProviderException
   {
     Provider p = Security.getProvider(provider);
-    if( p == null)
+    if (p == null)
       throw new NoSuchProviderException();
 
-    return getInstance (p.getProperty ("AlgorithmParameterGenerator." + algorithm),
-			algorithm, p);
+    return getInstance(p.
+		       getProperty("AlgorithmParameterGenerator." +
+				   algorithm), algorithm, p);
   }
 
-  private static AlgorithmParameterGenerator getInstance (String classname,
-							  String algorithm,
-							  Provider provider)
+  private static AlgorithmParameterGenerator getInstance(String classname,
+							 String algorithm,
+							 Provider provider)
     throws NoSuchAlgorithmException
   {
 
-    try {
-      return new AlgorithmParameterGenerator( (AlgorithmParameterGeneratorSpi )Class.forName( classname ).newInstance(), provider, algorithm );
-    } 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");
-    }
+    try
+      {
+	return new
+	  AlgorithmParameterGenerator((AlgorithmParameterGeneratorSpi) Class.
+				      forName(classname).newInstance(),
+				      provider, algorithm);
+      }
+    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 class is from.
 
      @return the provider of this class
-  */
+   */
   public final Provider getProvider()
   {
     return provider;
@@ -148,10 +162,10 @@ public class AlgorithmParameterGenerator
      one is supplied).
 
      @param size size (in bits) to use
-  */
+   */
   public final void init(int size)
   {
-    init( size, new SecureRandom() );
+    init(size, new SecureRandom());
   }
 
   /**
@@ -160,10 +174,10 @@ public class AlgorithmParameterGenerator
 
      @param size size (in bits) to use
      @param random source of randomness to use
-  */
+   */
   public final void init(int size, SecureRandom random)
   {
-    paramGenSpi.engineInit( size, random );
+    paramGenSpi.engineInit(size, random);
   }
 
   /**
@@ -172,10 +186,11 @@ public class AlgorithmParameterGenerator
      a default one is supplied).
 
      @param genParamSpec the AlgorithmParameterSpec class to use
-  */
-  public final void init(AlgorithmParameterSpec genParamSpec) throws InvalidAlgorithmParameterException
+   */
+  public final void init(AlgorithmParameterSpec genParamSpec) throws
+    InvalidAlgorithmParameterException
   {
-    init( genParamSpec, new SecureRandom() );
+    init(genParamSpec, new SecureRandom());
   }
 
   /**
@@ -184,17 +199,19 @@ public class AlgorithmParameterGenerator
 
      @param genParamSpec the AlgorithmParameterSpec class to use
      @param random source of randomness to use
-  */
-  public final void init(AlgorithmParameterSpec genParamSpec, SecureRandom random) throws InvalidAlgorithmParameterException
+   */
+  public final void init(AlgorithmParameterSpec genParamSpec,
+			 SecureRandom random) throws
+    InvalidAlgorithmParameterException
   {
-    paramGenSpi.engineInit( genParamSpec, random );
+    paramGenSpi.engineInit(genParamSpec, random);
   }
 
   /**
      Generate a new set of AlgorithmParameters.
 
      @returns a new set of algorithm parameters
-  */
+   */
   public final AlgorithmParameters generateParameters()
   {
     return paramGenSpi.engineGenerateParameters();