diff options
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 9 | ||||
-rw-r--r-- | libjava/gnu/java/security/OID.java | 8 | ||||
-rw-r--r-- | libjava/gnu/java/security/provider/DSAParameters.java | 24 | ||||
-rw-r--r-- | libjava/gnu/java/security/provider/DSASignature.java | 22 | ||||
-rw-r--r-- | libjava/gnu/java/security/x509/X500DistinguishedName.java | 19 | ||||
-rw-r--r-- | libjava/gnu/java/security/x509/X509CRL.java | 31 |
6 files changed, 48 insertions, 65 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f4843e1..9c1d187 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2004-10-17 Michael Koch <konqueror@gmx.de> + + * 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 <konqueror@gmx.de> * gnu/java/nio/NIODatagramSocket.java, diff --git a/libjava/gnu/java/security/OID.java b/libjava/gnu/java/security/OID.java index c17d94b..0b935c4 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 3773308..678ab8a 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 gnu.java.io.ASN1ParsingException; +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.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; /* 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 7da1c7d..6ff43d5 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 5284385..8a71567 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,25 +38,22 @@ 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.DER; +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.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; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; -import gnu.java.security.der.DERWriter; - /** * 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 6205c0f..e31a85d 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. * |