From 3238d4f99abf7712dbaa7126fbf10b6670c84ce5 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 17 Oct 2004 08:00:11 +0000 Subject: [PATCH] OID.java, [...]: Import statements cleaned up. 2004-10-17 Michael Koch * gnu/java/security/OID.java, gnu/java/security/provider/DSAParameters.java, gnu/java/security/provider/DSASignature.java, gnu/java/security/x509/X500DistinguishedName.java, gnu/java/security/x509/X509CRL.java: Import statements cleaned up. From-SVN: r89166 --- libjava/ChangeLog | 9 ++++++ libjava/gnu/java/security/OID.java | 8 ++--- .../java/security/provider/DSAParameters.java | 28 ++++++----------- .../java/security/provider/DSASignature.java | 22 +++++-------- .../security/x509/X500DistinguishedName.java | 23 ++++++-------- libjava/gnu/java/security/x509/X509CRL.java | 31 ++++++++----------- 6 files changed, 52 insertions(+), 69 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f4843e1590e..9c1d187e5b8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2004-10-17 Michael Koch + + * gnu/java/security/OID.java, + gnu/java/security/provider/DSAParameters.java, + gnu/java/security/provider/DSASignature.java, + gnu/java/security/x509/X500DistinguishedName.java, + gnu/java/security/x509/X509CRL.java: + Import statements cleaned up. + 2004-10-16 Michael Koch * gnu/java/nio/NIODatagramSocket.java, diff --git a/libjava/gnu/java/security/OID.java b/libjava/gnu/java/security/OID.java index c17d94b26d3..0b935c48c23 100644 --- a/libjava/gnu/java/security/OID.java +++ b/libjava/gnu/java/security/OID.java @@ -1,5 +1,5 @@ /* OID.java -- numeric representation of an object identifier - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,15 +38,13 @@ exception statement from your version. */ package gnu.java.security; -import java.io.ByteArrayInputStream; +import gnu.java.security.der.DEREncodingException; + import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.IOException; - import java.util.StringTokenizer; -import gnu.java.security.der.DEREncodingException; - /** * This immutable class represents an object identifier, or OID. * diff --git a/libjava/gnu/java/security/provider/DSAParameters.java b/libjava/gnu/java/security/provider/DSAParameters.java index 3773308c26e..678ab8a25a4 100644 --- a/libjava/gnu/java/security/provider/DSAParameters.java +++ b/libjava/gnu/java/security/provider/DSAParameters.java @@ -1,5 +1,5 @@ /* DSAParameters.java --- DSA Parameters Implementation - Copyright (C) 1999,2003 Free Software Foundation, Inc. + Copyright (C) 1999, 20032, 004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,30 +38,20 @@ exception statement from your version. */ package gnu.java.security.provider; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import java.math.BigInteger; - -import java.security.AlgorithmParametersSpi; -import java.security.InvalidAlgorithmParameterException; -import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.DSAParameterSpec; -import java.security.spec.InvalidParameterSpecException; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import gnu.java.io.ASN1ParsingException; import gnu.java.security.der.DER; -import gnu.java.security.der.DEREncodingException; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.der.DERWriter; -import gnu.java.security.util.Prime; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.AlgorithmParametersSpi; +import java.security.spec.AlgorithmParameterSpec; +import java.security.spec.DSAParameterSpec; +import java.security.spec.InvalidParameterSpecException; +import java.util.ArrayList; /* ASN.1 Encoding for DSA from rfc2459 diff --git a/libjava/gnu/java/security/provider/DSASignature.java b/libjava/gnu/java/security/provider/DSASignature.java index 7da1c7dab36..6ff43d55a7f 100644 --- a/libjava/gnu/java/security/provider/DSASignature.java +++ b/libjava/gnu/java/security/provider/DSASignature.java @@ -1,5 +1,5 @@ -/* DSASignature.java - Copyright (C) 1999,2003 Free Software Foundation, Inc. +/* DSASignature.java -- + Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,14 +35,17 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.security.provider; -import java.io.ByteArrayInputStream; +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.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.InvalidParameterException; @@ -57,18 +60,9 @@ import java.security.SignatureSpi; import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAPublicKey; import java.security.spec.AlgorithmParameterSpec; - import java.util.ArrayList; -import java.util.List; import java.util.Random; -import gnu.java.io.ASN1ParsingException; -import gnu.java.security.der.DER; -import gnu.java.security.der.DEREncodingException; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; -import gnu.java.security.der.DERWriter; - public class DSASignature extends SignatureSpi { private DSAPublicKey publicKey; diff --git a/libjava/gnu/java/security/x509/X500DistinguishedName.java b/libjava/gnu/java/security/x509/X500DistinguishedName.java index 5284385267a..8a715677bef 100644 --- a/libjava/gnu/java/security/x509/X500DistinguishedName.java +++ b/libjava/gnu/java/security/x509/X500DistinguishedName.java @@ -1,5 +1,5 @@ /* X500DistinguishedName.java -- X.500 name. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,18 +38,6 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.IOException; -import java.io.StreamTokenizer; -import java.io.StringReader; - -import java.security.Principal; - -import java.util.HashSet; -import java.util.LinkedList; - import gnu.java.io.ASN1ParsingException; import gnu.java.security.OID; import gnu.java.security.der.DER; @@ -57,6 +45,15 @@ import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.der.DERWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.IOException; +import java.io.StreamTokenizer; +import java.io.StringReader; +import java.util.HashSet; +import java.util.LinkedList; + /** * A X.500 distinguished name. Distinguished names are sequences of * ATTRIB=VALUE pairs, where ATTRIB is one of the following: diff --git a/libjava/gnu/java/security/x509/X509CRL.java b/libjava/gnu/java/security/x509/X509CRL.java index 6205c0f8955..e31a85df7b9 100644 --- a/libjava/gnu/java/security/x509/X509CRL.java +++ b/libjava/gnu/java/security/x509/X509CRL.java @@ -1,5 +1,5 @@ /* X509CRL.java -- X.509 certificate revocation list. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,18 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.io.ASN1ParsingException; +import gnu.java.security.OID; +import gnu.java.security.der.BitString; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; + import java.io.InputStream; import java.io.IOException; - import java.math.BigInteger; - -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Set; - import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; @@ -60,17 +58,14 @@ import java.security.SignatureException; import java.security.cert.Certificate; import java.security.cert.CRLException; import java.security.cert.X509CRLEntry; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.HashMap; +import java.util.Set; import javax.security.auth.x500.X500Principal; -import gnu.java.io.ASN1ParsingException; -import gnu.java.security.OID; -import gnu.java.security.der.BitString; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; -import gnu.java.security.der.DERWriter; - /** * X.509 certificate revocation lists. *