Cipher.java, [...]: Import cleanup.

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

	* javax/crypto/Cipher.java,
	javax/crypto/EncryptedPrivateKeyInfo.java,
	javax/crypto/ExemptionMechanism.java,
	javax/crypto/KeyAgreement.java,
	javax/crypto/KeyGenerator.java,
	javax/crypto/Mac.java,
	javax/crypto/SecretKeyFactory.java,
	javax/crypto/SecretKeyFactorySpi.java,
	javax/crypto/spec/SecretKeySpec.java:
	Import cleanup.

From-SVN: r89398

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7ddfd77f59079370def4a8718959e7ddcc1d36ee..86dfe20f6cff46bcd24f50acaefc77a2346c9c5c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2004-10-21  Michael Koch  <konqueror@gmx.de>
+
+       * javax/crypto/Cipher.java,
+       javax/crypto/EncryptedPrivateKeyInfo.java,
+       javax/crypto/ExemptionMechanism.java,
+       javax/crypto/KeyAgreement.java,
+       javax/crypto/KeyGenerator.java,
+       javax/crypto/Mac.java,
+       javax/crypto/SecretKeyFactory.java,
+       javax/crypto/SecretKeyFactorySpi.java,
+       javax/crypto/spec/SecretKeySpec.java:
+       Import cleanup.
+
 2004-10-21  Michael Koch  <konqueror@gmx.de>
 
        * java/security/AlgorithmParameterGenerator.java,

diff --git a/libjava/javax/crypto/Cipher.java b/libjava/javax/crypto/Cipher.java
index af7f2f244194a83545cefff214146317114f12cf..2e2d28f7ff4c6ad9b454a5aa3cd242537616ace8 100644 (file)
--- a/libjava/javax/crypto/Cipher.java
+++ b/libjava/javax/crypto/Cipher.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.crypto;
 
+import gnu.java.security.Engine;
+
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -50,11 +52,8 @@ import java.security.Security;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.security.spec.AlgorithmParameterSpec;
-
 import java.util.StringTokenizer;
 
-import gnu.java.security.Engine;
-
 /**
  * <p>This class implements a cryptographic cipher for transforming
  * data.</p>

diff --git a/libjava/javax/crypto/EncryptedPrivateKeyInfo.java b/libjava/javax/crypto/EncryptedPrivateKeyInfo.java
index b64fbd6af5c4ae2242254ff0bfe32898db8dc582..2d565f1189e3b24842a50b2db3223b3728fae231 100644 (file)
--- a/libjava/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/libjava/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -44,14 +44,12 @@ import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
 import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import java.security.AlgorithmParameters;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * An implementation of the <code>EncryptedPrivateKeyInfo</code> ASN.1

diff --git a/libjava/javax/crypto/ExemptionMechanism.java b/libjava/javax/crypto/ExemptionMechanism.java
index 7fa658e9e379a6b69395f4c71e55fb70f3174277..2b2091e15056652f1e99bf18c3f70a914faacf5d 100644 (file)
--- a/libjava/javax/crypto/ExemptionMechanism.java
+++ b/libjava/javax/crypto/ExemptionMechanism.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.crypto;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -50,8 +51,6 @@ import java.security.Provider;
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import gnu.java.security.Engine;
-
 /**
  * An exemption mechanism, which will conditionally allow cryptography
  * where it is not normally allowed, implements things such as <i>key

diff --git a/libjava/javax/crypto/KeyAgreement.java b/libjava/javax/crypto/KeyAgreement.java
index 6f6ed34e04f35605eaa29e5305fd139f75fdd5ef..884e0f918e607383a893ae13b0ef630bb0b7aaf8 100644 (file)
--- a/libjava/javax/crypto/KeyAgreement.java
+++ b/libjava/javax/crypto/KeyAgreement.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.crypto;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -50,8 +51,6 @@ import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import gnu.java.security.Engine;
-
 /**
  * Key agreement is a method in which two or more parties may agree on a
  * secret key for symmetric cryptography or message authentication

diff --git a/libjava/javax/crypto/KeyGenerator.java b/libjava/javax/crypto/KeyGenerator.java
index 35753b036de2c22fc74fc1f3d1e402ec8dbe0310..3deda21fe2c843c5887e5f169ab3d69af2d4f714 100644 (file)
--- a/libjava/javax/crypto/KeyGenerator.java
+++ b/libjava/javax/crypto/KeyGenerator.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.crypto;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
@@ -48,8 +49,6 @@ import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import gnu.java.security.Engine;
-
 /**
  * A generic producer of keys for symmetric cryptography. The keys
  * returned may be simple wrappers around byte arrays, or, if the

diff --git a/libjava/javax/crypto/Mac.java b/libjava/javax/crypto/Mac.java
index 55f5be61b17af3c70339d491bc8fe4d945c92018..301ec327e4006552457696545fd4ae4c7735a390 100644 (file)
--- a/libjava/javax/crypto/Mac.java
+++ b/libjava/javax/crypto/Mac.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.crypto;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -49,8 +50,6 @@ import java.security.Provider;
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import gnu.java.security.Engine;
-
 /**
  * This class implements a "message authentication code" (MAC), a method
  * to ensure the integrity of data transmitted between two parties who

diff --git a/libjava/javax/crypto/SecretKeyFactory.java b/libjava/javax/crypto/SecretKeyFactory.java
index d12e1b582e9b1d8b86f40b4c2e0a79bd1279bda9..d543c57c7e2c1b6869f9f7774689d631810c8faf 100644 (file)
--- a/libjava/javax/crypto/SecretKeyFactory.java
+++ b/libjava/javax/crypto/SecretKeyFactory.java
@@ -38,17 +38,16 @@ exception statement from your version. */
 
 package javax.crypto;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Provider;
 import java.security.Security;
-import java.security.spec.KeySpec;
 import java.security.spec.InvalidKeySpecException;
-
-import gnu.java.security.Engine;
+import java.security.spec.KeySpec;
 
 /**
  * A secret key factory translates {@link SecretKey} objects to and from

diff --git a/libjava/javax/crypto/SecretKeyFactorySpi.java b/libjava/javax/crypto/SecretKeyFactorySpi.java
index 7b4763dff4133cbb291c5f46da54b914db924927..41c8152706a9cd4e1d0c77dc56bd2915594a9420 100644 (file)
--- a/libjava/javax/crypto/SecretKeyFactorySpi.java
+++ b/libjava/javax/crypto/SecretKeyFactorySpi.java
@@ -39,8 +39,8 @@ exception statement from your version. */
 package javax.crypto;
 
 import java.security.InvalidKeyException;
-import java.security.spec.KeySpec;
 import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
 
 /**
  * The <i>Service Provider Interface</i> (<b>SPI</b>) for the {@link

diff --git a/libjava/javax/crypto/spec/SecretKeySpec.java b/libjava/javax/crypto/spec/SecretKeySpec.java
index 6d9f4b8feb2683c2c5c2ce257a88a3c1ab056507..63c696840bf074a1601bb8cd3808bda9950ccbf7 100644 (file)
--- a/libjava/javax/crypto/spec/SecretKeySpec.java
+++ b/libjava/javax/crypto/spec/SecretKeySpec.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.crypto.spec;
 
 import java.security.spec.KeySpec;
+
 import javax.crypto.SecretKey;
 
 /**