5 files changed, 49 insertions, 60 deletions
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;
 
 
 /**