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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 02b46c39eb8a173c107d998b378e10e83cecb103..ee5c8a499b54c554fc1ec91892eee1eba290bf37 100644 (file)
--- a/libjava/ChangeLog
+++ b/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

diff --git a/libjava/java/security/AlgorithmParameterGenerator.java b/libjava/java/security/AlgorithmParameterGenerator.java
index 034302504f05ece77ffcd7a04ac3cc9e7ab9d15e..fca301477757b25091d694a26f6d5a7c358fbd5f 100644 (file)
--- a/libjava/java/security/AlgorithmParameterGenerator.java
+++ b/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);
   }

diff --git a/libjava/java/security/AlgorithmParameters.java b/libjava/java/security/AlgorithmParameters.java
index 86298b9ea9348c1ad6531a3f0cf22aa2adab649f..9671907342ed0e87f16111c36db74d9d109170d0 100644 (file)
--- a/libjava/java/security/AlgorithmParameters.java
+++ b/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);
   }

diff --git a/libjava/java/security/DigestInputStream.java b/libjava/java/security/DigestInputStream.java
index 9fa987aa4faf5bda298ec97fd75bd09f018a00ac..f175312e286309857a71de1345f982d691128f91 100644 (file)
--- a/libjava/java/security/DigestInputStream.java
+++ b/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;

diff --git a/libjava/java/security/Identity.java b/libjava/java/security/Identity.java
index 2e9ddea1a2972afbc49bc471ac5e40ea4f1804ec..99af844e1afb743de6fdc379de242c2862f5c686 100644 (file)
--- a/libjava/java/security/Identity.java
+++ b/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);

diff --git a/libjava/java/security/KeyFactory.java b/libjava/java/security/KeyFactory.java
index 223d0d84af3ad24c089a1a0f4093b8b13ada63dd..bbca50859f86d9677743fc46b014656423c2778c 100644 (file)
--- a/libjava/java/security/KeyFactory.java
+++ b/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);
   }

diff --git a/libjava/java/security/KeyPairGenerator.java b/libjava/java/security/KeyPairGenerator.java
index 9a3a04d4ef82a9728edb42a9a68a6d06aaa1ec9c..11b143cc663e9b6046fe1b5ee32b5469184b775e 100644 (file)
--- a/libjava/java/security/KeyPairGenerator.java
+++ b/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);

diff --git a/libjava/java/security/KeyStore.java b/libjava/java/security/KeyStore.java
index 4ca16a2290eaf1f08456dd077d3cad223fa2afd6..2010e4ce487a9b36b50f08d79b04d94eb03463b5 100644 (file)
--- a/libjava/java/security/KeyStore.java
+++ b/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.
           }
       }
 

diff --git a/libjava/java/security/MessageDigest.java b/libjava/java/security/MessageDigest.java
index 8e4dfecb5eb9ada51999bb893d12959ff8db21ce..30c303537240d9a41eeff50cd9a71d4071e13a75 100644 (file)
--- a/libjava/java/security/MessageDigest.java
+++ b/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);

diff --git a/libjava/java/security/MessageDigestSpi.java b/libjava/java/security/MessageDigestSpi.java
index 509666c6cfdbd1e96e19de03736e33e4d4764147..f2447f17d865d5a9562b5476d2c61ffe6123f155 100644 (file)
--- a/libjava/java/security/MessageDigestSpi.java
+++ b/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");
 

diff --git a/libjava/java/security/Policy.java b/libjava/java/security/Policy.java
index 88f2e43d9e40a16b29adeb9b414f3ac4dd1e15e6..817d62377490cc2e6681e983ec93d3212ecb5c2a 100644 (file)
--- a/libjava/java/security/Policy.java
+++ b/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();

diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java
index d7fda7ba744e262fcaee084a240c8a74bc9858f1..5e410c0405c315c6bbf1da1ba56668b6490d3256 100644 (file)
--- a/libjava/java/security/SecureRandom.java
+++ b/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;

diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java
index 4aa797bcfefea80be6bd7522164a47f3274fc21e..3f17067981be321fcee2cc9cfbd0b42c51e58c3c 100644 (file)
--- a/libjava/java/security/Security.java
+++ b/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;
   }

diff --git a/libjava/java/security/Signature.java b/libjava/java/security/Signature.java
index 39c41263888541ce63b82a520bace00e6e4462f3..463f4105568b58b64eaa689a87db359ab00acfa9 100644 (file)
--- a/libjava/java/security/Signature.java
+++ b/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);

diff --git a/libjava/java/security/SignatureSpi.java b/libjava/java/security/SignatureSpi.java
index 0f95e526e4fb77ffb33986e118422c69164cf088..3b6bdbc99ab2f8272680b63e4508879a20c7ada1 100644 (file)
--- a/libjava/java/security/SignatureSpi.java
+++ b/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");
 

diff --git a/libjava/java/security/cert/CertPathBuilder.java b/libjava/java/security/cert/CertPathBuilder.java
index af935369074c964e9bed72a32b82917e14056cd1..c7cef43ecdf31baaa1cad5f283336604a531b49c 100644 (file)
--- a/libjava/java/security/cert/CertPathBuilder.java
+++ b/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.
           }
       }
 

diff --git a/libjava/java/security/cert/CertPathValidator.java b/libjava/java/security/cert/CertPathValidator.java
index 4c1262d379bebc19d8c763c6bb76d3f8a3beefd7..2ccce722c23dc99b35c992e1e96175bd85a1a848 100644 (file)
--- a/libjava/java/security/cert/CertPathValidator.java
+++ b/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);

diff --git a/libjava/java/security/cert/CertStore.java b/libjava/java/security/cert/CertStore.java
index 55326a4b2c95af1ef32710c0a39753a181b8a0fc..84e235057110a3888df807113ef02c068a3a40ff 100644 (file)
--- a/libjava/java/security/cert/CertStore.java
+++ b/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.
           }
       }
 

diff --git a/libjava/java/security/cert/Certificate.java b/libjava/java/security/cert/Certificate.java
index f4aff41d35ea060106f12fa7001d79523985ad04..72842fc6067e895cba917fcca254c024db04aee9 100644 (file)
--- a/libjava/java/security/cert/Certificate.java
+++ b/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] )

diff --git a/libjava/java/security/cert/CertificateFactory.java b/libjava/java/security/cert/CertificateFactory.java
index e60695491580e478da7bf1fe49698d4086a7543c..92736e3881da29b39ad5d11baa6798d6fd98f045 100644 (file)
--- a/libjava/java/security/cert/CertificateFactory.java
+++ b/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.
           }
       }
 

diff --git a/libjava/java/security/cert/PolicyQualifierInfo.java b/libjava/java/security/cert/PolicyQualifierInfo.java
index 8dede47fcb824f214e61dad6bbde3ade28385a5c..ab83901cc25de2967e0f97c34aea26e74da4e00c 100644 (file)
--- a/libjava/java/security/cert/PolicyQualifierInfo.java
+++ b/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.

diff --git a/libjava/java/security/cert/TrustAnchor.java b/libjava/java/security/cert/TrustAnchor.java
index ccd2a9fadb3dd2a764d02314068e12ba73da5c5d..3bb6ede004975b399c74ce21c9f36430559e4281 100644 (file)
--- a/libjava/java/security/cert/TrustAnchor.java
+++ b/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;

diff --git a/libjava/java/security/cert/X509CRL.java b/libjava/java/security/cert/X509CRL.java
index 6794ccb43adcc6104fd051dddfe9a2c9dea17f82..74f090c9de6df6aa5e67c982f84207973464872a 100644 (file)
--- a/libjava/java/security/cert/X509CRL.java
+++ b/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] )

diff --git a/libjava/java/security/cert/X509CRLEntry.java b/libjava/java/security/cert/X509CRLEntry.java
index f9e04246df4de5c97b550da523cce1746a07fbe0..99ff615cb4785691c7273863dd1127145654d5df 100644 (file)
--- a/libjava/java/security/cert/X509CRLEntry.java
+++ b/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] )

diff --git a/libjava/java/security/cert/X509Certificate.java b/libjava/java/security/cert/X509Certificate.java
index 413fea08ca3cd6a0a15e21470d36343bc76dbbcc..6b764842f61847c689fb5d8bfd51be7d870db4d7 100644 (file)
--- a/libjava/java/security/cert/X509Certificate.java
+++ b/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;
 
 /**

diff --git a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
index f2cb88bafd124f1503523f0fdcb8ce03989558f1..9bec96d1b378d8e5b4312f0ebe4a1640b7dac7fa 100644 (file)
--- a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+++ b/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