AlgorithmParameterGenerator.java, [...]: Import statements reorganized...

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.

From-SVN: r89319

libjava/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-18  Jeroen Frijters  <jeroen@frijters.net>
 
 	* java/security/Security.java

libjava/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);
   }

libjava/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);
   }

libjava/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;

libjava/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);

libjava/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);
   }

libjava/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);

libjava/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.
           }
       }
 

libjava/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);

libjava/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");
 

libjava/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();

libjava/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;

libjava/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;
   }

libjava/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);

libjava/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");
 

libjava/java/security/cert/CertPathBuilder.java

@@ -130,8 +130,9 @@ public class CertPathBuilder
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
 

libjava/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);

libjava/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.
           }
       }
 

libjava/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] )

libjava/java/security/cert/CertificateFactory.java

@@ -110,8 +110,9 @@ public class CertificateFactory
           {
             return getInstance(type, p[i]);
           }
-        catch (CertificateException ignored)
+        catch (CertificateException e)
           {
+	    // Ignored.
           }
       }
 

libjava/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.

libjava/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;

libjava/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] )

libjava/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] )

libjava/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;
 
 /**

libjava/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