9 files changed, 17 insertions, 24 deletions
diff --git a/libjava/javax/crypto/Cipher.java b/libjava/javax/crypto/Cipher.java
index af7f2f2..2e2d28f 100644
--- 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 b64fbd6..2d565f1 100644
--- 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 7fa658e..2b2091e 100644
--- 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 6f6ed34..884e0f9 100644
--- 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 35753b0..3deda21 100644
--- 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 55f5be6..301ec32 100644
--- 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 d12e1b5..d543c57 100644
--- 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 7b4763d..41c8152 100644
--- 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 6d9f4b8..63c6968 100644
--- 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;
 
 /**