diff options
Diffstat (limited to 'pki/base/util/src/com/netscape/cmsutil')
100 files changed, 461 insertions, 451 deletions
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index 0083dc92d..2cd13111c 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -18,44 +18,84 @@ package com.netscape.cmsutil.crypto; -import java.net.*; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.*; - -import java.security.*; -import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyPair; import java.security.NoSuchAlgorithmException; -import java.security.interfaces.RSAPublicKey; -import java.security.interfaces.DSAPublicKey; +import java.security.NoSuchProviderException; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.interfaces.DSAParams; -import java.security.cert.*; - -//import sun.misc.BASE64Encoder; -//import sun.misc.BASE64Decoder; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkcs7.ContentInfo; -import org.mozilla.jss.pkcs7.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11KeyPairGenerator; -import org.mozilla.jss.crypto.*; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Date; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +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.CertificateAlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +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.CertificateX509Key; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500Signer; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.Algorithm; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.InvalidKeyFormatException; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyPairAlgorithm; import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; import org.mozilla.jss.crypto.PrivateKey; import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenException; import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Base64OutputStream; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; import com.netscape.cmsutil.util.Cert; - import com.netscape.osutil.OSUtil; public class CryptoUtil { diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java b/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java index 9a4fa800d..e7971ea78 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java @@ -17,9 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.crypto; -import org.mozilla.jss.crypto.*; +import java.util.Vector; -import java.util.*; +import org.mozilla.jss.crypto.CryptoToken; public class Module { // Common Name is the name given when module is added diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java b/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java index 801472676..f86e49bdc 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.crypto; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.crypto.CryptoToken; public class Token { CryptoToken mToken; diff --git a/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java b/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java index 61d6d785f..8922f38dd 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java @@ -18,15 +18,9 @@ package com.netscape.cmsutil.http; -import java.net.*; -import java.io.*; -import netscape.ldap.*; -import org.mozilla.jss.ssl.*; +import java.net.SocketException; -import com.netscape.cmsutil.net.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.X509Certificate; +import com.netscape.cmsutil.net.ISocketFactory; public class ConnectAsync extends Thread { diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java b/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java index 2efc72674..130d747d6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java @@ -17,10 +17,17 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.http; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.net.Socket; -import java.io.*; -import com.netscape.cmsutil.net.*; -import org.mozilla.jss.ssl.*; + +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; + +import com.netscape.cmsutil.net.ISocketFactory; /** * basic http client. diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java b/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java index 56c4a27f9..93eeef68c 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java @@ -18,9 +18,11 @@ package com.netscape.cmsutil.http; -import java.io.*; -import java.util.Hashtable; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.Enumeration; +import java.util.Hashtable; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java b/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java index f22c50452..76232a2dc 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java @@ -18,9 +18,9 @@ package com.netscape.cmsutil.http; -import java.io.*; -import java.util.Hashtable; -import java.util.Enumeration; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.OutputStreamWriter; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java b/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java index 9309f2bb1..09d8e562d 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java @@ -18,9 +18,9 @@ package com.netscape.cmsutil.http; -import java.io.*; -import java.util.Hashtable; -import java.util.Enumeration; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.OutputStreamWriter; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java index f72c34bad..ed4e95187 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java @@ -18,14 +18,20 @@ package com.netscape.cmsutil.http; -import java.net.*; -import java.io.*; -import netscape.ldap.*; -import org.mozilla.jss.ssl.*; +import java.io.IOException; +import java.net.Socket; +import java.net.SocketException; +import java.net.UnknownHostException; + import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; +import org.mozilla.jss.ssl.SSLHandshakeCompletedEvent; +import org.mozilla.jss.ssl.SSLHandshakeCompletedListener; +import org.mozilla.jss.ssl.SSLSocket; -import com.netscape.cmsutil.net.*; +import com.netscape.cmsutil.net.ISocketFactory; /** * Uses NSS ssl socket. diff --git a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java b/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java index 9f0884833..eaae00074 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java @@ -17,9 +17,19 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ldap; -import netscape.ldap.*; -import netscape.ldap.util.*; -import java.io.*; +import java.io.IOException; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.util.LDIF; +import netscape.ldap.util.LDIFAttributeContent; +import netscape.ldap.util.LDIFContent; +import netscape.ldap.util.LDIFModifyContent; +import netscape.ldap.util.LDIFRecord; public class LDAPUtil { public static void importLDIF(LDAPConnection conn, String filename) throws IOException { diff --git a/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java b/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java index 3bbe2303a..9227f5911 100644 --- a/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java +++ b/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.net; -import java.net.Socket; import java.io.IOException; +import java.net.Socket; import java.net.UnknownHostException; -import org.mozilla.jss.ssl.*; + +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; public interface ISocketFactory { diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java index b59854a2f..f6306b789 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java @@ -17,13 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.Signer; -import org.mozilla.jss.asn1.OCTET_STRING; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; import org.mozilla.jss.asn1.BIT_STRING; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.cert.Certificate; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java index 36bf42e80..29fbc4e87 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java @@ -17,9 +17,18 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.*; -import java.io.*; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java index ba1ccbb8f..c6fe4b510 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java @@ -17,10 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.cert.Extension; +import org.mozilla.jss.asn1.ASN1Value; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java index b60a568b9..c0b5015d0 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java @@ -17,10 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.cert.Extension; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.NULL; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java index 028feac03..96a3e44fa 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java @@ -17,9 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.asn1.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java index 74fee4fef..aa6ef1b55 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java @@ -17,8 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.primitive.Name; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java index 97e0a63da..98f50e7ef 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java @@ -17,8 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java index 9c635e36c..67f6242c5 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java @@ -17,8 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java index 5eff86c44..ee2b62020 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java @@ -17,8 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.ENUMERATED; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java index d3d5850fd..f180709de 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java @@ -17,9 +17,17 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.cert.Extension; -import org.mozilla.jss.asn1.*; -import java.io.*; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java index 37b884964..d5cfa6807 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.OutputStream; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; +import org.mozilla.jss.asn1.ASN1Value; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java index 76f4a360f..eb011e1c1 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.OCTET_STRING; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java index 7f41d02d1..80a15b910 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java @@ -17,8 +17,17 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java index c70229ce2..81c5eee4c 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java @@ -17,13 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.BIT_STRING; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.pkix.cert.Certificate; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.cert.Extension; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java index bb253077b..b1b7489f5 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java @@ -17,8 +17,18 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java index e56d5f397..2810182e1 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java @@ -17,10 +17,19 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +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; import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.asn1.*; -import java.io.*; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java index 94e956162..1ce727471 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java @@ -17,9 +17,19 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.Name; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.cert.Extension; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java index 833ebfb2a..4e09c5914 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java @@ -17,9 +17,19 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; import org.mozilla.jss.pkix.cert.Extension; -import org.mozilla.jss.asn1.*; -import java.io.*; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java index 9e93fb01c..d9891f5a5 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java +++ b/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java @@ -17,8 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.ocsp; -import java.io.*; -import org.mozilla.jss.asn1.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.NULL; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * RFC 2560: diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java index 7cdb7ec92..1a6a026ba 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java @@ -16,8 +16,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.util.Enumeration; public interface IPasswordReader { public void init(String pwdPath) throws IOException; diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java index 0f12f5242..3d7a8d80c 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.util.Enumeration; public interface IPasswordStore { public void init(String pwdPath) throws IOException; diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java index 4aa505601..2f42e02cb 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java @@ -16,8 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; -import java.io.*; -import java.util.*; +import java.io.IOException; public interface IPasswordWriter { public void init(String pwdPath) diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java index fd3fc8b0d..c9cec1df6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Enumeration; import java.util.Properties; -import java.io.*; -import java.util.*; public class PlainPasswordFile implements IPasswordStore{ private String mPwdPath = ""; diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java index c6a138236..27a39cb6f 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; import java.util.Properties; -import java.io.*; -import java.util.*; public class PlainPasswordReader implements IPasswordReader{ private String mPwdPath = ""; diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java index 382c117b7..0cd29a181 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.password; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.Properties; -import java.io.*; -import java.util.*; public class PlainPasswordWriter implements IPasswordWriter{ private static final String PASSWORD_WRITER_HEADER = ""; diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java b/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java index adff75a96..c5f9828c1 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class AccessAccept extends ServerPacket { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java b/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java index 4db3ea935..bab34ffe9 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class AccessChallenge extends ServerPacket { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java b/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java index 96e4b1fae..12081a6b9 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class AccessReject extends ServerPacket { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java b/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java index 4098bbf15..5075f9325 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java @@ -18,11 +18,6 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; public class AccessRequest extends NASPacket { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java index 16e60bb55..33c1f3929 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java @@ -18,11 +18,8 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; public abstract class Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java index 1290011fe..bf2369721 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class AttributeFactory { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java index 4c17f441d..e79b96f7c 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java @@ -18,11 +18,8 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.util.Enumeration; +import java.util.Vector; public class AttributeSet { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java b/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java index 7fe060975..3236d9b65 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public abstract class Authenticator { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java index 5ddc186bc..8b2655c2e 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CHAPChallengeAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java index 063ce891c..90ebea144 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CHAPPasswordAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java index c4c175be2..894ae9c89 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CallbackIdAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java index 818930170..96e4af79e 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CallbackNumberAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java index a0afb3fcd..05e4836d6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CallerStationIdAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java index 162d7098e..b1f77b694 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class CallingStationIdAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java b/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java index bdcd77abc..06a870b50 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java @@ -18,11 +18,6 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; public class ChallengeException extends Exception { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java index 15b8940d4..c8d9abf8e 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FilterIdAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java index 649442fa2..2176fbc02 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedAppleTalkLinkAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java index e59449862..6ea0c05ff 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedAppleTalkNetworkAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java index 18f064448..3ea8c654f 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedAppleTalkZoneAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java index 9b2f398cc..cf21b9fda 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedCompressionAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java index 55b313a1b..1fac0a3f0 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedIPAddressAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java index c8f7324f2..9350fac11 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedIPNetmaskAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java index 448dbb5de..900c46c00 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedIPXNetworkAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java index 0c9de7268..b3a362337 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedMTUAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java index a13321c8d..1acee4ce7 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedProtocolAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java index 07777bd12..bc49adb06 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedRouteAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java index ade7e34f2..1ea4e334f 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class FramedRoutingAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java index df42fb6f9..c368a2712 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class GenericAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java index 513c1077f..38b45a6c8 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class IdleTimeoutAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java index 2f8dae725..7bfe179ff 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginIPHostAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java index 5c1891f78..93a507661 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginLATGroupAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java index 55948d443..38b4b315f 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginLATNodeAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java index a0e61ab98..056b0fc43 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginLATPortAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java index 7116630ac..7409a83a4 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginLATServiceAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java index 1dcd12b2f..88f5623be 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginServiceAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java index b7921c3a8..0c924f695 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class LoginTCPPortAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java index 539c259f9..ba644f201 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class NASClassAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java index 3b9e438ff..42dc1a19b 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java @@ -18,11 +18,8 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.net.InetAddress; public class NASIPAddressAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java index 3cc67d8ec..99917cac7 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class NASIdentifierAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java index 86eec6dbf..b270eadde 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java @@ -18,11 +18,8 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; public abstract class NASPacket extends Packet { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java index ebf1aa218..949fa4759 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class NASPortAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java index a6e40ae4b..ca7cf7b09 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class NASPortTypeAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java b/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java index cd0e5a881..4af445639 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java @@ -18,11 +18,6 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; public abstract class Packet { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java b/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java index 9bd5d1921..c9dd1620a 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class PacketFactory { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java index 41d185e88..602603cb6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class PortLimitAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java index 91210b354..ef04ae0ca 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class ProxyStateAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java b/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java index 5d16cd8a2..1c09ea2c4 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java @@ -18,11 +18,15 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; +import java.net.SocketException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Properties; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java b/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java index 1a76e7603..a0de446bd 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java @@ -18,11 +18,6 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; public class RejectException extends Exception { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java index dd1fc29d1..094a51730 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class ReplyMessageAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java b/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java index eaba2077a..108b51451 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java @@ -18,11 +18,10 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; public class RequestAuthenticator extends Authenticator { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java b/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java index 509ddc35d..93fd46c39 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class ResponseAuthenticator extends Authenticator { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java b/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java index c349fed9a..abbe255fc 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public abstract class ServerPacket extends Packet { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java index 7de8cfb01..7ab143f79 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class ServiceTypeAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java index f83690d6f..fcbf69425 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class SessionTimeoutAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java index c18e59880..4408819a6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class StateAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java index 1a554ea2d..67f214adf 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class TerminationActionAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java index 4e725ac3f..ccc715e54 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class UserNameAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java index 4550081ae..938652e09 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java @@ -18,11 +18,9 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; public class UserPasswordAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java b/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java index 1d19a5055..e3f174160 100644 --- a/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java +++ b/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java @@ -18,11 +18,7 @@ package com.netscape.cmsutil.radius; -import java.util.*; -import java.math.*; -import java.security.*; -import java.net.*; -import java.io.*; +import java.io.IOException; public class VendorSpecificAttribute extends Attribute { diff --git a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index 6ffd58e33..16406e2a7 100644 --- a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -18,19 +18,36 @@ package com.netscape.cmsutil.scep; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.io.IOException; +import java.security.PublicKey; import java.util.Arrays; import java.util.Hashtable; -import org.mozilla.jss.pkcs7.ContentInfo; -//import org.mozilla.jss.util.Assert; -import org.mozilla.jss.pkix.primitive.*; -//import org.mozilla.jss.pkix.primitive.Attribute; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.NULL; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.PrintableString; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; import org.mozilla.jss.pkcs7.Attribute; -import org.mozilla.jss.crypto.*; -import java.security.PublicKey; -import org.mozilla.jss.pkix.cert.*; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.EncryptedContentInfo; +import org.mozilla.jss.pkcs7.EnvelopedData; +import org.mozilla.jss.pkcs7.IssuerAndSerialNumber; +import org.mozilla.jss.pkcs7.RecipientInfo; +import org.mozilla.jss.pkcs7.SignedData; +import org.mozilla.jss.pkcs7.SignerInfo; +import org.mozilla.jss.pkix.cert.Certificate; +import org.mozilla.jss.pkix.cert.CertificateInfo; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; public class CRSPKIMessage { diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java b/pki/base/util/src/com/netscape/cmsutil/util/Cert.java index 6a2d32b32..d5689ac9d 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Cert.java @@ -18,17 +18,18 @@ package com.netscape.cmsutil.util; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; + import netscape.security.pkcs.PKCS7; import netscape.security.x509.X509CRLImpl; import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.crypto.SignatureAlgorithm; -//import sun.misc.BASE64Decoder; -import com.netscape.osutil.OSUtil; -import java.io.IOException; -import java.security.cert.CertificateException; -import java.security.cert.X509CRL; -import java.security.cert.X509Certificate; +import com.netscape.osutil.OSUtil; public class Cert { diff --git a/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java b/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java index c1ab2003d..e77e37a50 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java @@ -19,7 +19,6 @@ package com.netscape.cmsutil.util; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; /** diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java index 9d0fb05ac..36933da8e 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -18,10 +18,22 @@ package com.netscape.cmsutil.util; -import java.net.*; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Vector; public class Utils { /** diff --git a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java index e140c3098..a012f1a08 100644 --- a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java +++ b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java @@ -16,16 +16,32 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.xml; -import org.w3c.dom.*; -import org.xml.sax.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.StringWriter; +import java.util.Vector; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import java.io.*; -import java.util.*; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; +import org.xml.sax.SAXException; public class XMLObject { |