diff options
Diffstat (limited to 'libjava/gnu/java/security/provider')
14 files changed, 53 insertions, 69 deletions
diff --git a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java b/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java index 1b22cc891e5..b67a4332c55 100644 --- a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java +++ b/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java @@ -39,15 +39,14 @@ exception statement from your version. */ package gnu.java.security.provider; import java.security.InvalidAlgorithmParameterException; -import java.security.cert.Certificate; -import java.security.cert.CertSelector; import java.security.cert.CRL; import java.security.cert.CRLSelector; +import java.security.cert.CertSelector; import java.security.cert.CertStoreException; import java.security.cert.CertStoreParameters; import java.security.cert.CertStoreSpi; +import java.security.cert.Certificate; import java.security.cert.CollectionCertStoreParameters; - import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; diff --git a/libjava/gnu/java/security/provider/DSAParameterGenerator.java b/libjava/gnu/java/security/provider/DSAParameterGenerator.java index f481f294dda..92032fa9431 100644 --- a/libjava/gnu/java/security/provider/DSAParameterGenerator.java +++ b/libjava/gnu/java/security/provider/DSAParameterGenerator.java @@ -38,9 +38,11 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.security.util.Prime; + import java.math.BigInteger; -import java.security.AlgorithmParameters; import java.security.AlgorithmParameterGeneratorSpi; +import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -49,8 +51,6 @@ import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; import java.util.Random; -import gnu.java.security.util.Prime; - public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { private int size; diff --git a/libjava/gnu/java/security/provider/DefaultPolicy.java b/libjava/gnu/java/security/provider/DefaultPolicy.java index f3385fa04fb..f7ef782fcee 100644 --- a/libjava/gnu/java/security/provider/DefaultPolicy.java +++ b/libjava/gnu/java/security/provider/DefaultPolicy.java @@ -1,4 +1,4 @@ -/* DefaultPolicy.java +/* DefaultPolicy.java -- Copyright (C) 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,7 +37,12 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.security.*; +import java.security.AllPermission; +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Permissions; +import java.security.Policy; /** * This is just a stub policy implementation which grants all permissions diff --git a/libjava/gnu/java/security/provider/EncodedKeyFactory.java b/libjava/gnu/java/security/provider/EncodedKeyFactory.java index 7dc5ee9337b..dd1a06a791a 100644 --- a/libjava/gnu/java/security/provider/EncodedKeyFactory.java +++ b/libjava/gnu/java/security/provider/EncodedKeyFactory.java @@ -44,9 +44,7 @@ import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import java.io.IOException; - import java.math.BigInteger; - import java.security.AlgorithmParameters; import java.security.InvalidKeyException; import java.security.Key; @@ -54,10 +52,9 @@ import java.security.KeyFactorySpi; import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.PublicKey; - import java.security.spec.DSAParameterSpec; -import java.security.spec.InvalidParameterSpecException; import java.security.spec.InvalidKeySpecException; +import java.security.spec.InvalidParameterSpecException; import java.security.spec.KeySpec; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.RSAPrivateCrtKeySpec; diff --git a/libjava/gnu/java/security/provider/GnuDHPublicKey.java b/libjava/gnu/java/security/provider/GnuDHPublicKey.java index fbf9d9f8633..d62fcc93a96 100644 --- a/libjava/gnu/java/security/provider/GnuDHPublicKey.java +++ b/libjava/gnu/java/security/provider/GnuDHPublicKey.java @@ -38,18 +38,17 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.math.BigInteger; +import gnu.java.security.OID; +import gnu.java.security.der.BitString; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERValue; +import java.math.BigInteger; import java.util.ArrayList; import javax.crypto.interfaces.DHPublicKey; import javax.crypto.spec.DHParameterSpec; -import gnu.java.security.OID; -import gnu.java.security.der.BitString; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERValue; - public class GnuDHPublicKey implements DHPublicKey { diff --git a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java index 72fe38784d5..8cac9c351f9 100644 --- a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java +++ b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java @@ -45,13 +45,10 @@ import gnu.java.security.der.DERWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; - import java.math.BigInteger; - -import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPrivateKey; import java.security.spec.DSAParameterSpec; - import java.util.ArrayList; public class GnuDSAPrivateKey implements DSAPrivateKey diff --git a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java index 9ec827d41ae..6f3a29da9af 100644 --- a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java +++ b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java @@ -46,13 +46,10 @@ import gnu.java.security.der.DERWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; - import java.math.BigInteger; - -import java.security.interfaces.DSAPublicKey; import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPublicKey; import java.security.spec.DSAParameterSpec; - import java.util.ArrayList; public class GnuDSAPublicKey implements DSAPublicKey diff --git a/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java index 455326dd082..45a212552a9 100644 --- a/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java +++ b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java @@ -38,17 +38,15 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.math.BigInteger; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERValue; +import java.math.BigInteger; import java.security.interfaces.RSAPrivateCrtKey; import java.security.spec.RSAPrivateCrtKeySpec; - import java.util.ArrayList; -import gnu.java.security.OID; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERValue; - class GnuRSAPrivateKey implements RSAPrivateCrtKey { diff --git a/libjava/gnu/java/security/provider/GnuRSAPublicKey.java b/libjava/gnu/java/security/provider/GnuRSAPublicKey.java index 502fcccbf0f..05377446745 100644 --- a/libjava/gnu/java/security/provider/GnuRSAPublicKey.java +++ b/libjava/gnu/java/security/provider/GnuRSAPublicKey.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.math.BigInteger; -import java.security.interfaces.RSAPublicKey; -import java.security.spec.RSAPublicKeySpec; -import java.util.ArrayList; - import gnu.java.security.OID; import gnu.java.security.der.BitString; import gnu.java.security.der.DER; import gnu.java.security.der.DERValue; +import java.math.BigInteger; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.RSAPublicKeySpec; +import java.util.ArrayList; + class GnuRSAPublicKey implements RSAPublicKey { diff --git a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java index 7bba5021338..3e493ee6d08 100644 --- a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java +++ b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java @@ -41,8 +41,8 @@ package gnu.java.security.provider; import gnu.java.security.OID; import gnu.java.security.x509.GnuPKIExtension; import gnu.java.security.x509.PolicyNodeImpl; -import gnu.java.security.x509.X509CertSelectorImpl; import gnu.java.security.x509.X509CRLSelectorImpl; +import gnu.java.security.x509.X509CertSelectorImpl; import gnu.java.security.x509.ext.BasicConstraints; import gnu.java.security.x509.ext.CertificatePolicies; import gnu.java.security.x509.ext.Extension; @@ -50,12 +50,10 @@ import gnu.java.security.x509.ext.KeyUsage; import gnu.java.security.x509.ext.PolicyConstraint; import java.io.IOException; - import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.PublicKey; - -import java.security.cert.CertificateException; +import java.security.cert.CRL; import java.security.cert.CertPath; import java.security.cert.CertPathParameters; import java.security.cert.CertPathValidatorException; @@ -63,16 +61,15 @@ import java.security.cert.CertPathValidatorResult; import java.security.cert.CertPathValidatorSpi; import java.security.cert.CertStore; import java.security.cert.CertStoreException; -import java.security.cert.CRL; +import java.security.cert.CertificateException; import java.security.cert.PKIXCertPathChecker; import java.security.cert.PKIXCertPathValidatorResult; import java.security.cert.PKIXParameters; import java.security.cert.TrustAnchor; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPublicKey; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/libjava/gnu/java/security/provider/RSA.java b/libjava/gnu/java/security/provider/RSA.java index 5afa8b74065..4fd4633784d 100644 --- a/libjava/gnu/java/security/provider/RSA.java +++ b/libjava/gnu/java/security/provider/RSA.java @@ -38,11 +38,15 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; +import gnu.java.security.der.DERWriter; + import java.io.ByteArrayOutputStream; import java.io.IOException; - import java.math.BigInteger; - import java.security.InvalidKeyException; import java.security.MessageDigest; import java.security.PrivateKey; @@ -52,15 +56,8 @@ import java.security.SignatureException; import java.security.SignatureSpi; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; - import java.util.ArrayList; -import gnu.java.security.OID; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; -import gnu.java.security.der.DERWriter; - public abstract class RSA extends SignatureSpi implements Cloneable { diff --git a/libjava/gnu/java/security/provider/SHA1PRNG.java b/libjava/gnu/java/security/provider/SHA1PRNG.java index 97a8b9e3433..058dc6daa3f 100644 --- a/libjava/gnu/java/security/provider/SHA1PRNG.java +++ b/libjava/gnu/java/security/provider/SHA1PRNG.java @@ -38,11 +38,11 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.util.Random; -import java.security.SecureRandomSpi; +import java.io.Serializable; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.io.Serializable; +import java.security.SecureRandomSpi; +import java.util.Random; public class SHA1PRNG extends SecureRandomSpi implements Serializable { diff --git a/libjava/gnu/java/security/provider/SHA1withRSA.java b/libjava/gnu/java/security/provider/SHA1withRSA.java index 64e93f9b0d8..7e106192966 100644 --- a/libjava/gnu/java/security/provider/SHA1withRSA.java +++ b/libjava/gnu/java/security/provider/SHA1withRSA.java @@ -38,11 +38,11 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.security.OID; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import gnu.java.security.OID; - public class SHA1withRSA extends RSA { diff --git a/libjava/gnu/java/security/provider/X509CertificateFactory.java b/libjava/gnu/java/security/provider/X509CertificateFactory.java index 753300651b9..7cfa1f610d8 100644 --- a/libjava/gnu/java/security/provider/X509CertificateFactory.java +++ b/libjava/gnu/java/security/provider/X509CertificateFactory.java @@ -38,29 +38,27 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.io.Base64InputStream; +import gnu.java.security.x509.X509CRL; +import gnu.java.security.x509.X509CertPath; +import gnu.java.security.x509.X509Certificate; + import java.io.BufferedInputStream; import java.io.EOFException; -import java.io.InputStream; import java.io.IOException; - +import java.io.InputStream; +import java.security.cert.CRL; +import java.security.cert.CRLException; +import java.security.cert.CertPath; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.CertificateFactorySpi; -import java.security.cert.CertPath; -import java.security.cert.CRL; -import java.security.cert.CRLException; - import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import gnu.java.io.Base64InputStream; -import gnu.java.security.x509.X509Certificate; -import gnu.java.security.x509.X509CertPath; -import gnu.java.security.x509.X509CRL; - public class X509CertificateFactory extends CertificateFactorySpi { |
