diff options
Diffstat (limited to 'libjava/gnu/java/security/x509')
22 files changed, 96 insertions, 104 deletions
diff --git a/libjava/gnu/java/security/x509/GnuPKIExtension.java b/libjava/gnu/java/security/x509/GnuPKIExtension.java index 8294e65..36ce84d 100644 --- a/libjava/gnu/java/security/x509/GnuPKIExtension.java +++ b/libjava/gnu/java/security/x509/GnuPKIExtension.java @@ -38,12 +38,12 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.security.cert.X509Extension; -import java.util.Collection; - import gnu.java.security.OID; import gnu.java.security.x509.ext.Extension; +import java.security.cert.X509Extension; +import java.util.Collection; + public interface GnuPKIExtension extends X509Extension { diff --git a/libjava/gnu/java/security/x509/X500DistinguishedName.java b/libjava/gnu/java/security/x509/X500DistinguishedName.java index daf76a2..6c34f05 100644 --- a/libjava/gnu/java/security/x509/X500DistinguishedName.java +++ b/libjava/gnu/java/security/x509/X500DistinguishedName.java @@ -38,14 +38,17 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; + import java.io.EOFException; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; import java.io.StringReader; - import java.security.Principal; - import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -56,11 +59,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; -import gnu.java.security.OID; - public class X500DistinguishedName implements Principal { diff --git a/libjava/gnu/java/security/x509/X509CRL.java b/libjava/gnu/java/security/x509/X509CRL.java index 33263af..5fe255c 100644 --- a/libjava/gnu/java/security/x509/X509CRL.java +++ b/libjava/gnu/java/security/x509/X509CRL.java @@ -45,23 +45,23 @@ import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.x509.ext.Extension; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.security.PublicKey; import java.security.Principal; +import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; -import java.security.cert.Certificate; import java.security.cert.CRLException; +import java.security.cert.Certificate; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; diff --git a/libjava/gnu/java/security/x509/X509CRLEntry.java b/libjava/gnu/java/security/x509/X509CRLEntry.java index da16115..4f7e1c2 100644 --- a/libjava/gnu/java/security/x509/X509CRLEntry.java +++ b/libjava/gnu/java/security/x509/X509CRLEntry.java @@ -38,12 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.io.IOException; +import gnu.java.security.OID; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; +import gnu.java.security.x509.ext.Extension; +import java.io.IOException; import java.math.BigInteger; - import java.security.cert.CRLException; - import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -52,10 +54,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import gnu.java.security.OID; -import gnu.java.security.der.*; -import gnu.java.security.x509.ext.*; - /** * A single entry in a X.509 certificate revocation list. * diff --git a/libjava/gnu/java/security/x509/X509CertPath.java b/libjava/gnu/java/security/x509/X509CertPath.java index 0990abd..598dbeb 100644 --- a/libjava/gnu/java/security/x509/X509CertPath.java +++ b/libjava/gnu/java/security/x509/X509CertPath.java @@ -38,18 +38,21 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.security.OID; +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 java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; - +import java.io.InputStream; import java.math.BigInteger; - +import java.security.cert.CertPath; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import java.security.cert.CertPath; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -57,12 +60,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import gnu.java.security.OID; -import gnu.java.security.der.DER; -import gnu.java.security.der.DEREncodingException; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - /** * A certificate path (or certificate chain) of X509Certificates. * diff --git a/libjava/gnu/java/security/x509/X509CertSelectorImpl.java b/libjava/gnu/java/security/x509/X509CertSelectorImpl.java index 4535cce..c355dc1 100644 --- a/libjava/gnu/java/security/x509/X509CertSelectorImpl.java +++ b/libjava/gnu/java/security/x509/X509CertSelectorImpl.java @@ -39,12 +39,10 @@ exception statement from your version. */ package gnu.java.security.x509; import java.io.IOException; - import java.security.Principal; -import java.security.cert.Certificate; import java.security.cert.CertSelector; +import java.security.cert.Certificate; import java.security.cert.X509Certificate; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java index 721439e..29606d1 100644 --- a/libjava/gnu/java/security/x509/X509Certificate.java +++ b/libjava/gnu/java/security/x509/X509Certificate.java @@ -38,14 +38,24 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.io.InputStream; +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.x509.ext.BasicConstraints; +import gnu.java.security.x509.ext.ExtendedKeyUsage; +import gnu.java.security.x509.ext.Extension; +import gnu.java.security.x509.ext.IssuerAlternativeNames; +import gnu.java.security.x509.ext.KeyUsage; +import gnu.java.security.x509.ext.SubjectAlternativeNames; + import java.io.IOException; +import java.io.InputStream; import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; - import java.math.BigInteger; - import java.security.AlgorithmParameters; import java.security.InvalidKeyException; import java.security.KeyFactory; @@ -55,20 +65,17 @@ import java.security.Principal; import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; - import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateParsingException; - import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPublicKey; import java.security.spec.DSAParameterSpec; import java.security.spec.X509EncodedKeySpec; - -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -81,10 +88,6 @@ import java.util.Set; import javax.security.auth.x500.X500Principal; -import gnu.java.security.OID; -import gnu.java.security.der.*; -import gnu.java.security.x509.ext.*; - /** * An implementation of X.509 certificates. * diff --git a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java index 5441521..dafb3ba 100644 --- a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java +++ b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java @@ -38,15 +38,15 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - 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.x509.Util; +import java.io.IOException; +import java.math.BigInteger; + public class AuthorityKeyIdentifier extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/BasicConstraints.java b/libjava/gnu/java/security/x509/ext/BasicConstraints.java index f720d22..a51e7a8 100644 --- a/libjava/gnu/java/security/x509/ext/BasicConstraints.java +++ b/libjava/gnu/java/security/x509/ext/BasicConstraints.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + public class BasicConstraints extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/CRLNumber.java b/libjava/gnu/java/security/x509/ext/CRLNumber.java index 556aa30..1c3e01e 100644 --- a/libjava/gnu/java/security/x509/ext/CRLNumber.java +++ b/libjava/gnu/java/security/x509/ext/CRLNumber.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class CRLNumber extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java index 9c14dc9..266a4c3 100644 --- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java +++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java @@ -38,9 +38,13 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; + import java.io.IOException; import java.security.cert.PolicyQualifierInfo; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -49,11 +53,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import gnu.java.security.OID; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - public class CertificatePolicies extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java index e2a98e0..cd551a9 100644 --- a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java +++ b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + public class ExtendedKeyUsage extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/Extension.java b/libjava/gnu/java/security/x509/ext/Extension.java index ccbd60c..28a32fe 100644 --- a/libjava/gnu/java/security/x509/ext/Extension.java +++ b/libjava/gnu/java/security/x509/ext/Extension.java @@ -38,17 +38,17 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - 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.x509.Util; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Extension { diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.java b/libjava/gnu/java/security/x509/ext/GeneralNames.java index fc9a73b..66473ee 100644 --- a/libjava/gnu/java/security/x509/ext/GeneralNames.java +++ b/libjava/gnu/java/security/x509/ext/GeneralNames.java @@ -1,4 +1,4 @@ -/* GeneralNames.java -- the GeneralNames object. +/* GeneralNames.java -- the GeneralNames object Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,22 +38,20 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; +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.x509.X500DistinguishedName; +import java.io.IOException; import java.net.InetAddress; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import gnu.java.security.OID; -import gnu.java.security.x509.X500DistinguishedName; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - public class GeneralNames { diff --git a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java index 0d0beb0..7576b6d 100644 --- a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java +++ b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java @@ -38,9 +38,10 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; + import java.io.IOException; import java.util.List; -import gnu.java.security.OID; public class IssuerAlternativeNames extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/KeyUsage.java b/libjava/gnu/java/security/x509/ext/KeyUsage.java index 7d5d7c6..a6fd775 100644 --- a/libjava/gnu/java/security/x509/ext/KeyUsage.java +++ b/libjava/gnu/java/security/x509/ext/KeyUsage.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; - 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.IOException; + public class KeyUsage extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java index e33f960..866f015 100644 --- a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java +++ b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java @@ -38,13 +38,13 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class PolicyConstraint extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PolicyMappings.java b/libjava/gnu/java/security/x509/ext/PolicyMappings.java index 827e83f..81cb88c 100644 --- a/libjava/gnu/java/security/x509/ext/PolicyMappings.java +++ b/libjava/gnu/java/security/x509/ext/PolicyMappings.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + public class PolicyMappings extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java index 108af4b..8e7e9e2 100644 --- a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java +++ b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Date; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Date; + public class PrivateKeyUsagePeriod extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/ReasonCode.java b/libjava/gnu/java/security/x509/ext/ReasonCode.java index 779611d..d965165 100644 --- a/libjava/gnu/java/security/x509/ext/ReasonCode.java +++ b/libjava/gnu/java/security/x509/ext/ReasonCode.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class ReasonCode extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java index 19c0bde..73f36b1 100644 --- a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java +++ b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java @@ -38,11 +38,11 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; + import java.io.IOException; import java.util.List; -import gnu.java.security.OID; - public class SubjectAlternativeNames extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java index 2d48f7c..910decc 100644 --- a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java +++ b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; - 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.x509.Util; +import java.io.IOException; + public class SubjectKeyIdentifier extends Extension.Value { |