FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Michael Koch 2004-10-21 20:38:29 +00:00 • committed by Michael Koch
parent 78fe42c391
commit d69201f46e
10 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libjava/ChangeLog
View file

@ -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> 2004-10-21 Michael Koch <konqueror@gmx.de>
* java/security/AlgorithmParameterGenerator.java, * java/security/AlgorithmParameterGenerator.java,

5
libjava/javax/crypto/Cipher.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package javax.crypto; package javax.crypto;
import gnu.java.security.Engine;
import java.security.AlgorithmParameters; import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException; import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
@ -50,11 +52,8 @@ import java.security.Security;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.security.spec.AlgorithmParameterSpec; import java.security.spec.AlgorithmParameterSpec;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import gnu.java.security.Engine;
/** /**
* <p>This class implements a cryptographic cipher for transforming * <p>This class implements a cryptographic cipher for transforming
* data.</p> * data.</p>

6
libjava/javax/crypto/EncryptedPrivateKeyInfo.java
View file

@ -44,14 +44,12 @@ import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue; import gnu.java.security.der.DERValue;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.security.AlgorithmParameters; import java.security.AlgorithmParameters;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
import java.util.List;
/** /**
* An implementation of the <code>EncryptedPrivateKeyInfo</code> ASN.1 * An implementation of the <code>EncryptedPrivateKeyInfo</code> ASN.1

5
libjava/javax/crypto/ExemptionMechanism.java
View file

@ -38,8 +38,9 @@ exception statement from your version. */
package javax.crypto; 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.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException; import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
@ -50,8 +51,6 @@ import java.security.Provider;
import java.security.Security; import java.security.Security;
import java.security.spec.AlgorithmParameterSpec; import java.security.spec.AlgorithmParameterSpec;
import gnu.java.security.Engine;
/** /**
* An exemption mechanism, which will conditionally allow cryptography * An exemption mechanism, which will conditionally allow cryptography
* where it is not normally allowed, implements things such as <i>key * where it is not normally allowed, implements things such as <i>key

5
libjava/javax/crypto/KeyAgreement.java
View file

@ -38,8 +38,9 @@ exception statement from your version. */
package javax.crypto; 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.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.Key; import java.security.Key;
@ -50,8 +51,6 @@ import java.security.SecureRandom;
import java.security.Security; import java.security.Security;
import java.security.spec.AlgorithmParameterSpec; 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 * Key agreement is a method in which two or more parties may agree on a
* secret key for symmetric cryptography or message authentication * secret key for symmetric cryptography or message authentication

5
libjava/javax/crypto/KeyGenerator.java
View file

@ -38,8 +38,9 @@ exception statement from your version. */
package javax.crypto; 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.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException; import java.security.NoSuchProviderException;
@ -48,8 +49,6 @@ import java.security.SecureRandom;
import java.security.Security; import java.security.Security;
import java.security.spec.AlgorithmParameterSpec; import java.security.spec.AlgorithmParameterSpec;
import gnu.java.security.Engine;
/** /**
* A generic producer of keys for symmetric cryptography. The keys * A generic producer of keys for symmetric cryptography. The keys
* returned may be simple wrappers around byte arrays, or, if the * returned may be simple wrappers around byte arrays, or, if the

5
libjava/javax/crypto/Mac.java
View file

@ -38,8 +38,9 @@ exception statement from your version. */
package javax.crypto; 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.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.Key; import java.security.Key;
@ -49,8 +50,6 @@ import java.security.Provider;
import java.security.Security; import java.security.Security;
import java.security.spec.AlgorithmParameterSpec; import java.security.spec.AlgorithmParameterSpec;
import gnu.java.security.Engine;
/** /**
* This class implements a "message authentication code" (MAC), a method * This class implements a "message authentication code" (MAC), a method
* to ensure the integrity of data transmitted between two parties who * to ensure the integrity of data transmitted between two parties who

7
libjava/javax/crypto/SecretKeyFactory.java
View file

@ -38,17 +38,16 @@ exception statement from your version. */
package javax.crypto; 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.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException; import java.security.NoSuchProviderException;
import java.security.Provider; import java.security.Provider;
import java.security.Security; import java.security.Security;
import java.security.spec.KeySpec;
import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import gnu.java.security.Engine;
/** /**
* A secret key factory translates {@link SecretKey} objects to and from * A secret key factory translates {@link SecretKey} objects to and from

2
libjava/javax/crypto/SecretKeyFactorySpi.java
View file

@ -39,8 +39,8 @@ exception statement from your version. */
package javax.crypto; package javax.crypto;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.spec.KeySpec;
import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
/** /**
* The <i>Service Provider Interface</i> (<b>SPI</b>) for the {@link * The <i>Service Provider Interface</i> (<b>SPI</b>) for the {@link

1
libjava/javax/crypto/spec/SecretKeySpec.java
View file

@ -39,6 +39,7 @@ exception statement from your version. */
package javax.crypto.spec; package javax.crypto.spec;
import java.security.spec.KeySpec; import java.security.spec.KeySpec;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
/** /**