diff options
Diffstat (limited to 'pki/base/silent')
33 files changed, 275 insertions, 367 deletions
diff --git a/pki/base/silent/src/argparser/ArgParser.java b/pki/base/silent/src/argparser/ArgParser.java index 46251787f..e7bd7e741 100755 --- a/pki/base/silent/src/argparser/ArgParser.java +++ b/pki/base/silent/src/argparser/ArgParser.java @@ -29,15 +29,14 @@ * software. */ -import java.io.PrintStream; -import java.io.IOException; -import java.io.LineNumberReader; import java.io.File; import java.io.FileReader; +import java.io.IOException; +import java.io.LineNumberReader; +import java.io.PrintStream; import java.io.Reader; -import java.util.Vector; - import java.lang.reflect.Array; +import java.util.Vector; /** * ArgParser is used to parse the command line arguments for a java diff --git a/pki/base/silent/src/argparser/ArgParserTest.java b/pki/base/silent/src/argparser/ArgParserTest.java index 74b4c03e1..a2a29bc68 100644 --- a/pki/base/silent/src/argparser/ArgParserTest.java +++ b/pki/base/silent/src/argparser/ArgParserTest.java @@ -29,8 +29,8 @@ * software. */ -import java.io.*; - +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import java.lang.reflect.Array; import java.util.Vector; diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/pki/base/silent/src/ca/ConfigureCA.java index f6cf2f5f7..0b01e56ee 100644 --- a/pki/base/silent/src/ca/ConfigureCA.java +++ b/pki/base/silent/src/ca/ConfigureCA.java @@ -16,34 +16,21 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; + +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.PFX; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/ca/DirEnroll.java b/pki/base/silent/src/ca/DirEnroll.java index 1bbd662eb..5ca3fccfd 100644 --- a/pki/base/silent/src/ca/DirEnroll.java +++ b/pki/base/silent/src/ca/DirEnroll.java @@ -16,14 +16,16 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; - -import org.mozilla.jss.ssl.*; -// import sun.misc.*; -import java.lang.Exception; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.URLEncoder; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.mozilla.jss.ssl.SSLSocket; /** diff --git a/pki/base/silent/src/ca/Request.java b/pki/base/silent/src/ca/Request.java index 46711f5a1..600d21e31 100644 --- a/pki/base/silent/src/ca/Request.java +++ b/pki/base/silent/src/ca/Request.java @@ -16,15 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; - -import sun.misc.*; -import java.lang.Exception; -import java.security.*; import java.net.URLEncoder; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Vector; /** diff --git a/pki/base/silent/src/ca/UserEnroll.java b/pki/base/silent/src/ca/UserEnroll.java index 4dc277aa0..fee2532e8 100644 --- a/pki/base/silent/src/ca/UserEnroll.java +++ b/pki/base/silent/src/ca/UserEnroll.java @@ -16,14 +16,16 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; - -import org.mozilla.jss.ssl.*; -import sun.misc.*; -import java.lang.Exception; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.URLEncoder; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.mozilla.jss.ssl.SSLSocket; /** diff --git a/pki/base/silent/src/ca/checkRequest.java b/pki/base/silent/src/ca/checkRequest.java index 238e87c91..41cd2d70c 100644 --- a/pki/base/silent/src/ca/checkRequest.java +++ b/pki/base/silent/src/ca/checkRequest.java @@ -16,14 +16,16 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; - -import org.mozilla.jss.ssl.*; -import sun.misc.*; -import java.lang.Exception; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.mozilla.jss.ssl.SSLSocket; /** diff --git a/pki/base/silent/src/common/AutoInstaller.java b/pki/base/silent/src/common/AutoInstaller.java index bd4897d76..c343a6918 100644 --- a/pki/base/silent/src/common/AutoInstaller.java +++ b/pki/base/silent/src/common/AutoInstaller.java @@ -16,9 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Properties; /** diff --git a/pki/base/silent/src/common/BaseState.java b/pki/base/silent/src/common/BaseState.java index e4347c749..e5ff7ccd9 100644 --- a/pki/base/silent/src/common/BaseState.java +++ b/pki/base/silent/src/common/BaseState.java @@ -16,10 +16,6 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; /** diff --git a/pki/base/silent/src/common/CMSConfig.java b/pki/base/silent/src/common/CMSConfig.java index 7f219dfdf..4d29cb8b0 100644 --- a/pki/base/silent/src/common/CMSConfig.java +++ b/pki/base/silent/src/common/CMSConfig.java @@ -16,9 +16,8 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; +import java.io.FileInputStream; +import java.io.FileOutputStream; /** diff --git a/pki/base/silent/src/common/CMSInstance.java b/pki/base/silent/src/common/CMSInstance.java index d8fccb284..542636edd 100644 --- a/pki/base/silent/src/common/CMSInstance.java +++ b/pki/base/silent/src/common/CMSInstance.java @@ -16,8 +16,13 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.URLEncoder; public class CMSInstance { diff --git a/pki/base/silent/src/common/CMSLDAP.java b/pki/base/silent/src/common/CMSLDAP.java index f5e4989c5..b7f678064 100644 --- a/pki/base/silent/src/common/CMSLDAP.java +++ b/pki/base/silent/src/common/CMSLDAP.java @@ -16,10 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import netscape.ldap.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.security.cert.*; + +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.LDAPModificationSet; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; /** diff --git a/pki/base/silent/src/common/CMSProperties.java b/pki/base/silent/src/common/CMSProperties.java index 2c9008b75..0c64ac9e8 100644 --- a/pki/base/silent/src/common/CMSProperties.java +++ b/pki/base/silent/src/common/CMSProperties.java @@ -26,16 +26,17 @@ * */ -import java.util.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.BufferedWriter; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.util.Date; +import java.util.Enumeration; import java.util.Hashtable; diff --git a/pki/base/silent/src/common/CMSTask.java b/pki/base/silent/src/common/CMSTask.java index 31ba4547f..c9b1aeab8 100644 --- a/pki/base/silent/src/common/CMSTask.java +++ b/pki/base/silent/src/common/CMSTask.java @@ -16,8 +16,9 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; /** diff --git a/pki/base/silent/src/common/Certificate_Record.java b/pki/base/silent/src/common/Certificate_Record.java index 0331e02e5..91b7dab11 100644 --- a/pki/base/silent/src/common/Certificate_Record.java +++ b/pki/base/silent/src/common/Certificate_Record.java @@ -16,9 +16,6 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.io.*; -import java.net.*; public class Certificate_Record { diff --git a/pki/base/silent/src/common/ComCrypto.java b/pki/base/silent/src/common/ComCrypto.java index 6afc4f9cf..3e5d927ff 100644 --- a/pki/base/silent/src/common/ComCrypto.java +++ b/pki/base/silent/src/common/ComCrypto.java @@ -16,47 +16,51 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; -import java.util.Date; -import java.util.StringTokenizer; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.BufferedReader; -import java.net.URLEncoder; import java.security.KeyPair; -import java.lang.Exception; -import org.mozilla.jss.*; +import netscape.security.x509.X500Name; + import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; -import org.mozilla.jss.util.Password; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; import org.mozilla.jss.crypto.KeyPairAlgorithm; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; - -//import netscape.security.provider.RSAPublicKey; -import netscape.security.pkcs.PKCS10; -import netscape.security.x509.X500Name; -import netscape.security.util.BigInt; -import netscape.security.x509.X500Signer; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11Token; +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.crmf.EncryptedKey; +import org.mozilla.jss.pkix.crmf.EncryptedValue; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; +import org.mozilla.jss.pkix.crmf.POPOPrivKey; +import org.mozilla.jss.pkix.crmf.ProofOfPossession; +import org.mozilla.jss.pkix.primitive.AVA; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import org.mozilla.jss.util.Password; -//import sun.misc.BASE64Encoder; -//import sun.misc.BASE64Decoder; -import java.security.Signature; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/common/Con2Agent.java b/pki/base/silent/src/common/Con2Agent.java index bbf7a12b2..5c05b40c1 100644 --- a/pki/base/silent/src/common/Con2Agent.java +++ b/pki/base/silent/src/common/Con2Agent.java @@ -16,24 +16,23 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.Enumeration; +import java.util.Vector; -import org.mozilla.jss.*; import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.pkcs11.PK11Token; - -import sun.misc.*; -import java.lang.Exception; -import java.security.*; -import java.net.URLEncoder; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.util.Password; /** diff --git a/pki/base/silent/src/common/ParseXML.java b/pki/base/silent/src/common/ParseXML.java index e80c512d0..474136213 100644 --- a/pki/base/silent/src/common/ParseXML.java +++ b/pki/base/silent/src/common/ParseXML.java @@ -16,13 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import org.w3c.dom.*; -import org.apache.xml.serialize.*; - -import javax.xml.parsers.*; -import java.util.*; -import java.io.*; -import java.net.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.xml.serialize.OutputFormat; +import org.apache.xml.serialize.XMLSerializer; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; public class ParseXML { diff --git a/pki/base/silent/src/common/PostQuery.java b/pki/base/silent/src/common/PostQuery.java index b8ab7505a..10599ce2e 100644 --- a/pki/base/silent/src/common/PostQuery.java +++ b/pki/base/silent/src/common/PostQuery.java @@ -16,9 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/common/ServerInfo.java b/pki/base/silent/src/common/ServerInfo.java index 09d3e4759..e9d96cd4c 100644 --- a/pki/base/silent/src/common/ServerInfo.java +++ b/pki/base/silent/src/common/ServerInfo.java @@ -16,9 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.net.InetAddress; +import java.util.StringTokenizer; /** diff --git a/pki/base/silent/src/common/TestClient.java b/pki/base/silent/src/common/TestClient.java index e953f09f7..266a125d2 100644 --- a/pki/base/silent/src/common/TestClient.java +++ b/pki/base/silent/src/common/TestClient.java @@ -16,22 +16,16 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; -import java.util.*; -import java.math.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -// import sun.misc.*; -import java.lang.Exception; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.Properties; + +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; /** diff --git a/pki/base/silent/src/common/Utilities.java b/pki/base/silent/src/common/Utilities.java index 444d9b6bf..7deb154ca 100644 --- a/pki/base/silent/src/common/Utilities.java +++ b/pki/base/silent/src/common/Utilities.java @@ -16,15 +16,17 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.io.*; -import java.net.*; - -import java.security.*; -import java.security.cert.*; -import sun.misc.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.DataInputStream; +import java.io.FileInputStream; +import java.util.Enumeration; + +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RDN; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/common/createinstance.java b/pki/base/silent/src/common/createinstance.java index 2fea96d27..5b2020085 100644 --- a/pki/base/silent/src/common/createinstance.java +++ b/pki/base/silent/src/common/createinstance.java @@ -16,8 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.io.*; +import java.net.URLEncoder; public class createinstance { diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/pki/base/silent/src/drm/ConfigureDRM.java index 5298811f3..72448f242 100644 --- a/pki/base/silent/src/drm/ConfigureDRM.java +++ b/pki/base/silent/src/drm/ConfigureDRM.java @@ -16,31 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; + +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.PFX; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/http/CertSelection.java b/pki/base/silent/src/http/CertSelection.java index a83cb3af3..433a52aa9 100644 --- a/pki/base/silent/src/http/CertSelection.java +++ b/pki/base/silent/src/http/CertSelection.java @@ -16,19 +16,9 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.io.*; -import java.net.*; -import java.nio.*; -import java.util.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; +import java.util.Vector; + +import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; public class CertSelection implements SSLClientCertificateSelectionCallback diff --git a/pki/base/silent/src/http/HTMLDocument.java b/pki/base/silent/src/http/HTMLDocument.java index 5fcb5343b..944d45a02 100644 --- a/pki/base/silent/src/http/HTMLDocument.java +++ b/pki/base/silent/src/http/HTMLDocument.java @@ -16,10 +16,13 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.regex.*; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.LinkedHashSet; +import java.util.StringTokenizer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; diff --git a/pki/base/silent/src/http/HTTPClient.java b/pki/base/silent/src/http/HTTPClient.java index 5633cb448..b6067519e 100644 --- a/pki/base/silent/src/http/HTTPClient.java +++ b/pki/base/silent/src/http/HTTPClient.java @@ -16,25 +16,27 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.io.*; -import java.net.*; -import java.nio.*; -import java.util.*; -import java.net.URLEncoder; - -//import sun.misc.BASE64Encoder; -//import sun.misc.BASE64Decoder; -import com.netscape.osutil.OSUtil; - +import java.io.BufferedOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.URLDecoder; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.StringTokenizer; + +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.ssl.TestCertApprovalCallback; +import org.mozilla.jss.ssl.TestClientCertificateSelectionCallback; -import org.mozilla.jss.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; +import com.netscape.osutil.OSUtil; public class HTTPClient implements SSLCertificateApprovalCallback diff --git a/pki/base/silent/src/http/HTTPResponse.java b/pki/base/silent/src/http/HTTPResponse.java index f4d66adb5..8e0c6680a 100644 --- a/pki/base/silent/src/http/HTTPResponse.java +++ b/pki/base/silent/src/http/HTTPResponse.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- -import java.net.*; -import java.util.*; +import java.util.ArrayList; +import java.util.StringTokenizer; public class HTTPResponse diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/pki/base/silent/src/ocsp/ConfigureOCSP.java index 9e5410bad..e25822d88 100644 --- a/pki/base/silent/src/ocsp/ConfigureOCSP.java +++ b/pki/base/silent/src/ocsp/ConfigureOCSP.java @@ -16,31 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; + +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.PFX; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/pki/base/silent/src/ra/ConfigureRA.java index 8e976ab10..fef97ed19 100644 --- a/pki/base/silent/src/ra/ConfigureRA.java +++ b/pki/base/silent/src/ra/ConfigureRA.java @@ -16,31 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; +import java.io.ByteArrayInputStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/subca/ConfigureSubCA.java index 561f68e44..3fe48dce2 100644 --- a/pki/base/silent/src/subca/ConfigureSubCA.java +++ b/pki/base/silent/src/subca/ConfigureSubCA.java @@ -16,31 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; +import java.io.ByteArrayInputStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/pki/base/silent/src/tks/ConfigureTKS.java index ec934c8f4..0e593c9cc 100644 --- a/pki/base/silent/src/tks/ConfigureTKS.java +++ b/pki/base/silent/src/tks/ConfigureTKS.java @@ -16,31 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; + +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.PFX; import com.netscape.osutil.OSUtil; diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/pki/base/silent/src/tps/ConfigureTPS.java index 2f052e7ad..0b5aa41e1 100644 --- a/pki/base/silent/src/tps/ConfigureTPS.java +++ b/pki/base/silent/src/tps/ConfigureTPS.java @@ -16,31 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.util.*; -import java.net.*; -import java.io.*; - -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; - -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import sun.misc.*; -import java.lang.Exception; - -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; +import java.io.ByteArrayInputStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Hashtable; import com.netscape.osutil.OSUtil; |