Index: javax/crypto/Cipher.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/Cipher.java,v
retrieving revision 1.2
diff -u -r1.2 Cipher.java
--- javax/crypto/Cipher.java	20 Oct 2004 08:09:25 -0000	1.2
+++ javax/crypto/Cipher.java	21 Oct 2004 20:38:05 -0000
@@ -38,6 +38,8 @@
 
 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.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>
Index: javax/crypto/EncryptedPrivateKeyInfo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/EncryptedPrivateKeyInfo.java,v
retrieving revision 1.1
diff -u -r1.1 EncryptedPrivateKeyInfo.java
--- javax/crypto/EncryptedPrivateKeyInfo.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/EncryptedPrivateKeyInfo.java	21 Oct 2004 20:38:05 -0000
@@ -44,14 +44,12 @@
 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
Index: javax/crypto/ExemptionMechanism.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/ExemptionMechanism.java,v
retrieving revision 1.1
diff -u -r1.1 ExemptionMechanism.java
--- javax/crypto/ExemptionMechanism.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/ExemptionMechanism.java	21 Oct 2004 20:38:05 -0000
@@ -38,8 +38,9 @@
 
 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.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
Index: javax/crypto/KeyAgreement.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/KeyAgreement.java,v
retrieving revision 1.1
diff -u -r1.1 KeyAgreement.java
--- javax/crypto/KeyAgreement.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/KeyAgreement.java	21 Oct 2004 20:38:05 -0000
@@ -38,8 +38,9 @@
 
 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.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
Index: javax/crypto/KeyGenerator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/KeyGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 KeyGenerator.java
--- javax/crypto/KeyGenerator.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/KeyGenerator.java	21 Oct 2004 20:38:05 -0000
@@ -38,8 +38,9 @@
 
 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.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
Index: javax/crypto/Mac.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/Mac.java,v
retrieving revision 1.1
diff -u -r1.1 Mac.java
--- javax/crypto/Mac.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/Mac.java	21 Oct 2004 20:38:05 -0000
@@ -38,8 +38,9 @@
 
 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.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
Index: javax/crypto/SecretKeyFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/SecretKeyFactory.java,v
retrieving revision 1.2
diff -u -r1.2 SecretKeyFactory.java
--- javax/crypto/SecretKeyFactory.java	20 Oct 2004 08:09:26 -0000	1.2
+++ javax/crypto/SecretKeyFactory.java	21 Oct 2004 20:38:05 -0000
@@ -38,17 +38,16 @@
 
 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 address@hidden SecretKey} objects to and from
Index: javax/crypto/SecretKeyFactorySpi.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/SecretKeyFactorySpi.java,v
retrieving revision 1.1
diff -u -r1.1 SecretKeyFactorySpi.java
--- javax/crypto/SecretKeyFactorySpi.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/SecretKeyFactorySpi.java	21 Oct 2004 20:38:05 -0000
@@ -39,8 +39,8 @@
 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 address@hidden
Index: javax/crypto/spec/SecretKeySpec.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/crypto/spec/SecretKeySpec.java,v
retrieving revision 1.1
diff -u -r1.1 SecretKeySpec.java
--- javax/crypto/spec/SecretKeySpec.java	21 Sep 2004 08:33:31 -0000	1.1
+++ javax/crypto/spec/SecretKeySpec.java	21 Oct 2004 20:38:05 -0000
@@ -39,6 +39,7 @@
 package javax.crypto.spec;
 
 import java.security.spec.KeySpec;
+
 import javax.crypto.SecretKey;
 
 /**