2004-10-20 Michael Koch <konqueror@gmx.de>

	* java/security/AlgorithmParameterGenerator.java,
	java/security/AlgorithmParameters.java,
	java/security/DigestInputStream.java,
	java/security/Identity.java,
	java/security/KeyFactory.java,
	java/security/KeyPairGenerator.java,
	java/security/KeyStore.java,
	java/security/MessageDigest.java,
	java/security/MessageDigestSpi.java,
	java/security/Policy.java,
	java/security/SecureRandom.java,
	java/security/Security.java,
	java/security/Signature.java,
	java/security/SignatureSpi.java,
	java/security/cert/CertPathBuilder.java,
	java/security/cert/CertPathValidator.java,
	java/security/cert/CertStore.java,
	java/security/cert/Certificate.java,
	java/security/cert/CertificateFactory.java,
	java/security/cert/PolicyQualifierInfo.java,
	java/security/cert/TrustAnchor.java,
	java/security/cert/X509CRL.java,
	java/security/cert/X509CRLEntry.java,
	java/security/cert/X509Certificate.java,
	java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java:
	Import statements reorganized, some little formatting issues,
	used java-style array declarations, added comments in empty catch
	blocks.

26 files changed, 98 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index c3d0f4540..3fa4f07ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2004-10-20  Michael Koch  <konqueror@gmx.de>
+
+	* java/security/AlgorithmParameterGenerator.java,
+	java/security/AlgorithmParameters.java,
+	java/security/DigestInputStream.java,
+	java/security/Identity.java,
+	java/security/KeyFactory.java,
+	java/security/KeyPairGenerator.java,
+	java/security/KeyStore.java,
+	java/security/MessageDigest.java,
+	java/security/MessageDigestSpi.java,
+	java/security/Policy.java,
+	java/security/SecureRandom.java,
+	java/security/Security.java,
+	java/security/Signature.java,
+	java/security/SignatureSpi.java,
+	java/security/cert/CertPathBuilder.java,
+	java/security/cert/CertPathValidator.java,
+	java/security/cert/CertStore.java,
+	java/security/cert/Certificate.java,
+	java/security/cert/CertificateFactory.java,
+	java/security/cert/PolicyQualifierInfo.java,
+	java/security/cert/TrustAnchor.java,
+	java/security/cert/X509CRL.java,
+	java/security/cert/X509CRLEntry.java,
+	java/security/cert/X509Certificate.java,
+	java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java:
+	Import statements reorganized, some little formatting issues,
+	used java-style array declarations, added comments in empty catch
+	blocks.
+
 2004-10-19  Jeroen Frijters  <jeroen@frijters.net>
 
 	* vm/reference/java/lang/VMClassLoader.java: Added imports
diff --git a/java/security/AlgorithmParameterGenerator.java b/java/security/AlgorithmParameterGenerator.java
index 034302504..fca301477 100644
--- a/java/security/AlgorithmParameterGenerator.java
+++ b/java/security/AlgorithmParameterGenerator.java
@@ -140,7 +140,10 @@ public class AlgorithmParameterGenerator
         {
           return getInstance(algorithm, p[i]);
         }
-      catch (NoSuchAlgorithmException ignored) {}
+      catch (NoSuchAlgorithmException e)
+	{
+	  // Ignore.
+	}
 
     throw new NoSuchAlgorithmException(algorithm);
   }
diff --git a/java/security/AlgorithmParameters.java b/java/security/AlgorithmParameters.java
index 86298b9ea..967190734 100644
--- a/java/security/AlgorithmParameters.java
+++ b/java/security/AlgorithmParameters.java
@@ -136,12 +136,16 @@ public class AlgorithmParameters
     throws NoSuchAlgorithmException
   {
     Provider[] p = Security.getProviders();
+
     for (int i = 0; i < p.length; i++)
       try
         {
           return getInstance(algorithm, p[i]);
         }
-      catch (NoSuchAlgorithmException ignored) {}
+      catch (NoSuchAlgorithmException e)
+	{
+	  // Ignore this.
+	}
 
     throw new NoSuchAlgorithmException(algorithm);
   }
diff --git a/java/security/DigestInputStream.java b/java/security/DigestInputStream.java
index 9fa987aa4..f175312e2 100644
--- a/java/security/DigestInputStream.java
+++ b/java/security/DigestInputStream.java
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package java.security;
-//import java.security.MessageDigest;
+
 import java.io.InputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/java/security/Identity.java b/java/security/Identity.java
index 2e9ddea1a..99af844e1 100644
--- a/java/security/Identity.java
+++ b/java/security/Identity.java
@@ -269,7 +269,7 @@ public abstract class Identity implements Principal, Serializable
    */
   public Certificate[] certificates()
   {
-    Certificate certs[] = new Certificate[certificates.size()];
+    Certificate[] certs = new Certificate[certificates.size()];
     int max = certificates.size();
     for (int i = 0; i < max; i++)
       certs[i] = (Certificate) certificates.elementAt(i);
diff --git a/java/security/KeyFactory.java b/java/security/KeyFactory.java
index 223d0d84a..bbca50859 100644
--- a/java/security/KeyFactory.java
+++ b/java/security/KeyFactory.java
@@ -39,7 +39,6 @@ package java.security;
 
 import java.security.spec.KeySpec;
 import java.security.spec.InvalidKeySpecException;
-import java.security.NoSuchAlgorithmException;
 
 import gnu.java.security.Engine;
 
@@ -132,7 +131,10 @@ public class KeyFactory
         {
           return getInstance(algorithm, p[i]);
         }
-      catch (NoSuchAlgorithmException ignored) {}
+      catch (NoSuchAlgorithmException e)
+	{
+	  // Ignore.
+	}
 
     throw new NoSuchAlgorithmException(algorithm);
   }
diff --git a/java/security/KeyPairGenerator.java b/java/security/KeyPairGenerator.java
index 9a3a04d4e..11b143cc6 100644
--- a/java/security/KeyPairGenerator.java
+++ b/java/security/KeyPairGenerator.java
@@ -173,7 +173,10 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
           {
             return getInstance(algorithm, p[i]);
 	  }
-        catch (NoSuchAlgorithmException ignored) {}
+	catch (NoSuchAlgorithmException e)
+	  {
+	    // Ignored.
+	  }
       }
 
     throw new NoSuchAlgorithmException(algorithm);
diff --git a/java/security/KeyStore.java b/java/security/KeyStore.java
index 4ca16a229..2010e4ce4 100644
--- a/java/security/KeyStore.java
+++ b/java/security/KeyStore.java
@@ -36,6 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package java.security;
+
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -129,8 +130,9 @@ public class KeyStore
           {
             return getInstance(type, p[i]);
           }
-        catch (KeyStoreException ignore)
+        catch (KeyStoreException e)
           {
+	    // Ignore.
           }
       }
 
diff --git a/java/security/MessageDigest.java b/java/security/MessageDigest.java
index 8e4dfecb5..30c303537 100644
--- a/java/security/MessageDigest.java
+++ b/java/security/MessageDigest.java
@@ -138,7 +138,10 @@ public abstract class MessageDigest extends MessageDigestSpi
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored) {}
+        catch (NoSuchAlgorithmException ignored)
+	  {
+	    // Ignore.
+	  }
       }
 
     throw new NoSuchAlgorithmException(algorithm);
diff --git a/java/security/MessageDigestSpi.java b/java/security/MessageDigestSpi.java
index 509666c6c..f2447f17d 100644
--- a/java/security/MessageDigestSpi.java
+++ b/java/security/MessageDigestSpi.java
@@ -126,7 +126,7 @@ public abstract class MessageDigestSpi
     if (engineGetDigestLength() > len)
       throw new DigestException("Buffer is too small.");
 
-    byte tmp[] = engineDigest();
+    byte[] tmp = engineDigest();
     if (tmp.length > len)
       throw new DigestException("Buffer is too small");
 
diff --git a/java/security/Policy.java b/java/security/Policy.java
index 88f2e43d9..817d62377 100644
--- a/java/security/Policy.java
+++ b/java/security/Policy.java
@@ -191,7 +191,10 @@ public abstract class Policy
             {
               currentPolicy = (Policy) Class.forName(pp).newInstance();
             }
-          catch (Exception ignored) {}
+	  catch (Exception e)
+	    {
+	      // Ignored.
+	    }
 
         if (currentPolicy == null)
           currentPolicy = new gnu.java.security.provider.DefaultPolicy();
diff --git a/java/security/SecureRandom.java b/java/security/SecureRandom.java
index d7fda7ba7..5e410c040 100644
--- a/java/security/SecureRandom.java
+++ b/java/security/SecureRandom.java
@@ -87,7 +87,7 @@ public class SecureRandom extends Random
    */
   public SecureRandom()
   {
-    Provider p[] = Security.getProviders();
+    Provider[] p = Security.getProviders();
 
     //Format of Key: SecureRandom.algname
     String key;
@@ -112,7 +112,10 @@ public class SecureRandom extends Random
                         provider = p[i];
                         return;
                       }
-                    catch (Throwable ignore) { }
+                    catch (Throwable t)
+		      {
+			// Ignore.
+		      }
                   }
               }
           }
@@ -167,18 +170,20 @@ public class SecureRandom extends Random
    * @throws NoSuchAlgorithmException If no installed provider implements
    *         the given algorithm.
    */
-  public static SecureRandom getInstance(String algorithm) throws
-    NoSuchAlgorithmException
+  public static SecureRandom getInstance(String algorithm)
+    throws NoSuchAlgorithmException
   {
-    Provider p[] = Security.getProviders();
+    Provider[] p = Security.getProviders();
+    
     for (int i = 0; i < p.length; i++)
       {
         try
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignore.
           }
       }
 
@@ -284,7 +289,7 @@ public class SecureRandom extends Random
     // Therefore we test.
     if (secureRandomSpi != null)
       {
-        byte tmp[] = { (byte) (0xff & (seed >> 56)),
+        byte[] tmp = { (byte) (0xff & (seed >> 56)),
 		       (byte) (0xff & (seed >> 48)),
 		       (byte) (0xff & (seed >> 40)),
 		       (byte) (0xff & (seed >> 32)),
@@ -324,7 +329,7 @@ public class SecureRandom extends Random
     if (numBits == 0)
       return 0;
 
-    byte tmp[] = new byte[numBits / 8 + (1 * (numBits % 8))];
+    byte[] tmp = new byte[numBits / 8 + (1 * (numBits % 8))];
 
     secureRandomSpi.engineNextBytes(tmp);
     randomBytesUsed += tmp.length;
@@ -349,7 +354,7 @@ public class SecureRandom extends Random
    */
   public static byte[] getSeed(int numBytes)
   {
-    byte tmp[] = new byte[numBytes];
+    byte[] tmp = new byte[numBytes];
 
     new Random().nextBytes(tmp);
     return tmp;
diff --git a/java/security/Security.java b/java/security/Security.java
index 4aa797bcf..3f1706798 100644
--- a/java/security/Security.java
+++ b/java/security/Security.java
@@ -38,12 +38,10 @@ exception statement from your version. */
 package java.security;
 
 import gnu.java.security.action.GetPropertyAction;
-import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.security.AccessController;
-import java.security.Provider;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -332,7 +330,7 @@ public final class Security
    */
   public static Provider[] getProviders()
   {
-    Provider array[] = new Provider[providers.size ()];
+    Provider[] array = new Provider[providers.size ()];
     providers.copyInto (array);
     return array;
   }
diff --git a/java/security/Signature.java b/java/security/Signature.java
index 39c412638..463f41055 100644
--- a/java/security/Signature.java
+++ b/java/security/Signature.java
@@ -177,7 +177,10 @@ public abstract class Signature extends SignatureSpi
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored) {}
+	catch (NoSuchAlgorithmException e)
+	  {
+	    // Ignored.
+	  }
       }
 
     throw new NoSuchAlgorithmException(algorithm);
diff --git a/java/security/SignatureSpi.java b/java/security/SignatureSpi.java
index 0f95e526e..3b6bdbc99 100644
--- a/java/security/SignatureSpi.java
+++ b/java/security/SignatureSpi.java
@@ -165,7 +165,7 @@ public abstract class SignatureSpi
   protected int engineSign(byte[] outbuf, int offset, int len)
     throws SignatureException
   {
-    byte tmp[] = engineSign();
+    byte[] tmp = engineSign();
     if (tmp.length > len)
       throw new SignatureException("Invalid Length");
 
diff --git a/java/security/cert/CertPathBuilder.java b/java/security/cert/CertPathBuilder.java
index af9353690..c7cef43ec 100644
--- a/java/security/cert/CertPathBuilder.java
+++ b/java/security/cert/CertPathBuilder.java
@@ -130,8 +130,9 @@ public class CertPathBuilder
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/java/security/cert/CertPathValidator.java b/java/security/cert/CertPathValidator.java
index 4c1262d37..2ccce722c 100644
--- a/java/security/cert/CertPathValidator.java
+++ b/java/security/cert/CertPathValidator.java
@@ -142,8 +142,9 @@ public class CertPathValidator {
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
     throw new NoSuchAlgorithmException(algorithm);
diff --git a/java/security/cert/CertStore.java b/java/security/cert/CertStore.java
index 55326a4b2..84e235057 100644
--- a/java/security/cert/CertStore.java
+++ b/java/security/cert/CertStore.java
@@ -146,8 +146,9 @@ public class CertStore
           {
             return getInstance(type, params, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/java/security/cert/Certificate.java b/java/security/cert/Certificate.java
index f4aff41d3..72842fc60 100644
--- a/java/security/cert/Certificate.java
+++ b/java/security/cert/Certificate.java
@@ -43,7 +43,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchProviderException;
 import java.security.SignatureException;
-import java.io.ObjectInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.InvalidObjectException;
 import java.io.ObjectStreamException;
@@ -116,8 +115,8 @@ public abstract class Certificate implements Serializable
 	if( getEncoded().length != x.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = x.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = x.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/java/security/cert/CertificateFactory.java b/java/security/cert/CertificateFactory.java
index e60695491..92736e388 100644
--- a/java/security/cert/CertificateFactory.java
+++ b/java/security/cert/CertificateFactory.java
@@ -110,8 +110,9 @@ public class CertificateFactory
           {
             return getInstance(type, p[i]);
           }
-        catch (CertificateException ignored)
+        catch (CertificateException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/java/security/cert/PolicyQualifierInfo.java b/java/security/cert/PolicyQualifierInfo.java
index 8dede47fc..ab83901cc 100644
--- a/java/security/cert/PolicyQualifierInfo.java
+++ b/java/security/cert/PolicyQualifierInfo.java
@@ -39,16 +39,12 @@ exception statement from your version. */
 package java.security.cert;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import gnu.java.io.ASN1ParsingException;
 import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DEREncodingException;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
-import gnu.java.security.der.DERWriter;
 
 /**
  * The PolicyQualifierInfo X.509 certificate extension.
diff --git a/java/security/cert/TrustAnchor.java b/java/security/cert/TrustAnchor.java
index ccd2a9fad..3bb6ede00 100644
--- a/java/security/cert/TrustAnchor.java
+++ b/java/security/cert/TrustAnchor.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
 import java.security.PublicKey;
 
 import gnu.java.security.x509.X500DistinguishedName;
diff --git a/java/security/cert/X509CRL.java b/java/security/cert/X509CRL.java
index 6794ccb43..74f090c9d 100644
--- a/java/security/cert/X509CRL.java
+++ b/java/security/cert/X509CRL.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 
 package java.security.cert;
+
 import java.math.BigInteger;
 import java.security.Principal;
 import java.security.PublicKey;
@@ -126,8 +127,8 @@ public abstract class X509CRL extends CRL implements X509Extension
 	if( getEncoded().length != x.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = x.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = x.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/java/security/cert/X509CRLEntry.java b/java/security/cert/X509CRLEntry.java
index f9e04246d..99ff615cb 100644
--- a/java/security/cert/X509CRLEntry.java
+++ b/java/security/cert/X509CRLEntry.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 
 package java.security.cert;
+
 import java.math.BigInteger;
 import java.util.Date;
 
@@ -96,8 +97,8 @@ public abstract class X509CRLEntry implements X509Extension
 	if( getEncoded().length != xe.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = xe.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = xe.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/java/security/cert/X509Certificate.java b/java/security/cert/X509Certificate.java
index 413fea08c..6b764842f 100644
--- a/java/security/cert/X509Certificate.java
+++ b/java/security/cert/X509Certificate.java
@@ -40,11 +40,6 @@ package java.security.cert;
 
 import java.math.BigInteger;
 import java.security.Principal;
-import java.security.PublicKey;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
 import java.util.Date;
 
 /**
diff --git a/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
index f2cb88baf..9bec96d1b 100644
--- a/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+++ b/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package java.security.spec;
 
 import java.math.BigInteger;
-import java.security.spec.RSAOtherPrimeInfo;
 
 /**
  * This class specifies an RSA multi-prime private key, as defined in the