diff options
Diffstat (limited to 'pki/base/util/src/netscape')
160 files changed, 915 insertions, 525 deletions
diff --git a/pki/base/util/src/netscape/net/NetworkClient.java b/pki/base/util/src/netscape/net/NetworkClient.java index 30ec006cd..c9d004d96 100644 --- a/pki/base/util/src/netscape/net/NetworkClient.java +++ b/pki/base/util/src/netscape/net/NetworkClient.java @@ -17,10 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.net; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; import java.net.Socket; import java.net.UnknownHostException; -import java.net.URL; /** * This is the base class for network clients. diff --git a/pki/base/util/src/netscape/net/TransferProtocolClient.java b/pki/base/util/src/netscape/net/TransferProtocolClient.java index 72a2e4e4c..23f133178 100644 --- a/pki/base/util/src/netscape/net/TransferProtocolClient.java +++ b/pki/base/util/src/netscape/net/TransferProtocolClient.java @@ -17,10 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.net; -import java.lang.StringIndexOutOfBoundsException; -import java.io.*; +import java.io.IOException; import java.util.Vector; -import netscape.net.NetworkClient; /** * This class implements that basic intefaces of transfer protocols. diff --git a/pki/base/util/src/netscape/net/smtp/SmtpClient.java b/pki/base/util/src/netscape/net/smtp/SmtpClient.java index f7aa72284..83ff6c095 100644 --- a/pki/base/util/src/netscape/net/smtp/SmtpClient.java +++ b/pki/base/util/src/netscape/net/smtp/SmtpClient.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.net.smtp; -import java.util.StringTokenizer; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.InetAddress; + import netscape.net.TransferProtocolClient; /** diff --git a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java b/pki/base/util/src/netscape/security/acl/AclEntryImpl.java index c0f6ef30b..6f1b77650 100644 --- a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java +++ b/pki/base/util/src/netscape/security/acl/AclEntryImpl.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.io.*; import java.security.Principal; -import java.security.acl.*; +import java.security.acl.AclEntry; +import java.security.acl.Group; +import java.security.acl.Permission; +import java.util.Enumeration; +import java.util.Vector; /** * This is a class that describes one entry that associates users diff --git a/pki/base/util/src/netscape/security/acl/AclImpl.java b/pki/base/util/src/netscape/security/acl/AclImpl.java index aba18b71a..5624b75f1 100644 --- a/pki/base/util/src/netscape/security/acl/AclImpl.java +++ b/pki/base/util/src/netscape/security/acl/AclImpl.java @@ -17,10 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.io.*; -import java.util.*; import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Acl; +import java.security.acl.AclEntry; +import java.security.acl.Group; +import java.security.acl.NotOwnerException; +import java.security.acl.Permission; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Vector; /** * An Access Control List (ACL) is encapsulated by this class. diff --git a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java b/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java index 635da594a..4f63712c0 100644 --- a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java +++ b/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Permission; /** * This class implements the principal interface for the set of all permissions. diff --git a/pki/base/util/src/netscape/security/acl/GroupImpl.java b/pki/base/util/src/netscape/security/acl/GroupImpl.java index 62a28c234..50c68bdb6 100644 --- a/pki/base/util/src/netscape/security/acl/GroupImpl.java +++ b/pki/base/util/src/netscape/security/acl/GroupImpl.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.security.*; -import java.security.acl.*; +import java.security.Principal; +import java.security.acl.Group; +import java.util.Enumeration; +import java.util.Vector; /** * This class implements a group of principals. diff --git a/pki/base/util/src/netscape/security/acl/OwnerImpl.java b/pki/base/util/src/netscape/security/acl/OwnerImpl.java index 41a03ff01..7ced59efd 100644 --- a/pki/base/util/src/netscape/security/acl/OwnerImpl.java +++ b/pki/base/util/src/netscape/security/acl/OwnerImpl.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.security.*; -import java.security.acl.*; +import java.security.Principal; +import java.security.acl.Group; +import java.security.acl.LastOwnerException; +import java.security.acl.NotOwnerException; +import java.security.acl.Owner; +import java.util.Enumeration; /** * Class implementing the Owner interface. The diff --git a/pki/base/util/src/netscape/security/acl/PermissionImpl.java b/pki/base/util/src/netscape/security/acl/PermissionImpl.java index f60002388..bfd8861cb 100644 --- a/pki/base/util/src/netscape/security/acl/PermissionImpl.java +++ b/pki/base/util/src/netscape/security/acl/PermissionImpl.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Permission; /** * The PermissionImpl class implements the permission diff --git a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java b/pki/base/util/src/netscape/security/acl/PrincipalImpl.java index 9f51b3947..c2779abea 100644 --- a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java +++ b/pki/base/util/src/netscape/security/acl/PrincipalImpl.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.*; +import java.security.Principal; /** * This class implements the principal interface. diff --git a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java b/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java index dc0da6f3d..fa9c75bd3 100644 --- a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java +++ b/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.*; +import java.security.Principal; /** * This class implements a group of principals. diff --git a/pki/base/util/src/netscape/security/extensions/AccessDescription.java b/pki/base/util/src/netscape/security/extensions/AccessDescription.java index 668d2fc89..89b4d829b 100644 --- a/pki/base/util/src/netscape/security/extensions/AccessDescription.java +++ b/pki/base/util/src/netscape/security/extensions/AccessDescription.java @@ -17,16 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.*; -import java.util.*; +import java.io.Serializable; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.GeneralName; public class AccessDescription implements Serializable { diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java index 62bd8aab8..c092d954c 100644 --- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -18,16 +18,24 @@ package netscape.security.extensions; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.URIName; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertInfo.java b/pki/base/util/src/netscape/security/extensions/CertInfo.java index 05dfb7de1..c2dcd8f7e 100644 --- a/pki/base/util/src/netscape/security/extensions/CertInfo.java +++ b/pki/base/util/src/netscape/security/extensions/CertInfo.java @@ -18,12 +18,21 @@ package netscape.security.extensions; -import netscape.security.x509.*; +import java.io.IOException; import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.Date; -import java.security.*; -import java.security.cert.*; -import java.io.*; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java index a926bf3de..bb1ad3a2f 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -18,16 +18,18 @@ package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Date; +import java.util.Enumeration; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java index d2bd1d9c3..39c87407d 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java @@ -18,16 +18,12 @@ package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.*; -import java.util.*; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.GeneralName; /** * This represents the CertificateScopeOfUse extension diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java index de272a165..fe97a9046 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java @@ -17,16 +17,19 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** * This represents the CertificateScopeOfUse extension diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java index 6fedd3af9..7d6ae9d2b 100644 --- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -18,11 +18,19 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java index f756a4c0b..3e1743dd1 100644 --- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -17,21 +17,26 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.util.Hashtable; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.StringTokenizer; +import java.security.cert.CertificateException; import java.text.DateFormat; import java.text.ParseException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.security.cert.CertificateException; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AttributeNameEnumeration; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java index 0d2bf3455..46d7ae2f5 100644 --- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -18,13 +18,20 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; -import java.math.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Array; +import java.security.cert.CertificateException; +import java.util.Enumeration; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** * RFC3280: diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/pki/base/util/src/netscape/security/extensions/KerberosName.java index 4b820e0b4..c60ceb0de 100644 --- a/pki/base/util/src/netscape/security/extensions/KerberosName.java +++ b/pki/base/util/src/netscape/security/extensions/KerberosName.java @@ -19,15 +19,15 @@ package netscape.security.extensions; import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; +import java.util.Vector; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This represents a KerberosName as defined in diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java index 0d7248d0b..e974e92ef 100644 --- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -21,11 +21,15 @@ package netscape.security.extensions; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; /** * NSCertTypeExtension diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index 5d6f38bc8..1010ca262 100644 --- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -18,11 +18,17 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; +import java.util.Enumeration; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java index bbef2dca2..1b1808183 100644 --- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -17,12 +17,21 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.Certificate; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; + +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; public class PresenceServerExtension extends Extension implements CertAttrSet { diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index e9c1394f4..685675063 100644 --- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -18,16 +18,24 @@ package netscape.security.extensions; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.URIName; /** diff --git a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java b/pki/base/util/src/netscape/security/pkcs/ContentInfo.java index 91cc413bb..f09f4b621 100644 --- a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java +++ b/pki/base/util/src/netscape/security/pkcs/ContentInfo.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * A ContentInfo type, as defined in PKCS#7. diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10.java b/pki/base/util/src/netscape/security/pkcs/PKCS10.java index c07edbc2e..dc28c7e9c 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10.java @@ -17,23 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.io.IOException; -import java.security.cert.CertificateException; -import java.security.NoSuchAlgorithmException; +import java.io.PrintStream; import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; -import java.security.PublicKey; - +import java.security.cert.CertificateException; -import netscape.security.util.*; // DER +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.x509.AlgorithmId; -import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; import netscape.security.x509.X500Signer; -import netscape.security.x509.X500Signer; +import netscape.security.x509.X509Key; /** * PKCS #10 certificate requests are created and sent to Certificate diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java index cadfa0cef..7b2dea2c9 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java @@ -17,20 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.security.cert.CertificateException; -import netscape.security.util.*; -import netscape.security.x509.CertAttrSet; -import netscape.security.x509.OIDMap; -import netscape.security.x509.Extension; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.ACertAttrSet; +import netscape.security.x509.CertAttrSet; import netscape.security.x509.Extensions; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java index 9e7e2f7a4..38ad19620 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java @@ -19,12 +19,14 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; -import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the PKCS10 attributes for the request. diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java index 6e64b1686..c31e12456 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java @@ -17,18 +17,25 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.math.BigInteger; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; import java.security.cert.CertificateException; -import java.security.*; +import java.security.cert.X509Certificate; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.AlgorithmId; -import netscape.security.x509.X509CertImpl; import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; /** * PKCS7 as defined in RSA Laboratories PKCS7 Technical Note. Profile diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java index 29d87caff..dfa5a728d 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java @@ -17,21 +17,26 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; -import java.util.Properties; -import java.math.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.math.BigInteger; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PrivateKey; import java.security.KeyFactory; -import java.security.Security; -import java.security.Provider; -import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.Provider; +import java.security.Security; import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Properties; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; /** * Holds a PKCS#8 key, for example a private key diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java index 17eee2010..683514a7f 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -19,15 +19,16 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Date; import java.util.Hashtable; + import netscape.security.util.DerEncoder; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; import netscape.security.x509.CertificateExtensions; -import java.security.cert.CertificateException; /** * Class supporting any PKCS9 attribute except diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java index c979e489c..aff0ee0f7 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java @@ -20,10 +20,11 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; import java.util.Hashtable; + import netscape.security.util.DerEncoder; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java b/pki/base/util/src/netscape/security/pkcs/SignerInfo.java index e03c32190..d02fb03dd 100644 --- a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java +++ b/pki/base/util/src/netscape/security/pkcs/SignerInfo.java @@ -17,12 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; import java.security.cert.X509Certificate; -import java.security.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.AlgorithmId; import netscape.security.x509.X500Name; diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/pki/base/util/src/netscape/security/provider/CMS.java index 62f0e1392..63a776b0b 100644 --- a/pki/base/util/src/netscape/security/provider/CMS.java +++ b/pki/base/util/src/netscape/security/provider/CMS.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; -import java.security.*; +import java.security.AccessController; +import java.security.Provider; /** * The CMS Security Provider. */ diff --git a/pki/base/util/src/netscape/security/provider/DSA.java b/pki/base/util/src/netscape/security/provider/DSA.java index 507627e15..a40bd0295 100644 --- a/pki/base/util/src/netscape/security/provider/DSA.java +++ b/pki/base/util/src/netscape/security/provider/DSA.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintStream; import java.math.BigInteger; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; @@ -26,20 +26,19 @@ import java.security.InvalidKeyException; import java.security.InvalidParameterException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.security.PublicKey; import java.security.PrivateKey; +import java.security.PublicKey; import java.security.SecureRandom; import java.security.Signature; import java.security.SignatureException; -import java.security.interfaces.*; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; -import netscape.security.x509.AlgIdDSA; +import netscape.security.util.DerValue; /** * The Digital Signature Standard (using the Digital Signature diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java index e97544a49..f2292e34c 100755 --- a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java +++ b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java @@ -17,20 +17,18 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.lang.*; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PublicKey; -import java.security.PrivateKey; import java.security.KeyFactorySpi; -import java.security.InvalidKeyException; +import java.security.PrivateKey; +import java.security.PublicKey; import java.security.interfaces.DSAParams; -import java.security.spec.DSAPublicKeySpec; import java.security.spec.DSAPrivateKeySpec; -import java.security.spec.KeySpec; +import java.security.spec.DSAPublicKeySpec; import java.security.spec.InvalidKeySpecException; -import java.security.spec.X509EncodedKeySpec; +import java.security.spec.KeySpec; import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; /** * This class implements the DSA key factory of the Sun provider. diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java index be5b44286..4b781fa15 100644 --- a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java +++ b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java @@ -17,23 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.Hashtable; import java.math.BigInteger; -import java.security.AlgorithmParameters; import java.security.AlgorithmParameterGenerator; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.InvalidParameterException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; import java.security.KeyPair; import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.ProviderException; import java.security.SecureRandom; import java.security.interfaces.DSAParams; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.InvalidParameterSpecException; import java.security.spec.DSAParameterSpec; +import java.security.spec.InvalidParameterSpecException; +import java.util.Hashtable; import netscape.security.x509.AlgIdDSA; diff --git a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java index 949e9ea62..cec2b97bb 100755 --- a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java +++ b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java @@ -21,13 +21,13 @@ import java.math.BigInteger; import java.security.AlgorithmParameterGeneratorSpi; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidParameterException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.security.InvalidParameterException; import java.security.SecureRandom; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.InvalidParameterSpecException; import java.security.spec.DSAParameterSpec; +import java.security.spec.InvalidParameterSpecException; /* * This class generates parameters for the DSA algorithm. It uses a default diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/pki/base/util/src/netscape/security/provider/DSAParameters.java index 4edf88490..70b7fa088 100755 --- a/pki/base/util/src/netscape/security/provider/DSAParameters.java +++ b/pki/base/util/src/netscape/security/provider/DSAParameters.java @@ -17,17 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +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 netscape.security.util.DerValue; -import netscape.security.util.DerOutputStream; import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the parameter set used by the diff --git a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java index ab60554e6..f480ea08e 100644 --- a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java +++ b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java @@ -17,22 +17,19 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.math.BigInteger; -import java.security.InvalidKeyException; -import java.security.ProviderException; import java.security.AlgorithmParameters; +import java.security.InvalidKeyException; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; -import java.security.interfaces.DSAParams; -import netscape.security.x509.AlgIdDSA; import netscape.security.pkcs.PKCS8Key; -import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; -import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgIdDSA; /** * A PKCS#8 private key for the Digital Signature Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java index 9ebdc0dc0..c3a6896ce 100644 --- a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java +++ b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java @@ -17,22 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.math.BigInteger; -import java.security.InvalidKeyException; -import java.security.ProviderException; import java.security.AlgorithmParameters; +import java.security.InvalidKeyException; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; -import java.security.interfaces.DSAParams; -import netscape.security.x509.X509Key; -import netscape.security.x509.AlgIdDSA; import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; -import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.X509Key; /** * An X.509 public key for the Digital Signature Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/MD5.java b/pki/base/util/src/netscape/security/provider/MD5.java index 97bbac204..a3c12490d 100644 --- a/pki/base/util/src/netscape/security/provider/MD5.java +++ b/pki/base/util/src/netscape/security/provider/MD5.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.lang.*; -import java.security.*; +import java.security.DigestException; +import java.security.MessageDigestSpi; /** * The MD5 class is used to compute an MD5 message digest over a given diff --git a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java index 83dbc7f3d..6206b699c 100644 --- a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java +++ b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java @@ -17,18 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.security.InvalidKeyException; -import java.security.ProviderException; -import netscape.security.x509.AlgorithmId; -import netscape.security.util.BigInt; -import netscape.security.x509.X509Key; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; +import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509Key; /** * An X.509 public key for the RSA Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/SHA.java b/pki/base/util/src/netscape/security/provider/SHA.java index 09fdf2dfa..2e5ac328e 100644 --- a/pki/base/util/src/netscape/security/provider/SHA.java +++ b/pki/base/util/src/netscape/security/provider/SHA.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.security.*; +import java.security.DigestException; +import java.security.MessageDigestSpi; /** * This class implements the Secure Hash Algorithm (SHA) developed by diff --git a/pki/base/util/src/netscape/security/provider/Sun.java b/pki/base/util/src/netscape/security/provider/Sun.java index 20e295caa..2ba6be90f 100644 --- a/pki/base/util/src/netscape/security/provider/Sun.java +++ b/pki/base/util/src/netscape/security/provider/Sun.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; -import java.security.*; +import java.security.Provider; /** * The SUN Security Provider. diff --git a/pki/base/util/src/netscape/security/provider/SystemIdentity.java b/pki/base/util/src/netscape/security/provider/SystemIdentity.java index ec06810ff..e9fadf26a 100644 --- a/pki/base/util/src/netscape/security/provider/SystemIdentity.java +++ b/pki/base/util/src/netscape/security/provider/SystemIdentity.java @@ -18,8 +18,12 @@ package netscape.security.provider; import java.io.Serializable; -import java.util.Enumeration; -import java.security.*; +import java.security.Certificate; +import java.security.Identity; +import java.security.IdentityScope; +import java.security.InvalidParameterException; +import java.security.KeyManagementException; +import java.security.PublicKey; /** * An identity. diff --git a/pki/base/util/src/netscape/security/provider/SystemSigner.java b/pki/base/util/src/netscape/security/provider/SystemSigner.java index ffce24019..3b5be37e8 100644 --- a/pki/base/util/src/netscape/security/provider/SystemSigner.java +++ b/pki/base/util/src/netscape/security/provider/SystemSigner.java @@ -17,8 +17,14 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.security.*; +import java.security.Certificate; +import java.security.IdentityScope; +import java.security.InvalidParameterException; +import java.security.KeyException; +import java.security.KeyManagementException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.Signer; /** * SunSecurity signer. diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java index 6fa19fa5b..22d253297 100644 --- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java +++ b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java @@ -17,14 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.security.cert.*; import java.io.InputStream; +import java.security.cert.CRL; +import java.security.cert.CRLException; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactorySpi; import java.util.Collection; -import java.security.Provider; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import netscape.security.x509.X509CertImpl; + import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509ExtensionException; public class X509CertificateFactory extends CertificateFactorySpi { diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java index cacde77c8..5df6baef8 100644 --- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java +++ b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java @@ -17,8 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; -import sun.io.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUTF8; +import sun.io.CharToByteConverter; +import sun.io.CharToByteUTF8; /** * Maps a ASN.1 character string type to a CharToByte and ByteToChar converter. diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/pki/base/util/src/netscape/security/util/ArraySet.java index f6f43efd4..822b752ff 100644 --- a/pki/base/util/src/netscape/security/util/ArraySet.java +++ b/pki/base/util/src/netscape/security/util/ArraySet.java @@ -17,7 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * This class implements the Set interface, backed by an ArrayList. It is diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java index c42b457d0..0607ad2e8 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.ByteToCharConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 Printable String character set to unicode diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java index 717081be7..312b8a22b 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java @@ -16,11 +16,9 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; - -import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUnicodeBig; +import sun.io.ByteToCharUnicodeLittle; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; /** diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java index 57b678dd8..77165b7fe 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java @@ -17,7 +17,9 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import sun.io.*; +import sun.io.ByteToCharConverter; +import sun.io.ConversionBufferFullException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 UniversalString character set to unicode diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java index 1f2c78c6c..caf7e6481 100644 --- a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -18,16 +18,25 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; +import java.security.MessageDigest; import java.security.PublicKey; import java.security.cert.Certificate; -import java.security.MessageDigest; -import netscape.security.util.*; -import netscape.security.x509.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import java.text.DateFormat; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.TimeZone; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; /** diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java index 09b3afefe..970f7782f 100644 --- a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java +++ b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.CharToByteConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts a string of ASN.1 PrintableString characters to PrintableString diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java index 7bb851d4d..ba74a0d73 100644 --- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -18,12 +18,17 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CRLImpl; /** diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/pki/base/util/src/netscape/security/util/DerInputStream.java index 38564bf71..fb73b761e 100644 --- a/pki/base/util/src/netscape/security/util/DerInputStream.java +++ b/pki/base/util/src/netscape/security/util/DerInputStream.java @@ -17,12 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.InputStream; import java.io.IOException; -import java.io.EOFException; +import java.io.InputStream; import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.Vector; diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/pki/base/util/src/netscape/security/util/DerOutputStream.java index 618afc095..be42322fa 100644 --- a/pki/base/util/src/netscape/security/util/DerOutputStream.java +++ b/pki/base/util/src/netscape/security/util/DerOutputStream.java @@ -17,15 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.FilterOutputStream; import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.*; - -import java.util.Comparator; import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; import sun.io.CharToByteConverter; diff --git a/pki/base/util/src/netscape/security/util/DerValue.java b/pki/base/util/src/netscape/security/util/DerValue.java index bc2bf45e3..58ef8eccc 100644 --- a/pki/base/util/src/netscape/security/util/DerValue.java +++ b/pki/base/util/src/netscape/security/util/DerValue.java @@ -17,13 +17,14 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; - -import sun.io.ByteToCharConverter; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; import netscape.security.x509.AVAValueConverter; import netscape.security.x509.GenericValueConverter; +import sun.io.ByteToCharConverter; /** * Represents a single DER-encoded value. DER encoding rules are a subset diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java index 40e4b65df..2e57eac17 100644 --- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -18,15 +18,65 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Enumeration; +import java.util.ResourceBundle; +import java.util.Vector; + +import netscape.security.extensions.AccessDescription; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.CertificateScopeEntry; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.InhibitAnyPolicyExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.extensions.PresenceServerExtension; +import netscape.security.extensions.SubjectInfoAccessExtension; +import netscape.security.x509.Attribute; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CPSuri; +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.CRLDistributionPointsExtension; import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateIssuerExtension; +import netscape.security.x509.CertificatePoliciesExtension; +import netscape.security.x509.CertificatePolicyInfo; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.DisplayText; +import netscape.security.x509.Extension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.IssuingDistributionPoint; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.NoticeReference; +import netscape.security.x509.OIDMap; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.PolicyQualifierInfo; +import netscape.security.x509.PolicyQualifiers; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.Qualifier; +import netscape.security.x509.RDN; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.UserNotice; /** diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java index fed9637af..505db7a9b 100644 --- a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.util.StringTokenizer; diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java index 3522d2355..94a5d18c7 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; /** * This class will display the certificate content in predefined diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java index 8f24edd68..45b08206f 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java @@ -18,9 +18,10 @@ package netscape.security.util; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java index 880355fb5..669e4c222 100644 --- a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java @@ -18,14 +18,12 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; +import java.security.PublicKey; +import java.util.Locale; +import java.util.ResourceBundle; + import netscape.security.provider.RSAPublicKey; -import java.security.*; +import netscape.security.x509.X509Key; /** diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java index 5c1f25cec..b5ce1773c 100755 --- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -22,8 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.cert.CertificateException; import java.util.Enumeration; -import netscape.security.util.DerValue; + import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * A plain certattr set used by pkcs10 to parse an unknown attribute. diff --git a/pki/base/util/src/netscape/security/x509/AVA.java b/pki/base/util/src/netscape/security/x509/AVA.java index 9609d790b..0614f41ca 100644 --- a/pki/base/util/src/netscape/security/x509/AVA.java +++ b/pki/base/util/src/netscape/security/x509/AVA.java @@ -20,12 +20,13 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.StringReader; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import sun.io.ByteToCharConverter; -import netscape.security.util.*; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import sun.io.ByteToCharConverter; /** diff --git a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java b/pki/base/util/src/netscape/security/x509/AVAValueConverter.java index 18de32c2a..87c386f11 100644 --- a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java +++ b/pki/base/util/src/netscape/security/x509/AVAValueConverter.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; import netscape.security.util.DerValue; diff --git a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java b/pki/base/util/src/netscape/security/x509/AlgIdDSA.java index a3e638ebc..ca0e858fb 100644 --- a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java +++ b/pki/base/util/src/netscape/security/x509/AlgIdDSA.java @@ -19,10 +19,12 @@ package netscape.security.x509; import java.io.IOException; import java.math.BigInteger; -import java.security.*; +import java.security.ProviderException; import java.security.interfaces.DSAParams; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/pki/base/util/src/netscape/security/x509/AlgorithmId.java index f3e72656d..289262615 100644 --- a/pki/base/util/src/netscape/security/x509/AlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/AlgorithmId.java @@ -17,11 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.security.*; -import java.util.Properties; - -import netscape.security.util.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.AlgorithmParameters; +import java.security.NoSuchAlgorithmException; + +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class identifies algorithms, such as cryptographic transforms, each diff --git a/pki/base/util/src/netscape/security/x509/Attribute.java b/pki/base/util/src/netscape/security/x509/Attribute.java index a5fa02245..9e39e4ead 100644 --- a/pki/base/util/src/netscape/security/x509/Attribute.java +++ b/pki/base/util/src/netscape/security/x509/Attribute.java @@ -17,17 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.*; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.StringReader; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import sun.io.ByteToCharConverter; - -import java.io.*; -import netscape.security.util.*; +import java.io.Serializable; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerEncoder; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * An attribute, as identified by some attribute ID, has some particular values. diff --git a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java index f8546d526..977977a89 100644 --- a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java +++ b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java @@ -18,7 +18,6 @@ package netscape.security.x509; import java.util.Vector; -import java.util.Enumeration; /** * <p>This class provides the Enumeration implementation used diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index 9b92c45c0..0da29e8ef 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Authority Key Identifier Extension. diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 925e12faa..ed48d2d4d 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Basic Constraints Extension. diff --git a/pki/base/util/src/netscape/security/x509/CPSuri.java b/pki/base/util/src/netscape/security/x509/CPSuri.java index e7094eaba..e802a8998 100644 --- a/pki/base/util/src/netscape/security/x509/CPSuri.java +++ b/pki/base/util/src/netscape/security/x509/CPSuri.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java index 6cbca4ad0..532e313a5 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java @@ -17,10 +17,25 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * <pre> diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 0832c3dd9..6da6d586c 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -17,14 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; /** * An extension that tells applications where to find the CRL for diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/pki/base/util/src/netscape/security/x509/CRLExtensions.java index 822361364..dc3c82d13 100755 --- a/pki/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CRLExtensions.java @@ -29,7 +29,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the CRL Extensions. diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index 67cd98e55..44292ed1a 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -24,7 +24,9 @@ import java.lang.reflect.Array; import java.math.BigInteger; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRL Number Extension. diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java index fff1d91cd..563c547c0 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -20,10 +20,10 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRLReason Extension of CRL entry. diff --git a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java b/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java index 75d8d4a37..644bfe7e5 100644 --- a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java +++ b/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java @@ -18,13 +18,21 @@ package netscape.security.x509; import java.io.IOException; -import java.security.cert.X509Certificate; -import java.security.cert.CertificateException; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; import java.security.cert.CertificateEncodingException; -import java.security.*; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.util.Date; -import netscape.security.util.BigInt; import netscape.security.pkcs.PKCS10; diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 3759a2eaa..c7aae98d1 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the AlgorithmId for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateChain.java b/pki/base/util/src/netscape/security/x509/CertificateChain.java index c86b6dbc0..df9f01406 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateChain.java +++ b/pki/base/util/src/netscape/security/x509/CertificateChain.java @@ -16,9 +16,15 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.security.cert.*; -import netscape.security.pkcs.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.cert.X509Certificate; + +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; public class CertificateChain implements Serializable { diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java index 617fc93c0..37751c67f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -29,7 +31,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index b8b8a3ec8..8d3c64f50 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -21,10 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.util.Enumeration; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index 3c3afe3e2..f964a220d 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index 591032279..10cb45131 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index 8ed8cdc4d..9bca9f63e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -21,12 +21,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.util.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class defines the Certificate Policies Extension. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java index 0eb48dc45..c7dddb594 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java index f657d2f87..9556e2acf 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CertificatePolicyInformation ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java index 7ed76931e..7ae6ce102 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CertificatePolicyMap ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java b/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java index 9c1994e06..eaf215141 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java @@ -20,7 +20,9 @@ package netscape.security.x509; import java.io.IOException; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the certificate policy set ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java index f14dd49bd..a802a4366 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.math.BigInteger; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the SerialNumber attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java index a45d35609..b79e2001e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index 2162eb33c..fa44e2522 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java index ad2865eb1..4c0ca8e8b 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -17,15 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.security.cert.*; +import java.io.Serializable; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the interval for which the certificate is valid. diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/pki/base/util/src/netscape/security/x509/CertificateVersion.java index fee1af65a..36daef86c 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java @@ -20,10 +20,12 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the version of the X509 Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java index b83dd4f62..d311a4352 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X509Key attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/DNSName.java b/pki/base/util/src/netscape/security/x509/DNSName.java index 7e503b4af..d6d9b1f07 100644 --- a/pki/base/util/src/netscape/security/x509/DNSName.java +++ b/pki/base/util/src/netscape/security/x509/DNSName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the DNSName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index 39664e238..3ef2f1ae7 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -22,10 +22,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.math.BigInteger; -import java.util.Enumeration; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Delta CRL Indicator Extension. diff --git a/pki/base/util/src/netscape/security/x509/DirStrConverter.java b/pki/base/util/src/netscape/security/x509/DirStrConverter.java index 23dea47b2..261a909d1 100644 --- a/pki/base/util/src/netscape/security/x509/DirStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/DirStrConverter.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; + +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; import sun.io.CharToByteConverter; -import netscape.security.util.*; /** * A DirStrConverter converts a string to a DerValue of ASN.1 Directory String, diff --git a/pki/base/util/src/netscape/security/x509/DisplayText.java b/pki/base/util/src/netscape/security/x509/DisplayText.java index 45bcc5061..44bb4b76b 100644 --- a/pki/base/util/src/netscape/security/x509/DisplayText.java +++ b/pki/base/util/src/netscape/security/x509/DisplayText.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/EDIPartyName.java b/pki/base/util/src/netscape/security/x509/EDIPartyName.java index 45510e28a..475206c0a 100644 --- a/pki/base/util/src/netscape/security/x509/EDIPartyName.java +++ b/pki/base/util/src/netscape/security/x509/EDIPartyName.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the EDIPartyName of the GeneralName choice. diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java index 7a4f6d124..39be6eb86 100644 --- a/pki/base/util/src/netscape/security/x509/Extension.java +++ b/pki/base/util/src/netscape/security/x509/Extension.java @@ -19,8 +19,11 @@ package netscape.security.x509; import java.io.IOException; import java.io.Serializable; -import java.security.cert.CertificateException; -import netscape.security.util.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java index 75bb6c97f..5d4705d2e 100644 --- a/pki/base/util/src/netscape/security/x509/Extensions.java +++ b/pki/base/util/src/netscape/security/x509/Extensions.java @@ -28,7 +28,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index cfc75bfdf..23aa8dc0c 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -17,14 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; /** * An extension that tells applications where to find diff --git a/pki/base/util/src/netscape/security/x509/GeneralName.java b/pki/base/util/src/netscape/security/x509/GeneralName.java index 9c84e9e4e..84088147e 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralName.java +++ b/pki/base/util/src/netscape/security/x509/GeneralName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the ASN.1 GeneralName object class. diff --git a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java b/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java index 1cf6ff6cf..962206e00 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java +++ b/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java @@ -19,7 +19,7 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; /** * This interface specifies the abstract methods which have to be diff --git a/pki/base/util/src/netscape/security/x509/GeneralNames.java b/pki/base/util/src/netscape/security/x509/GeneralNames.java index d08eeb1a5..eb8cb2299 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralNames.java +++ b/pki/base/util/src/netscape/security/x509/GeneralNames.java @@ -21,7 +21,8 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This object class represents the GeneralNames type required in diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java b/pki/base/util/src/netscape/security/x509/GeneralSubtree.java index 248e58c96..84ceca96d 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java +++ b/pki/base/util/src/netscape/security/x509/GeneralSubtree.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtree ASN.1 object, whose syntax is: diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java b/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java index 96537e887..332f61cdd 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -17,10 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtrees ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java index ba80bfc2e..5c906d09f 100644 --- a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java +++ b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java @@ -17,12 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; -import sun.io.ByteToCharConverter; +import java.io.IOException; -import netscape.security.util.DerValue; import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A GenericValueConverter converts a string that is not associated with diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index b36f30186..6cc7cb22b 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.Date; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java b/pki/base/util/src/netscape/security/x509/IA5StringConverter.java index 80572a686..f3fa50da0 100644 --- a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java +++ b/pki/base/util/src/netscape/security/x509/IA5StringConverter.java @@ -17,10 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A AVAValueConverter that converts a IA5String attribute to a DerValue diff --git a/pki/base/util/src/netscape/security/x509/IPAddressName.java b/pki/base/util/src/netscape/security/x509/IPAddressName.java index 4fe58145c..c79147eb2 100644 --- a/pki/base/util/src/netscape/security/x509/IPAddressName.java +++ b/pki/base/util/src/netscape/security/x509/IPAddressName.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; import java.util.StringTokenizer; -import java.lang.Integer; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the IPAddressName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java index 47a5d910d..a90b2b791 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.Date; import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index d0dc7a5c9..aa18026e3 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This represents the Issuer Alternative Name Extension. diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java index 50432240e..090b0cb3b 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java @@ -17,9 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import org.mozilla.jss.asn1.*; -import netscape.security.util.*; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BOOLEAN; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * <pre> diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 6ee8dffbe..22569f454 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -17,14 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.asn1.ASN1Util; + /** * A critical CRL extension that identifies the CRL distribution point * for a particular CRL diff --git a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java b/pki/base/util/src/netscape/security/x509/KeyIdentifier.java index 1aa39fc4a..496b9ed99 100644 --- a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java +++ b/pki/base/util/src/netscape/security/x509/KeyIdentifier.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Key Identifier ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 1d6605aed..f13528c9f 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Key Usage Extension. diff --git a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java b/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java index ee93581c8..caf9ad01b 100644 --- a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java @@ -19,8 +19,6 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; - /** * Abstract class that converts a Ldap DN String to an X500Name, RDN or AVA * and vice versa, except the string is a java string in unicode. diff --git a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index e75947a8d..8203d9b08 100644 --- a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -17,10 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.util.Vector; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import sun.io.ByteToCharConverter; -import netscape.security.util.*; /** * A converter that converts Ldap v3 DN strings as specified in diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index ea4d25202..406469868 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.util.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.util.PrettyPrintFormat; /** * This class defines the NSCCommentExtension diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 037ff824d..f69e2fe5f 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -21,10 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** diff --git a/pki/base/util/src/netscape/security/x509/NoticeReference.java b/pki/base/util/src/netscape/security/x509/NoticeReference.java index 8e4711e24..9098d8163 100644 --- a/pki/base/util/src/netscape/security/x509/NoticeReference.java +++ b/pki/base/util/src/netscape/security/x509/NoticeReference.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.Vector; import java.io.IOException; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java index 7d9a032d5..0b0fd5a36 100644 --- a/pki/base/util/src/netscape/security/x509/OIDMap.java +++ b/pki/base/util/src/netscape/security/x509/OIDMap.java @@ -22,12 +22,11 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Properties; -import netscape.security.util.*; +import netscape.security.util.ObjectIdentifier; /** * This class defines the mapping from OID & name to classes and vice diff --git a/pki/base/util/src/netscape/security/x509/OIDName.java b/pki/base/util/src/netscape/security/x509/OIDName.java index a0e12ccaf..44e67867e 100644 --- a/pki/base/util/src/netscape/security/x509/OIDName.java +++ b/pki/base/util/src/netscape/security/x509/OIDName.java @@ -19,7 +19,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class implements the OIDName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/OtherName.java b/pki/base/util/src/netscape/security/x509/OtherName.java index 263d00096..c7d8841cb 100644 --- a/pki/base/util/src/netscape/security/x509/OtherName.java +++ b/pki/base/util/src/netscape/security/x509/OtherName.java @@ -17,11 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.StringTokenizer; -import java.lang.Integer; +import java.io.IOException; +import java.io.InputStream; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class implements the OtherName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java b/pki/base/util/src/netscape/security/x509/PKIXExtensions.java index 8c6742c54..8593d9238 100644 --- a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java +++ b/pki/base/util/src/netscape/security/x509/PKIXExtensions.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; - -import netscape.security.util.*; +import netscape.security.util.ObjectIdentifier; /** * Lists all the object identifiers of the X509 extensions of the PKIX profile. diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java b/pki/base/util/src/netscape/security/x509/PolicyConstraint.java index 9a0b48784..83bfa1a62 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraint.java @@ -18,9 +18,11 @@ package netscape.security.x509; import java.io.IOException; -import java.security.cert.CertificateException; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the PolicyConstraint ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 4a468ba49..faa5d43dd 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; import java.util.Enumeration; -import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the certificate extension which specifies the diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index f2d769686..f95f2dbe3 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Policy Mappings Extension. diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java b/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java index 1c4984bee..c2f750987 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java +++ b/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java b/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java index 69d0d015d..e066aefea 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java +++ b/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.Vector; import java.io.IOException; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/PrintableConverter.java b/pki/base/util/src/netscape/security/x509/PrintableConverter.java index 38457efd5..b4c58739d 100644 --- a/pki/base/util/src/netscape/security/x509/PrintableConverter.java +++ b/pki/base/util/src/netscape/security/x509/PrintableConverter.java @@ -17,10 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A AVAValueConverter that converts a Printable String attribute to a DerValue diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index 70848994c..fb37e76bb 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -22,13 +22,15 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateParsingException; import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Private Key Usage Extension. diff --git a/pki/base/util/src/netscape/security/x509/Qualifier.java b/pki/base/util/src/netscape/security/x509/Qualifier.java index ef13fc103..8f85333d7 100644 --- a/pki/base/util/src/netscape/security/x509/Qualifier.java +++ b/pki/base/util/src/netscape/security/x509/Qualifier.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/RDN.java b/pki/base/util/src/netscape/security/x509/RDN.java index 43ce490d7..347fc4e1d 100644 --- a/pki/base/util/src/netscape/security/x509/RDN.java +++ b/pki/base/util/src/netscape/security/x509/RDN.java @@ -18,11 +18,13 @@ package netscape.security.x509; import java.io.IOException; -import java.io.StringReader; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java index d7c19482e..89383231a 100644 --- a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java +++ b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * Converts a RFC 1779 string to a X500Name, RDN or AVA object and vice versa. diff --git a/pki/base/util/src/netscape/security/x509/RFC822Name.java b/pki/base/util/src/netscape/security/x509/RFC822Name.java index 19a73a302..c29db6436 100644 --- a/pki/base/util/src/netscape/security/x509/RFC822Name.java +++ b/pki/base/util/src/netscape/security/x509/RFC822Name.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the RFC822Name as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/pki/base/util/src/netscape/security/x509/ReasonFlags.java index e10b2f38a..64c8ff904 100755 --- a/pki/base/util/src/netscape/security/x509/ReasonFlags.java +++ b/pki/base/util/src/netscape/security/x509/ReasonFlags.java @@ -18,12 +18,12 @@ package netscape.security.x509; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRL Reason Flags. diff --git a/pki/base/util/src/netscape/security/x509/RevocationReason.java b/pki/base/util/src/netscape/security/x509/RevocationReason.java index 0c6133fbe..fc8c9634b 100644 --- a/pki/base/util/src/netscape/security/x509/RevocationReason.java +++ b/pki/base/util/src/netscape/security/x509/RevocationReason.java @@ -17,13 +17,6 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Array; -import java.util.Enumeration; - -import netscape.security.util.*; /** * Represent the enumerated type used in CRLReason Extension of CRL entry. diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index 785a5d79b..7d3808bd5 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -17,21 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.Serializable; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.security.cert.CRLException; -import java.security.cert.CertificateException; +import java.io.Serializable; import java.math.BigInteger; -import java.util.Collections; +import java.security.cert.CRLException; import java.util.Date; import java.util.Enumeration; import java.util.Set; -import netscape.security.util.*; -import java.io.ByteArrayOutputStream; +import netscape.security.util.ArraySet; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * <p>Abstract class for a revoked certificate in a CRL. diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java index b3002736f..41f18d9b4 100644 --- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -18,10 +18,9 @@ package netscape.security.x509; import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.security.cert.X509CRLEntry; import java.util.Date; -import java.util.Set; - -import java.security.cert.*; /** * <p>Abstract class for a revoked certificate in a CRL (Certificate diff --git a/pki/base/util/src/netscape/security/x509/SerialNumber.java b/pki/base/util/src/netscape/security/x509/SerialNumber.java index 344ecb7b0..c59b03e0f 100644 --- a/pki/base/util/src/netscape/security/x509/SerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/SerialNumber.java @@ -21,7 +21,10 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the SerialNumber class used by certificates. diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index c57bfcc96..834355582 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This represents the Subject Alternative Name Extension. diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index 65f6fef49..007437bb3 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -24,7 +24,8 @@ import java.lang.reflect.Array; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Subject Directory Attributes Extension. diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index dd3a61e28..37b943898 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Subject Key Identifier Extension. diff --git a/pki/base/util/src/netscape/security/x509/URIName.java b/pki/base/util/src/netscape/security/x509/URIName.java index 3dc804893..b0cb2d084 100644 --- a/pki/base/util/src/netscape/security/x509/URIName.java +++ b/pki/base/util/src/netscape/security/x509/URIName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the URIName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java b/pki/base/util/src/netscape/security/x509/UniqueIdentity.java index 4b33ad776..b59f7d7f7 100644 --- a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/UniqueIdentity.java @@ -18,9 +18,11 @@ package netscape.security.x509; import java.io.IOException; -import java.math.BigInteger; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the UniqueIdentity class used by certificates. diff --git a/pki/base/util/src/netscape/security/x509/UserNotice.java b/pki/base/util/src/netscape/security/x509/UserNotice.java index 01bef6dd7..3f9db6838 100644 --- a/pki/base/util/src/netscape/security/x509/UserNotice.java +++ b/pki/base/util/src/netscape/security/x509/UserNotice.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java index c8bd8ed6a..27e722641 100644 --- a/pki/base/util/src/netscape/security/x509/X500Name.java +++ b/pki/base/util/src/netscape/security/x509/X500Name.java @@ -17,14 +17,15 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.StringReader; import java.io.IOException; -import java.io.StringBufferInputStream; import java.security.Principal; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java index 8edbae358..60722924a 100644 --- a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/util/src/netscape/security/x509/X500Signer.java b/pki/base/util/src/netscape/security/x509/X500Signer.java index cd13c3359..6568e1a97 100644 --- a/pki/base/util/src/netscape/security/x509/X500Signer.java +++ b/pki/base/util/src/netscape/security/x509/X500Signer.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; +import java.security.NoSuchAlgorithmException; import java.security.Signature; import java.security.SignatureException; import java.security.Signer; -import java.security.NoSuchAlgorithmException; /** * This class provides a binding between a Signature object and an diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java index cc21f626f..82ec78410 100755 --- a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -17,33 +17,35 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.Principal; -import java.security.PublicKey; import java.security.PrivateKey; -import java.security.Security; +import java.security.PublicKey; import java.security.Signature; -import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; -import java.security.NoSuchProviderException; import java.security.SignatureException; +import java.security.cert.CRLException; import java.security.cert.Certificate; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; import java.security.cert.X509CRLEntry; -import java.security.cert.CRLException; -import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Set; -import netscape.security.util.*; +import netscape.security.util.ArraySet; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * <p> diff --git a/pki/base/util/src/netscape/security/x509/X509Cert.java b/pki/base/util/src/netscape/security/x509/X509Cert.java index 1f546bc31..eb46b15b7 100644 --- a/pki/base/util/src/netscape/security/x509/X509Cert.java +++ b/pki/base/util/src/netscape/security/x509/X509Cert.java @@ -19,15 +19,24 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.OutputStream; import java.io.Serializable; -import java.security.*; +import java.security.Certificate; +import java.security.InvalidKeyException; +import java.security.Key; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; import java.util.Date; -import java.util.Enumeration; -import netscape.security.util.*; // DER +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * @author David Brownell diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index 4c5c6eb53..c9f7c3cd7 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -18,25 +18,37 @@ package netscape.security.x509; import java.io.IOException; -import java.io.Serializable; import java.io.InputStream; import java.io.ObjectInputStream; -import java.io.OutputStream; import java.io.ObjectOutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; +import java.io.OutputStream; +import java.io.Serializable; import java.math.BigInteger; -import java.security.cert.*; -import java.security.*; -import java.security.PublicKey; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; import java.security.PrivateKey; -import java.util.Collections; +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.CertificateFactory; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; import java.util.Date; import java.util.Enumeration; import java.util.Set; -import netscape.security.util.*; +import netscape.security.util.ArraySet; import netscape.security.util.BigInt; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * The X509CertImpl class represents an X.509 certificate. These certificates diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java index 94019d8b0..7738284e6 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -18,17 +18,20 @@ package netscape.security.x509; import java.io.IOException; -import java.io.Serializable; -import java.io.OutputStream; import java.io.InputStream; -import java.io.ObjectOutputStream; import java.io.ObjectInputStream; - -import java.security.cert.*; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; import java.util.Enumeration; import java.util.Hashtable; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/X509Key.java b/pki/base/util/src/netscape/security/x509/X509Key.java index 3bdeed4df..9d5f86a90 100644 --- a/pki/base/util/src/netscape/security/x509/X509Key.java +++ b/pki/base/util/src/netscape/security/x509/X509Key.java @@ -17,19 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.Properties; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PublicKey; import java.security.KeyFactory; -import java.security.Security; -import java.security.Provider; -import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.Provider; +import java.security.PublicKey; +import java.security.Security; import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; +import java.util.Properties; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Holds an X.509 key, for example a public key found in an X.509 |