16 files changed, 137 insertions, 113 deletions
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 {