1 files changed, 49 insertions, 29 deletions
diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
index 2dfc188d2..713e276d7 100644
--- a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -18,43 +18,63 @@
 package com.netscape.kra;
 
 
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Arrays;
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.math.BigInteger;
-import java.security.*;
-// ADDED next line and COMMENTED out following line by MLH on 1/9/99
-import netscape.security.provider.RSAPublicKey;
-// import java.security.interfaces.RSAPublicKey;
+import java.security.InvalidKeyException;
 import java.security.cert.CertificateException;
-import netscape.security.util.*;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import netscape.security.provider.RSAPublicKey;
 import netscape.security.util.BigInt;
-import netscape.security.x509.*;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.asn1.*;
-import org.mozilla.jss.pkix.cms.*;
+import netscape.security.util.DerInputStream;
+import netscape.security.util.DerOutputStream;
+import netscape.security.util.DerValue;
+import netscape.security.x509.CertificateSubjectName;
+import netscape.security.x509.CertificateX509Key;
+import netscape.security.x509.X509CertInfo;
+import netscape.security.x509.X509Key;
+
+import org.mozilla.jss.asn1.ANY;
+import org.mozilla.jss.asn1.ASN1Util;
+import org.mozilla.jss.asn1.ASN1Value;
+import org.mozilla.jss.asn1.BIT_STRING;
+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.SET;
+import org.mozilla.jss.pkix.cms.EncryptedContentInfo;
 import org.mozilla.jss.pkix.cms.EnvelopedData;
-//import org.mozilla.jss.pkcs7.*;
-import org.mozilla.jss.pkix.crmf.*;
+import org.mozilla.jss.pkix.cms.RecipientInfo;
+import org.mozilla.jss.pkix.crmf.CertReqMsg;
+import org.mozilla.jss.pkix.crmf.CertRequest;
 import org.mozilla.jss.pkix.crmf.EncryptedKey;
-import org.mozilla.jss.pkix.crmf.EncryptedKey.Type;
-import org.mozilla.jss.pkix.primitive.*;
+import org.mozilla.jss.pkix.crmf.EncryptedValue;
+import org.mozilla.jss.pkix.crmf.PKIArchiveOptions;
 import org.mozilla.jss.pkix.primitive.AVA;
-import com.netscape.certsrv.util.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.security.*;
-import com.netscape.cmscore.crmf.*;
-import com.netscape.certsrv.kra.*;
-import com.netscape.certsrv.base.*;
-//import com.netscape.cmscore.ca.*;
-import com.netscape.cmscore.dbs.*;
-import com.netscape.certsrv.profile.*;
-import com.netscape.certsrv.dbs.keydb.*;
-import com.netscape.certsrv.request.*;
-import com.netscape.certsrv.authentication.*;
+import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier;
+
 import com.netscape.certsrv.apps.CMS;
+import com.netscape.certsrv.authentication.AuthToken;
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.base.SessionContext;
+import com.netscape.certsrv.dbs.keydb.IKeyRepository;
+import com.netscape.certsrv.kra.EKRAException;
+import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
+import com.netscape.certsrv.kra.ProofOfArchival;
+import com.netscape.certsrv.logging.AuditFormat;
+import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.profile.IEnrollProfile;
+import com.netscape.certsrv.request.IRequest;
+import com.netscape.certsrv.request.IService;
+import com.netscape.certsrv.security.IStorageKeyUnit;
+import com.netscape.certsrv.security.ITransportKeyUnit;
+import com.netscape.certsrv.util.IStatsSubsystem;
+import com.netscape.cmscore.crmf.CRMFParser;
+import com.netscape.cmscore.crmf.PKIArchiveOptionsContainer;
+import com.netscape.cmscore.dbs.KeyRecord;
 
 
 /**