diff options
Diffstat (limited to 'pki')
1198 files changed, 14430 insertions, 11445 deletions
diff --git a/pki/base/ca/src/com/netscape/ca/CAPolicy.java b/pki/base/ca/src/com/netscape/ca/CAPolicy.java index 8b2a48a3d..80c801a42 100644 --- a/pki/base/ca/src/com/netscape/ca/CAPolicy.java +++ b/pki/base/ca/src/com/netscape/ca/CAPolicy.java @@ -18,14 +18,18 @@ package com.netscape.ca; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.cmscore.policy.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.cmscore.policy.GenericPolicyProcessor; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/pki/base/ca/src/com/netscape/ca/CAService.java index 6d0555ad8..9297d421c 100644 --- a/pki/base/ca/src/com/netscape/ca/CAService.java +++ b/pki/base/ca/src/com/netscape/ca/CAService.java @@ -18,33 +18,79 @@ package com.netscape.ca; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.connector.*; -import com.netscape.cmscore.connector.*; -import netscape.security.extensions.CertInfo; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.crmf.*; -import com.netscape.cmscore.util.Debug; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.cert.CRLException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import netscape.security.x509.*; +import netscape.security.extensions.CertInfo; import netscape.security.util.BigInt; -import netscape.security.util.*; -import java.security.cert.*; -import java.security.NoSuchAlgorithmException; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.*; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +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.LdapV3DNStrConverter; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500NameAttrMap; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509ExtensionException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ECAException; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.cmscore.base.SubsystemRegistry; +import com.netscape.cmscore.connector.HttpConnector; +import com.netscape.cmscore.connector.LocalConnector; +import com.netscape.cmscore.connector.RemoteAuthority; +import com.netscape.cmscore.crmf.CRMFParser; +import com.netscape.cmscore.crmf.PKIArchiveOptionsContainer; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.dbs.RevocationInfo; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java index abbfbfc9f..6817f1526 100644 --- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java +++ b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java @@ -19,35 +19,42 @@ package com.netscape.ca; import java.io.IOException; -import java.util.*; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.Extension; -import netscape.security.x509.CRLExtensions; +import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.extensions.AuthInfoAccessExtension; import netscape.security.x509.AuthorityKeyIdentifierExtension; -import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.CRLExtensions; import netscape.security.x509.CRLNumberExtension; -import netscape.security.x509.DeltaCRLIndicatorExtension; -import netscape.security.x509.IssuingDistributionPointExtension; import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.FreshestCRLExtension; import netscape.security.x509.HoldInstructionExtension; import netscape.security.x509.InvalidityDateExtension; -import netscape.security.x509.CertificateIssuerExtension; -import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.IssuingDistributionPointExtension; import netscape.security.x509.OIDMap; -import netscape.security.extensions.AuthInfoAccessExtension; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.cmscore.base.SubsystemRegistry; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotDefined; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICMSCRLExtensions; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePair; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import java.security.cert.CertificateException; +import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.crl.CMSIssuingDistributionPointExtension; +import com.netscape.cmscore.base.SubsystemRegistry; public class CMSCRLExtensions implements ICMSCRLExtensions { diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index aba2db149..f02d0905b 100644 --- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -18,32 +18,71 @@ package com.netscape.ca; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.cert.CRLException; +import java.io.IOException; +import java.math.BigInteger; import java.security.NoSuchAlgorithmException; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmscore.dbs.*; +import java.security.cert.CRLException; +import java.util.Collection; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TimeZone; +import java.util.Vector; + +import netscape.security.util.ArraySet; +import netscape.security.util.BitArray; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.IssuingDistributionPoint; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.RevokedCertificate; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509ExtensionException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ECAException; +import com.netscape.certsrv.ca.EErrorPublishCRL; +import com.netscape.certsrv.ca.ICMSCRLExtensions; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePair; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.dbs.EDBNotAvailException; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.ICMSCRLExtension; -import com.netscape.cmscore.request.CertRequestConstants; -import com.netscape.cmscore.ldap.*; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ICRLPublisher; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestVirtualList; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmscore.dbs.CRLIssuingPointRecord; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.dbs.CertificateRepository; import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java b/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java index 94de0d90b..bb2043860 100644 --- a/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java +++ b/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java @@ -18,14 +18,10 @@ package com.netscape.ca; -import java.util.Enumeration; -import java.util.Date; -import java.math.*; +import java.math.BigInteger; -import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.base.EBaseException; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmscore.dbs.*; +import com.netscape.cmscore.dbs.CertRecord; /** diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java index 49e88a5bb..d8130b022 100644 --- a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -18,57 +18,104 @@ package com.netscape.ca; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.security.cert.CRLException; -import java.security.cert.X509Certificate; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; -import netscape.security.x509.*; -import netscape.security.util.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.certsrv.apps.*; - +import java.security.cert.CRLException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509ExtensionException; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; import org.mozilla.jss.pkix.cert.Extension; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.ocsp.*; -import com.netscape.cmscore.policy.*; -import com.netscape.cmscore.request.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.ldap.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.security.*; -import com.netscape.cmsutil.ocsp.*; - -import com.netscape.certsrv.listeners.*; -import com.netscape.cmscore.listeners.*; +import org.mozilla.jss.pkix.primitive.Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ECAException; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IOCSPService; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.publish.ICRLPublisher; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.ARequestNotifier; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestScheduler; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmscore.dbs.CRLRepository; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.ReplicaIDRepository; +import com.netscape.cmscore.dbs.Repository; +import com.netscape.cmscore.ldap.PublisherProcessor; +import com.netscape.cmscore.listeners.ListenerPlugin; +import com.netscape.cmscore.request.RequestSubsystem; +import com.netscape.cmscore.security.KeyCertUtil; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.CertID; +import com.netscape.cmsutil.ocsp.CertStatus; +import com.netscape.cmsutil.ocsp.GoodInfo; +import com.netscape.cmsutil.ocsp.KeyHashID; +import com.netscape.cmsutil.ocsp.NameID; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.OCSPResponseStatus; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseBytes; +import com.netscape.cmsutil.ocsp.ResponseData; +import com.netscape.cmsutil.ocsp.RevokedInfo; +import com.netscape.cmsutil.ocsp.SingleResponse; +import com.netscape.cmsutil.ocsp.TBSRequest; +import com.netscape.cmsutil.ocsp.UnknownInfo; /** diff --git a/pki/base/ca/src/com/netscape/ca/SigningUnit.java b/pki/base/ca/src/com/netscape/ca/SigningUnit.java index 5a95c530b..6b0dfc649 100644 --- a/pki/base/ca/src/com/netscape/ca/SigningUnit.java +++ b/pki/base/ca/src/com/netscape/ca/SigningUnit.java @@ -18,26 +18,37 @@ package com.netscape.ca; -import java.io.*; -import java.security.SignatureException; +import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; -import java.security.InvalidKeyException; -import netscape.security.x509.*; -import netscape.security.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.Signature; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.util.*; +import java.security.SignatureException; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.CryptoToken; +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.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.util.IncorrectPasswordException; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ECAException; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ISigningUnit; import com.netscape.cmscore.security.JssSubsystem; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java index 38d8aee72..56e53080d 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java @@ -18,12 +18,8 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.lang.Object; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java index c58572400..12e38ef41 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java @@ -18,10 +18,9 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java index d193365ce..878fe1639 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.acls; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the entire ACL component. diff --git a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java index e982b1bb2..8bae56eb0 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.acls; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java index 9036a3652..892bd490a 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java b/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java index 1646e22ff..f91ef38bb 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java index 376dce8b0..8136c0b39 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java @@ -18,49 +18,85 @@ package com.netscape.certsrv.apps; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import java.io.*; -import java.util.*; -import java.math.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.tks.*; -import org.mozilla.jss.util.PasswordCallback; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + import org.mozilla.jss.CryptoManager.CertificateUsage; -import java.security.NoSuchAlgorithmException; -import com.netscape.cmsutil.password.*; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.logging.ILogSubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.registry.IPluginRegistry; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.certsrv.tks.ITKSAuthority; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java index 060ab7dcb..506a5e33f 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java @@ -18,45 +18,67 @@ package com.netscape.certsrv.apps; -import java.math.*; -import java.util.*; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.Date; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; -import java.security.NoSuchAlgorithmException; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.cmsutil.password.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import org.mozilla.jss.util.PasswordCallback; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + import org.mozilla.jss.CryptoManager.CertificateUsage; -import com.netscape.certsrv.acls.*; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; /** * This interface represents the CMS core framework. The diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java index 15224c00c..5e2231921 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.apps; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.TimeZone; -import com.netscape.certsrv.apps.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java index e363f01d2..dfaad21d0 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr. It contains all the diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java index cb6e3e4ce..f060db5f2 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.authentication; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java index 5bf52f1b8..138a07ebb 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the authentication component. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java index 4ff2c6a7f..7d2d5eb9d 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java @@ -17,25 +17,25 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.Hashtable; -import java.util.Date; -import java.util.Enumeration; -import java.math.BigInteger; -import java.io.IOException; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.usrgrp.Certificates; +import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; -import netscape.security.util.DerInputStream; -import netscape.security.x509.X509CertImpl; import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.usrgrp.Certificates; /** * Authentication token returned by Authentication Managers. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java index bb04f0698..eb36f9965 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IAttrSet; /** * An interface represents authentication credentials: diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java index c82fa72a8..b2f7d69ad 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** * Authentication Manager interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java index 0b91fa675..29657e7a4 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java @@ -17,8 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authentication component diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java index f8cb47ec6..a8462108e 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java @@ -17,15 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.Hashtable; +import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; -import java.math.BigInteger; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.Certificates; -import netscape.security.x509.X509CertImpl; import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.Certificates; /** * AuthToken interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java b/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java index 0f024ea64..d4bdf7bb1 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.authentication; -import java.security.cert.*; -import java.util.*; +import java.security.cert.X509Certificate; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java index b0806eb65..eae65d176 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java @@ -17,9 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; + import org.mozilla.jss.pkix.cmc.PKIData; -import java.math.*; /** * Shared Token interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java b/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java index 95fc6bf55..5916ecd03 100644 --- a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java @@ -19,12 +19,8 @@ package com.netscape.certsrv.authority; import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.request.IRequestListener; import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.*; -import netscape.security.x509.*; - -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java b/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java index 02001338b..94d6df40e 100644 --- a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java @@ -18,17 +18,14 @@ package com.netscape.certsrv.authority; -import netscape.security.x509.X500Name; import netscape.security.x509.CertificateChain; +import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.IRequest; + import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java index ef8c62f8f..b9d9bb96c 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.authorization; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authorization.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java index f17038eff..7cb5240a5 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.authorization; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java index dc64d322a..2cb6e80b0 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.authorization; -import java.util.Hashtable; import java.util.Date; import java.util.Enumeration; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java index db016f248..167911c40 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java @@ -18,11 +18,15 @@ package com.netscape.certsrv.authorization; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.evaluators.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.evaluators.IAccessEvaluator; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java index 2d0f81ee8..f6fc3547f 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authorization; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authorization component diff --git a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java b/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java index f8a69f65d..f54f13772 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java +++ b/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java b/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java index 50ea8fdc7..3960d58fd 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java +++ b/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java index b74131a68..a0399d349 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; -import java.lang.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java index 835ad0ed1..83c8f85fa 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java @@ -17,13 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; -import java.io.*; -import netscape.security.pkcs.*; -import java.security.*; +import java.io.Serializable; import java.math.BigInteger; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; +import java.util.Enumeration; + +import netscape.security.pkcs.PKCS10; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java b/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java index 2006c8f23..91f9f51af 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; -import java.security.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java index 902c0aad3..c770121fd 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java index dc3186497..fc4e8c291 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java index b53e7c66f..1793ff23c 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.base; -import java.util.Enumeration; import java.math.BigInteger; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java index 00f9c8460..73e95b776 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.BigInteger; -import java.security.cert.*; -import java.security.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java index ac98c6c36..e8060b24a 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.base; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.common.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java b/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java index a32dfc2ea..4a55af607 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; /** * This interface represents a plugin instance. diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java b/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java index 4c9626806..1fba48f19 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java index a9cdbbf33..3902d4433 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java @@ -17,10 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java index 7a500bde6..fb8628ba2 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.base; -import java.io.Serializable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java b/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java index d23895088..77f1708ac 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java b/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java index ad89cc72b..23b82179e 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java b/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java index 86ca5912e..f1e3e25e4 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Date; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java index 634b5d90e..17efca771 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java @@ -18,10 +18,12 @@ package com.netscape.certsrv.base; -import java.lang.*; import java.io.IOException; -import netscape.security.util.*; -import netscape.security.x509.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509Key; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java index 796c4255b..16324fb91 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java @@ -18,10 +18,12 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; +import java.lang.reflect.Method; +import java.text.MessageFormat; +import java.util.Date; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java index fc8c8ec8a..e01d40f88 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java @@ -20,6 +20,7 @@ package com.netscape.certsrv.base; import java.util.Enumeration; import java.util.Hashtable; + import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java index 7db522547..3fd0d6a63 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java @@ -20,9 +20,6 @@ package com.netscape.certsrv.base; import java.util.Enumeration; import java.util.Hashtable; -import com.netscape.certsrv.base.IAttrSet; -import com.netscape.certsrv.base.AttributeNameHelper; -import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java index e1d992e40..470ba654c 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java +++ b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java @@ -17,8 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; import java.security.cert.X509Certificate; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java b/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java index e0cfe429b..287ce795d 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java +++ b/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java b/pki/base/common/src/com/netscape/certsrv/base/Plugin.java index 0b7d7ee86..e7001ce56 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java +++ b/pki/base/common/src/com/netscape/certsrv/base/Plugin.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.base; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java index 79d429d71..5716e6e17 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java +++ b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Hashtable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java b/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java index 912d48f69..4510c46b4 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ca; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java b/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java index 1d60e3b07..7b05bb6ac 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.ca; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java b/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java index d4a4c1278..cac6fc757 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java @@ -18,23 +18,14 @@ package com.netscape.certsrv.ca; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java index 3470b206d..edaea59c4 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.ca; import netscape.security.x509.Extension; -import netscape.security.x509.CRLExtensions; + import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.common.NameValuePairs; diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java index 6e6a47c9f..f6df2226f 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.ca; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java index 97f9792fb..82e0961c1 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java @@ -18,22 +18,20 @@ package com.netscape.certsrv.ca; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.IRequest; +import java.math.BigInteger; +import java.util.Date; +import java.util.Set; +import java.util.Vector; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.dbs.IElementProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index bc545a9ba..6f7a49615 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -18,24 +18,31 @@ package com.netscape.certsrv.ca; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import org.mozilla.jss.crypto.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.replicadb.*; +import java.util.Enumeration; + +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.ISigningUnit; /** diff --git a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java index 81d5cbefb..653c684f5 100644 --- a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java @@ -18,8 +18,11 @@ package com.netscape.certsrv.cert; -import com.netscape.certsrv.base.*; -import java.security.cert.*; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java b/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java index 139585f2c..ff83cadd5 100644 --- a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java +++ b/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java @@ -17,8 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.client.connection; -import java.io.*; -import java.util.*; /** * An interface represents authentiator. diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java b/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java index b4fecd155..1542d5faf 100644 --- a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.client.connection; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.net.UnknownHostException; /** * Interface for all connection factory. Primarily act as diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java index 92466d30d..44d55e32e 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java +++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.common; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java index a2530521a..678ccfee2 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java +++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java @@ -18,12 +18,10 @@ package com.netscape.certsrv.common; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java b/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java index e89c14f57..6dcca9d2a 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java index a52d90e94..c53c6f09d 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.connector; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.EBaseException; /** * Maintains a pool of connections to to a Remote Authority. diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java index 610ab30ed..6ee57059c 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java @@ -18,13 +18,7 @@ package com.netscape.certsrv.connector; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import java.io.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java index 83241170a..5cb53e255 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java @@ -19,9 +19,6 @@ package com.netscape.certsrv.connector; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import java.util.*; -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java b/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java index 593261d9e..57ce9700f 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.request.IRequest; import java.io.Serializable; +import com.netscape.certsrv.request.IRequest; + /** * Messages that are serialized and go over the wire. diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java b/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java index 90dcbaa26..a97936aaa 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java b/pki/base/common/src/com/netscape/certsrv/connector/IResender.java index b9305816e..3574c3a5b 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IResender.java @@ -18,17 +18,7 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.http.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.io.*; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java index 54e65ce30..4bfb14fb0 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java index b0fa4bff0..335da55a2 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java index d7b82f25d..7d851b747 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java @@ -18,9 +18,11 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java index 1616e7418..4be6c3409 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java index faf18a342..4270c9ced 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java index 09364dc69..34df47c97 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPSearchResults; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java index 71356eb4f..ab90866b1 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java index e82a3a14c..350a29c48 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java @@ -18,9 +18,12 @@ package com.netscape.certsrv.dbs; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java index 93b1f87fb..8e627520c 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java index d43145d8b..75702199e 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.dbs; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java index d31ccd468..1a0783655 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java b/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java index 3a28b1337..9be75f0bb 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.dbs; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java index 0e3108182..4a5592c0b 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.dbs; -import java.util.*; +import java.util.Enumeration; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java index febb684cc..681e586b6 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java @@ -18,12 +18,14 @@ package com.netscape.certsrv.dbs.certdb; -import java.util.Date; import java.math.BigInteger; -import com.netscape.certsrv.dbs.IDBObj; -import com.netscape.certsrv.base.MetaInfo; +import java.util.Date; + import netscape.security.x509.X509CertImpl; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBObj; + /** * An interface contains constants for certificate record. diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java index cc8c38187..a77458880 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.dbs.certdb; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IElementProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java index c036909de..b913a18c6 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java @@ -18,17 +18,19 @@ package com.netscape.certsrv.dbs.certdb; -import java.math.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; +import java.math.BigInteger; import java.security.cert.Certificate; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; + +import netscape.ldap.LDAPEntry; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java index 15e396943..2086cacb1 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java @@ -18,14 +18,9 @@ package com.netscape.certsrv.dbs.certdb; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; +import java.util.Date; + +import netscape.security.x509.CRLExtensions; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java index f0d98fd59..991a952aa 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java @@ -18,16 +18,11 @@ package com.netscape.certsrv.dbs.crldb; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; + +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java index ffac9b37b..ba245bcfb 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java @@ -18,17 +18,13 @@ package com.netscape.certsrv.dbs.crldb; -import java.math.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.ModificationSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java index f795ff9a6..0edcc1877 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.math.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; +import java.util.Date; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java index aced5cc1f..2bc9f57b9 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java @@ -18,12 +18,9 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java index 324a7df17..093bea255 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java @@ -18,17 +18,15 @@ package com.netscape.certsrv.dbs.keydb; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java index a6b7fa031..d6e2fafb4 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.io.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import java.io.Serializable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java index e92d13a16..660b6e9e8 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.replicadb; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java index 7ee01b3f1..5ff902413 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java @@ -17,13 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.repository; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.math.BigInteger; + +import com.netscape.certsrv.base.EBaseException; /** * An interface represents a generic repository. It maintains unique diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java index 5e6db669f..326ea4664 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java @@ -17,14 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.repository; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; +import java.math.BigInteger; + +import com.netscape.certsrv.dbs.IDBObj; /** * An interface represents a generic repository record. diff --git a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java b/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java index 5764f4005..8c2914479 100644 --- a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.evaluators; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import com.netscape.certsrv.authentication.IAuthToken; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java b/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java index 297b44262..e76523760 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.extensions; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java b/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java index b50638ddc..4d7ee06c2 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.extensions; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java b/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java index 55f348b11..fb4bb1f77 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java @@ -18,16 +18,13 @@ package com.netscape.certsrv.extensions; -import java.util.Locale; -import java.util.Vector; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; - -import netscape.security.x509.Extension; -import netscape.security.util.ObjectIdentifier; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java b/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java index 37528c603..cbcddb39a 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.jobs; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java index 410629982..1c3842bf5 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java @@ -18,7 +18,9 @@ package com.netscape.certsrv.jobs; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java index 9e6d2b4de..1e238f60a 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java @@ -18,11 +18,6 @@ package com.netscape.certsrv.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java index d30ccbf35..fefa8cc95 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.jobs; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java b/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java index d610ee909..33b7e7f2a 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.jobs; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java b/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java index 00c057902..9bc828262 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.jobs; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java b/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java index 7992d5fb0..7f67f7a68 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.kra; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java index b2d02f2a3..b268073e0 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java @@ -18,21 +18,25 @@ package com.netscape.certsrv.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.math.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.crypto.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.x509.X500Name; + +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java index 5fe5a4025..5785aeb06 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java @@ -20,11 +20,12 @@ package com.netscape.certsrv.kra; import java.math.BigInteger; import java.util.Hashtable; -import java.security.cert.X509Certificate; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; + import netscape.security.x509.X509CertImpl; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.security.Credential; + /** * An interface representing a recovery service. diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java b/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java index 571380eaf..1b484b666 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java @@ -18,14 +18,8 @@ package com.netscape.certsrv.kra; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; +import java.util.Date; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java b/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java index 74f66992b..40e0ee171 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.kra; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java index 5fe06f921..5a9fb1195 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java @@ -18,17 +18,29 @@ package com.netscape.certsrv.kra; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -//import com.netscape.cmscore.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.Signature; +import java.security.SignatureException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java b/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java index 3f829aa31..a6907c008 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ldap; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java index 13cadf2ab..46082c73a 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java @@ -18,15 +18,8 @@ package com.netscape.certsrv.ldap; -import java.util.Hashtable; -import netscape.ldap.LDAPConnection; -import netscape.ldap.LDAPException; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java index 71b810709..ef3e17424 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java index 8ac2cd505..f706c2ecf 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java index f56bf4d3e..4cffbe458 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java index 3cf762663..8d912fc55 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.ldap; -import com.netscape.certsrv.base.*; -import java.security.cert.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java b/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java index 79a8aecb4..261497380 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ldap; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java b/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java index 40dad6eb9..1dae27287 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.listeners; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java b/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java index 83f6bd68d..b0cb173cb 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.listeners; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** * This interface represents a plug-in listener. Implement this class to diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java b/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java index 7fae366d8..199941be9 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.listeners; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java index 8fa1249f6..415b35d0f 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java index 750e35807..146824ac4 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.logging; -import com.netscape.certsrv.logging.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java index c45b5d129..c18b062c2 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java @@ -18,13 +18,16 @@ package com.netscape.certsrv.logging; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java b/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java index d15033657..12f5ede2c 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java @@ -18,9 +18,8 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; +import java.util.Locale; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.MessageFormatter; diff --git a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java index fc9540e55..44a4283bd 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.logging; -import java.io.Serializable; -import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java index b0fd0ce18..f94f20a95 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; +import java.util.Properties; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java index e970d4182..12c09b0bc 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java @@ -18,16 +18,22 @@ package com.netscape.certsrv.logging; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; +import java.io.IOException; +import java.util.EventListener; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; + /** - * An interface reprensents a log event listener. + * An interface represents a log event listener. * A ILogEventListener is registered to a specific * ILogQueue to be notified of created ILogEvents. * the log queue will notify all its registered listeners @@ -67,7 +73,7 @@ public interface ILogEventListener extends EventListener { * Initialize this log listener * @param owner The subsystem. * @param config Configuration store for this log listener. - * @exception Any initialization error. + * @exception initialization error. */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException; diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java index 65d4136c7..878b9ba16 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.logging; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java index 82bde43f4..438c42508 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java index b4a7070a7..01fbc6b93 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.logging; -import java.util.*; -import com.netscape.certsrv.common.*; +import java.util.Properties; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java b/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java index 30ee30836..b8195eece 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.logging; -import java.util.*; -import java.lang.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java b/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java index 942b570db..6a7472ff1 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.logging; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.ListResourceBundle; +import java.util.ResourceBundle; + +import com.netscape.certsrv.base.BaseResources; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java index ea97fe3d6..7b87d67bd 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java index 648d3b18c..f59a10df6 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java b/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java index a5347ff43..cc2687bc3 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.notification; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java index 234c7a46d..9d7ee46f0 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import java.util.*; -import java.lang.*; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java index 6b654da40..49d0851ed 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java index 2382412c4..d1a6889cc 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java index 74c97402b..bcda466d1 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.notification; -import java.lang.*; -import java.io.*; -import java.util.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java index 4301f5327..c5375caed 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java @@ -18,17 +18,8 @@ package com.netscape.certsrv.notification; -import java.util.*; -import java.io.*; -import java.lang.String; -import netscape.net.smtp.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java b/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java index e9cdbdfa1..40d9e80e3 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.notification; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java index a9c24fdc1..82c5821b5 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java @@ -18,14 +18,14 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.math.*; -import java.security.cert.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.cmsutil.ocsp.*; +import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.util.Date; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java index 84b223a88..b99f6241c 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java @@ -18,29 +18,17 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.security.*; -import java.util.Vector; -import java.io.*; -import java.io.InputStream; -import java.io.IOException; - -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import netscape.security.x509.*; +import netscape.security.x509.X500Name; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseData; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java index 9bd9ba027..8ca8b2f02 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java @@ -18,28 +18,9 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.security.*; -import java.util.Vector; -import java.io.*; -import java.io.InputStream; -import java.io.IOException; - -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import netscape.security.x509.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; - -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java index 8576864e8..ee60105ce 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java @@ -18,12 +18,11 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.math.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; /** diff --git a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java b/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java index 5c814fd2e..02cc55885 100644 --- a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java +++ b/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.password; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.PasswordResources; /** * A class represents a password checker exception. diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java index ef6c5af66..b745282b6 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.pattern; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IAttrSet; /** * This class represents a collection of attribute diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java index fe6426306..d177f87b1 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.pattern; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java index a65e2e5ff..95f547468 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.policy; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java b/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java index e5deb476a..6bed58c5d 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.policy; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java index 0dac71068..ff30dc11b 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralName; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index 5b33fc888..1f93719d3 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; + +import netscape.security.x509.GeneralName; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java index dbaa97394..e64187b86 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralNames; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java index 51584fb96..644258567 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralNames; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java index 341c006f0..834d462e0 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java @@ -18,9 +18,12 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java index d7eeb1cfb..d80a0d0c2 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java @@ -18,11 +18,13 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java index 1132b9831..ea12f4b1b 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Enumeration; + import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java index ca7b1f01e..75df22de1 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java index f7c80f1f8..c8bcec2ce 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.policy; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java index 8593da163..fae38c696 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java @@ -17,15 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class CertInfoProfile { diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java b/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java index 6c48fcb91..4c082608d 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; /** * This represents a profile specific exception. The diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java b/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java index 197db3bcf..f786df730 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** * This represents a generic profile exception. diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java b/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java index 9a626ef22..e425c3f42 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; /** * This represents a profile specific exception. This diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java b/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java index c8af3275c..bfd9bdc95 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java @@ -17,14 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import netscape.security.x509.X509CertInfo; -import netscape.security.x509.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.request.IRequest; public interface ICertInfoPolicyDefault extends IPolicyDefault { diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java index f56f47160..fb92d53ee 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.request.IRequest; /** * This interface represents an enrollment profile. diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java index cb368f9da..1af3ef190 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java index 0aa8bb234..018054926 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java @@ -18,10 +18,14 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java index 262d3eafb..c006db679 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java @@ -17,12 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; /** * This interface represents a profile. A profile contains diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java index 149cf33c2..195078f7b 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java @@ -17,11 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java index aa8492210..906c4816e 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; /** * This interface represents a profile context which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java index 20b9af977..8ce3262ec 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java @@ -17,12 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import com.netscape.certsrv.base.EBaseException; /** * This interface represents the extension version of diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java index 1b6bea720..6d861579c 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java @@ -17,10 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This interface represents a input policy which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java index ad9484648..b4654f408 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java @@ -17,10 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This interface represents a output policy which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java index cf54a4ba4..795a19c0e 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java index a550b6445..a36ee1969 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** * This interface represents an updater that will be diff --git a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java b/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java index a4b0ecb2d..92aeff185 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java +++ b/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.property; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java b/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java index 3be0aa1ea..7bd34dc51 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java +++ b/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.property; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** * This is the base exception for property handling. diff --git a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java index c37d484b8..f435db50c 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java +++ b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.property; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java b/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java index d3db4b494..271c1808a 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java +++ b/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.property; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java index c6d66b43b..360477fe9 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java +++ b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.property; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java b/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java index be33dc599..8b7282081 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java index 16ad10b4d..52799ba26 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java index 6e0a98121..68e882f18 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java index f7198edef..2a3affcf7 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java index 325207a32..c3b63ea1e 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java index 8294c6772..a98b3a706 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java index ed1592aab..6bb2f7b05 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java b/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java index d7ac48046..cae75d2f8 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java @@ -18,8 +18,11 @@ package com.netscape.certsrv.publish; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java index 51252c55a..cd4012a45 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java @@ -18,11 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.security.cert.X509Certificate; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java index 5fa549025..a15ea0abc 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java @@ -18,11 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.security.cert.*; +import netscape.ldap.LDAPConnection; import netscape.security.x509.X509CRLImpl; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java index bc9cda999..26360fe89 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java index 2201c1bad..0831717e9 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java @@ -18,12 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java index 700e0c6de..b73b5ae28 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java index 42e33af5d..e84b62fc1 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java @@ -18,9 +18,11 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IPluginImpl; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java index 6f4b52586..001d472bc 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import java.security.cert.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java index 8b51a8f79..df6a1e3b2 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java index cbefe9ed6..bad8cbea8 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java b/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java index 245771e75..6ff997a1d 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java @@ -18,13 +18,15 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java index 445d0aa15..af19d2dbc 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java @@ -18,24 +18,19 @@ package com.netscape.certsrv.publish; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; +import java.math.BigInteger; +import java.security.cert.X509CRL; import java.security.cert.X509Certificate; -import netscape.ldap.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnModule; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java b/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java index f9a47a1c5..ce72ed8ab 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java b/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java index 4444fc947..559cd8c0c 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java index 56a8f92dd..282db3cd8 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.publish; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java b/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java index 9a80083f6..bd8ea7418 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java index 7408e9cbf..d68643268 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java b/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java index 5a126cf9b..06e08c31e 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java index 1de355906..8e5157262 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java b/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java index 09b37e39c..92ccd5587 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java @@ -18,20 +18,10 @@ package com.netscape.certsrv.ra; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 9eb438c4f..62fe529f0 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -18,19 +18,16 @@ package com.netscape.certsrv.ra; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java b/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java index 6d9f89d5d..25f0922dd 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.registry; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java index b7bdfbf2c..774b3f9ba 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.registry; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java index d567e8f46..0497562be 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.registry; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index a2704eed1..3d3274869 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -18,15 +18,16 @@ package com.netscape.certsrv.request; -import java.util.*; -import java.math.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnModule; import com.netscape.certsrv.publish.IPublisherProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java b/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java index 5e41b54f2..7eee12940 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java +++ b/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java @@ -19,7 +19,6 @@ package com.netscape.certsrv.request; import java.io.Serializable; - import java.util.Date; diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java index 9bd7fa857..42ae2d2f4 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java +++ b/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java @@ -19,7 +19,6 @@ package com.netscape.certsrv.request; import java.io.Serializable; - import java.util.Date; import java.util.Enumeration; import java.util.Vector; diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java index f54352ce1..c509e2966 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -20,16 +20,6 @@ package com.netscape.certsrv.request; //import java.io.Serializable; -import com.netscape.certsrv.authentication.AuthToken; -import com.netscape.certsrv.authentication.IAuthToken; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IAttrSet; -import netscape.security.x509.RevokedCertImpl; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateSubjectName; - import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; @@ -37,6 +27,15 @@ import java.util.Hashtable; import java.util.Locale; import java.util.Vector; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IAttrSet; + /** * An interface that defines abilities of request objects, diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java index 29adf3a0f..a98cd747e 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.request; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java index 7cf31557f..01527b672 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.request; -import java.util.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java index 9b2edf9b4..468336b4f 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java @@ -17,11 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; -import java.math.*; -import java.util.Enumeration; -import com.netscape.certsrv.dbs.repository.IRepository; +import java.math.BigInteger; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java index a04c6b342..696dc4e16 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java @@ -19,9 +19,9 @@ package com.netscape.certsrv.request; import java.util.Enumeration; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBObj; -import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java index ecb2e0fa3..198092fc1 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java @@ -20,11 +20,6 @@ package com.netscape.certsrv.request; //import java.io.Serializable; -import java.util.Date; -import java.util.Enumeration; - -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java b/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java index 17367befd..1fc0657f6 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java @@ -19,9 +19,8 @@ package com.netscape.certsrv.request.ldap; import java.util.Date; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** * This interface defines how to update request record. diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java index 2e4c0a9ee..ab910b376 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java @@ -18,17 +18,24 @@ package com.netscape.certsrv.security; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import org.mozilla.jss.CryptoManager.*; -import java.io.*; -import java.security.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; +import java.io.IOException; +import java.security.KeyPair; +import java.security.cert.CertificateException; +import java.util.Locale; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.TokenException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java index af7030f06..984425a52 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java @@ -18,16 +18,12 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import java.security.PublicKey; + import org.mozilla.jss.crypto.PrivateKey; +import com.netscape.certsrv.base.EBaseException; + /** * An interface represents a encryption unit. diff --git a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java index ac46a271d..664d5c1f8 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java @@ -18,13 +18,14 @@ package com.netscape.certsrv.security; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.Signature; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; +import java.security.PublicKey; + +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.base.EBaseException; /** * A class represents the signing unit which is diff --git a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java index 0b484bdc7..02ebc616b 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java @@ -18,16 +18,11 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.PrivateKey; +import java.util.Enumeration; + +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/IToken.java b/pki/base/common/src/com/netscape/certsrv/security/IToken.java index 4211806fc..0b79cfcf3 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IToken.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IToken.java @@ -18,14 +18,7 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java index 1ad0e378c..2edfa12a9 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java @@ -18,16 +18,13 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.crypto.*; +import java.security.PublicKey; + +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java index 87dd298f7..513edfd42 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java +++ b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java @@ -18,13 +18,18 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.security.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import org.mozilla.jss.crypto.*; -import netscape.security.x509.*; +import java.math.BigInteger; +import java.security.KeyPair; +import java.util.Properties; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateExtensions; + +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; /** * This class represents a container for storaging diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java index 697646493..14a9b66bd 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java index b38b574cf..7761e54cf 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java index 8c2353287..111cb84bb 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java index 2124e5d4a..b50072e97 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java @@ -25,7 +25,7 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java index 783f8955d..f881a285e 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java @@ -25,10 +25,10 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java index a44626b64..3391bdd1d 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java @@ -25,10 +25,8 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogEventListener; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java b/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java index 1c1551c5a..c396c14b1 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.selftests; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java b/pki/base/common/src/com/netscape/certsrv/template/ArgList.java index f3b955c27..72288a73c 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgList.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.template; -import java.util.*; +import java.util.Vector; /** * This class represents a list of arguments diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java index ca8d866ea..249bb4420 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.template; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; /** * This class represents a set of arguments. diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java b/pki/base/common/src/com/netscape/certsrv/template/ArgString.java index b932a1855..385338ca9 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgString.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.template; -import java.util.*; /** * This class represents a string-based argument. diff --git a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java b/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java index dfaa04cc4..0fec3043f 100644 --- a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java @@ -18,19 +18,8 @@ package com.netscape.certsrv.tks; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.request.IRequestQueue; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java index 6d8ec2b8f..c57117251 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.usrgrp; -import java.security.*; -import java.security.cert.*; +import java.security.cert.X509Certificate; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java index db2aca24c..6f094ab44 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java index 8644e4f6f..a9d789e65 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.usrgrp; -import netscape.ldap.*; -import java.util.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java index 3e36d9cc2..778b9aab2 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java index 2f7e10a71..2f8711ceb 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java index b34ba8f4a..94bdf8857 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java index 59266fedc..e575c58bd 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java @@ -18,14 +18,12 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import java.lang.*; -import netscape.ldap.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java index febcb9e84..398ccb71e 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java @@ -18,10 +18,9 @@ package com.netscape.certsrv.usrgrp; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import java.security.cert.*; -import netscape.security.x509.*; +import java.security.cert.X509Certificate; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java index 01a392494..f24e9fb4f 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.usrgrp; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java index 98eb9e9b5..17b00c883 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.ldap.*; +import netscape.ldap.LDAPException; /** * This interface defines the basic capabilities of diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java index b64ac4622..4f68bf635 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java +++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.util; -import netscape.ldap.*; -import java.io.*; -import java.net.*; -import javax.servlet.http.*; -import javax.servlet.*; -import java.util.*; -import java.math.*; -import java.util.regex.*; +import java.io.IOException; +import java.net.URL; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; + +import netscape.ldap.LDAPDN; public class HttpInput { diff --git a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java b/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java index 05a92f8d4..c98812369 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.util; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Date; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java index 2849f5ecc..7c510b889 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.util; -import java.util.*; -import java.math.*; +import java.util.Enumeration; +import java.util.Vector; /** * A statistics transaction. diff --git a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java index e4f700054..e0a37eb4b 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -18,15 +18,23 @@ package com.netscape.cms.authentication; -import java.util.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import java.io.*; -import java.security.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.ldap.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVA; +import netscape.security.x509.LdapV3DNStrConverter; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.ECompSyntaxErr; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index bef5e8c2a..0b8bad8f3 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -18,29 +18,35 @@ package com.netscape.cms.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; - -import javax.servlet.http.HttpServletRequest; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISSLClientCertProvider; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java index eb09e5b47..e102f18f8 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java +++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java @@ -26,59 +26,72 @@ package com.netscape.cms.authentication; /////////////////////// /* cert server imports */ -import com.netscape.cms.authentication.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.ILogger; - -import com.netscape.cmsutil.util.*; -import netscape.security.x509.*; - -/* java sdk imports */ -import java.io.*; -import java.util.*; -import java.util.Properties; -import java.util.Vector; -import com.netscape.certsrv.apps.*; -import java.util.Hashtable; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.PublicKey; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.asn1.InvalidBERException; import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.pkix.cert.Certificate; import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.certsrv.usrgrp.*; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +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.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; -import netscape.security.pkcs.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import java.math.BigInteger; -import org.mozilla.jss.CryptoManager; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmsutil.util.Utils; //import com.netscape.cmscore.util.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java index 80d51c4f5..1f2eb69ad 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -18,13 +18,15 @@ package com.netscape.cms.authentication; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.publish.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.ldap.LDAPEntry; + +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java index 1b1394175..3260af6e7 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java @@ -19,37 +19,43 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.CertificateExtensions; import netscape.security.x509.CertificateSubjectName; import netscape.security.x509.CertificateValidity; -import netscape.security.x509.CertificateExtensions; -import java.security.cert.CertificateException; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; -// java sdk imports. -import java.util.Locale; -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.util.StringTokenizer; -import java.util.Date; -import java.io.IOException; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EFormSubjectDN; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java index a03b298e6..ab59c499d 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java +++ b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java @@ -25,28 +25,29 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Locale; import java.util.StringTokenizer; -import java.util.Date; -import java.text.SimpleDateFormat; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.EInvalidCredentials; import com.netscape.certsrv.authentication.EMissingCredential; import com.netscape.certsrv.authentication.IAuthCredentials; -import com.netscape.certsrv.authentication.IAuthManager; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java index fe05dec9d..99ed45bb4 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java +++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java @@ -21,7 +21,6 @@ package com.netscape.cms.authentication; // java sdk imports. import java.util.Hashtable; import java.util.Vector; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index 12ea8f041..24a10e0a2 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -19,27 +19,26 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.IConfigStore; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; - -// cert server x509 imports -import netscape.security.x509.*; -import java.security.cert.*; -import java.security.*; - -// java sdk imports. -import java.util.*; -import java.io.IOException; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index 9f49c2fd1..56c8739a8 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -19,29 +19,35 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPObjectClassSchema; +import netscape.ldap.LDAPSchema; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthInternalError; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; +import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; - -// java sdk imports. -import java.util.Locale; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.StringTokenizer; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java index ee011b0e2..1f21bc1d7 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -18,14 +18,16 @@ package com.netscape.cms.authentication; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.publish.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.ldap.LDAPEntry; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java index 7a3993cde..3092d00a1 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java @@ -18,30 +18,34 @@ package com.netscape.cms.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; import java.security.Principal; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; - -import javax.servlet.http.HttpServletRequest; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISSLClientCertProvider; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.Certificates; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java index 98bf72f47..8b0a7b9b3 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java +++ b/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java @@ -18,7 +18,9 @@ package com.netscape.cms.authentication; import java.math.BigInteger; + import org.mozilla.jss.pkix.cmc.PKIData; + import com.netscape.certsrv.authentication.ISharedToken; public class SharedSecret implements ISharedToken { diff --git a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java index 937531933..bb3937670 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java @@ -17,30 +17,33 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.authentication; -import java.io.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import javax.servlet.http.HttpServletRequest; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import java.io.ByteArrayInputStream; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.xml.XMLObject; /** * Token authentication. diff --git a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java index 07f072914..565bca1a4 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java @@ -19,28 +19,19 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java index 41f178163..e97fee8b6 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java @@ -19,33 +19,33 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Locale; -import java.util.Enumeration; -import java.io.IOException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 7b6e41da0..116054181 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -19,38 +19,39 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; -import java.util.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; +import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; -import java.security.NoSuchAlgorithmException; -import java.security.MessageDigest; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.io.IOException; -import java.io.*; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java index 4416a52fd..c3b0a8535 100644 --- a/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java +++ b/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java @@ -18,17 +18,24 @@ package com.netscape.cms.authorization; -import java.util.*; -import java.lang.Class; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.ACLEntry; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmsutil.util.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java index c929f80ec..29cb671e6 100644 --- a/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java +++ b/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java @@ -19,24 +19,17 @@ package com.netscape.cms.authorization; // cert server imports. -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.authorization.EAuthzInternalError; +import com.netscape.certsrv.authorization.IAuthzManager; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.cmsutil.util.*; -import com.netscape.certsrv.authentication.*; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.util.StringTokenizer; -import java.io.IOException; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java index e8cb1f121..ee22bb592 100644 --- a/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -18,29 +18,31 @@ package com.netscape.cms.authorization; -import netscape.ldap.*; +import java.util.Enumeration; -// cert server imports. -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPAttribute; +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; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.authorization.EAuthzInternalError; +import com.netscape.certsrv.authorization.IAuthzManager; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.cmsutil.util.*; -import com.netscape.certsrv.authentication.*; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.util.StringTokenizer; -import java.io.IOException; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java index 16039767d..6fe802e72 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java @@ -18,26 +18,25 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.security.cert.CertificateException; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.Extension; -import netscape.security.x509.X500Name; -import netscape.security.x509.URIName; import netscape.security.x509.GeneralName; -import netscape.security.util.ObjectIdentifier; -import com.netscape.certsrv.ca.*; -import netscape.security.extensions.AuthInfoAccessExtension; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java index 5abd0de5d..4cdb0bdc0 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java @@ -18,19 +18,30 @@ package com.netscape.cms.crl; -import java.util.*; -import java.io.*; +import java.io.IOException; import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; -import netscape.security.x509.*; +import java.util.Locale; + +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.authority.*; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java index 578faaa52..e4bb4cb68 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java @@ -18,20 +18,21 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; +import java.io.IOException; import java.math.BigInteger; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; -import netscape.security.x509.Extension; +import java.util.Locale; + import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java index c8c70138b..245428a6d 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java @@ -18,21 +18,20 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; -import netscape.security.x509.Extension; +import java.io.IOException; +import java.util.Locale; + import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.PKIXExtensions; import netscape.security.x509.RevocationReason; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.ca.*; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java index 2bde395a6..601e15d2f 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java @@ -18,25 +18,25 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateIssuerExtension; import netscape.security.x509.Extension; -import netscape.security.x509.X500Name; -import netscape.security.x509.URIName; -import com.netscape.certsrv.ca.*; import netscape.security.x509.GeneralNames; -import netscape.security.x509.CertificateIssuerExtension; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** * This represents a certificate issuer extension. diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java index f263e0257..35d21e5c7 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java @@ -18,20 +18,21 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; +import java.io.IOException; import java.math.BigInteger; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; -import netscape.security.x509.Extension; +import java.util.Locale; + import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java index 3f500b464..86bdd05e2 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java @@ -18,29 +18,27 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import java.security.cert.CertificateException; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CRLDistributionPoint; import netscape.security.x509.Extension; -import netscape.security.x509.X500Name; -import netscape.security.x509.URIName; -import com.netscape.certsrv.ca.*; +import netscape.security.x509.FreshestCRLExtension; import netscape.security.x509.GeneralNames; import netscape.security.x509.GeneralNamesException; -import netscape.security.x509.CRLDistributionPoint; -import netscape.security.x509.FreshestCRLExtension; -import netscape.security.util.BitArray; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java index df0e9e350..e0e39b8a6 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java @@ -18,22 +18,23 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.Extension; import netscape.security.x509.HoldInstructionExtension; -import netscape.security.util.ObjectIdentifier; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java index d1dfce9df..c0c622447 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java @@ -18,20 +18,20 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; +import java.io.IOException; import java.util.Date; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.util.Locale; + import netscape.security.x509.Extension; import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java index cf66e9d76..9ca9d5d2a 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java @@ -18,33 +18,34 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; -import netscape.security.x509.Extension; -import netscape.security.x509.X500Name; -import netscape.security.x509.URIName; -import netscape.security.x509.OIDName; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.DNSName; -import netscape.security.x509.RFC822Name; import netscape.security.x509.EDIPartyName; -import netscape.security.x509.IPAddressName; +import netscape.security.x509.Extension; import netscape.security.x509.GeneralName; import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; import netscape.security.x509.IssuerAlternativeNameExtension; -import netscape.security.util.DerValue; -import netscape.security.util.ObjectIdentifier; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.OIDName; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java index f273c3201..ccc5b64d0 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java @@ -18,30 +18,30 @@ package com.netscape.cms.crl; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import java.security.cert.CertificateException; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CRLExtensions; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.util.BitArray; import netscape.security.x509.Extension; -import netscape.security.x509.X500Name; -import netscape.security.x509.URIName; -import com.netscape.certsrv.ca.*; -import netscape.security.x509.RDN; import netscape.security.x509.GeneralNames; import netscape.security.x509.GeneralNamesException; import netscape.security.x509.IssuingDistributionPoint; import netscape.security.x509.IssuingDistributionPointExtension; -import netscape.security.util.BitArray; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RDN; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICMSCRLExtension; +import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java index f51fd2cbb..d026cdbaf 100644 --- a/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java @@ -18,16 +18,15 @@ package com.netscape.cms.evaluators; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java index 3c041219d..a5c99eeb9 100644 --- a/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java @@ -18,16 +18,12 @@ package com.netscape.cms.evaluators; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java index dcdfe2c48..4b6b56772 100644 --- a/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java @@ -18,15 +18,13 @@ package com.netscape.cms.evaluators; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java index e5faeeff5..88358aa58 100644 --- a/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java @@ -18,15 +18,13 @@ package com.netscape.cms.evaluators; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java b/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java index 2e26264f8..8488ec2d0 100644 --- a/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java +++ b/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java @@ -18,18 +18,23 @@ package com.netscape.cms.jobs; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Hashtable; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java index 5da23d045..a23cc1f32 100644 --- a/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java +++ b/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java @@ -18,22 +18,33 @@ package com.netscape.cms.jobs; -import java.util.*; -import java.io.*; +import java.security.cert.X509Certificate; import java.text.DateFormat; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java index 03df4843d..59116bd91 100644 --- a/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java +++ b/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java @@ -18,23 +18,35 @@ package com.netscape.cms.jobs; -import java.util.*; -import java.io.*; +import java.io.IOException; import java.text.DateFormat; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java index 88a8bf35d..07a35a9d7 100644 --- a/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java +++ b/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java @@ -18,22 +18,24 @@ package com.netscape.cms.jobs; -import java.util.*; -import java.io.*; import java.text.DateFormat; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; +import java.util.Date; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java index 1813bd639..6a0a6d034 100644 --- a/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java +++ b/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java @@ -18,22 +18,33 @@ package com.netscape.cms.jobs; -import java.util.*; -import java.io.*; +import java.security.cert.X509Certificate; import java.text.DateFormat; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java index c9b4c4a7f..d238c2792 100644 --- a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java +++ b/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java @@ -19,22 +19,31 @@ package com.netscape.cms.listeners; import java.io.File; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import java.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; import java.text.DateFormat; +import java.util.Date; +import java.util.Hashtable; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.listeners.EListenersException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java index 5a1500587..d1cc3d808 100644 --- a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java +++ b/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java @@ -19,23 +19,33 @@ package com.netscape.cms.listeners; import java.io.File; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import java.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; +import java.security.cert.X509Certificate; import java.text.DateFormat; +import java.util.Date; +import java.util.Hashtable; + +import netscape.security.x509.RevokedCertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.listeners.EListenersException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java index c678a4b4b..0c09395c3 100644 --- a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java +++ b/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java @@ -18,25 +18,26 @@ package com.netscape.cms.listeners; -import java.io.File; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.notification.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import java.util.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.common.*; -import java.text.DateFormat; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import java.util.Hashtable; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java index 3027415be..f5810a460 100644 --- a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java +++ b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java @@ -18,21 +18,27 @@ package com.netscape.cms.listeners; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Hashtable; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.listeners.EListenersException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; import com.netscape.cms.profile.input.SubjectNameInput; import com.netscape.cms.profile.input.SubmitterInfoInput; -import java.io.IOException; -import java.util.*; - /** * a listener for every request gets into the request queue. diff --git a/pki/base/common/src/com/netscape/cms/logging/LogEntry.java b/pki/base/common/src/com/netscape/cms/logging/LogEntry.java index cc64ea6f6..4ab9f2817 100644 --- a/pki/base/common/src/com/netscape/cms/logging/LogEntry.java +++ b/pki/base/common/src/com/netscape/cms/logging/LogEntry.java @@ -18,11 +18,11 @@ package com.netscape.cms.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/cms/logging/LogFile.java b/pki/base/common/src/com/netscape/cms/logging/LogFile.java index c00955813..b3adeb991 100644 --- a/pki/base/common/src/com/netscape/cms/logging/LogFile.java +++ b/pki/base/common/src/com/netscape/cms/logging/LogFile.java @@ -18,29 +18,66 @@ package com.netscape.cms.logging; -import java.lang.*; -import java.io.*; -import java.io.File.*; -import java.util.*; -import java.text.*; -import java.security.*; -import java.security.Security; -import java.security.spec.*; -import java.security.interfaces.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.util.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.CharArrayReader; +import java.io.CharArrayWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.LineNumberReader; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.RandomAccessFile; +import java.io.UnsupportedEncodingException; +import java.security.GeneralSecurityException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.Provider; +import java.security.Signature; +import java.security.SignatureException; +import java.security.interfaces.DSAPrivateKey; +import java.security.interfaces.RSAPrivateKey; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletException; + import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.ObjectNotFoundException; import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.util.Base64OutputStream; -import java.io.CharConversionException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.ConsoleError; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; +import com.netscape.certsrv.logging.SystemEvent; +import com.netscape.cmsutil.util.Utils; /** * A log event listener which write logs to log files diff --git a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java index 32702d00d..27657ef74 100644 --- a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java +++ b/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java @@ -18,16 +18,28 @@ package com.netscape.cms.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.util.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.logging.ConsoleError; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SystemEvent; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java b/pki/base/common/src/com/netscape/cms/notification/MailNotification.java index e85911137..1e409af87 100644 --- a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java +++ b/pki/base/common/src/com/netscape/cms/notification/MailNotification.java @@ -18,19 +18,17 @@ package com.netscape.cms.notification; -import java.util.*; -import java.io.*; -import java.lang.String; -import netscape.net.smtp.*; -import netscape.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Vector; + +import netscape.net.smtp.SmtpClient; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IMailNotification; /** diff --git a/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java b/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java index 7c9c2bb1f..cfa6ff577 100644 --- a/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java +++ b/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java @@ -18,32 +18,62 @@ package com.netscape.cms.ocsp; -import java.math.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; - -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.cmsutil.ocsp.*; -import com.netscape.certsrv.apps.*; - +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.cert.X509CRL; +import java.security.cert.X509CRLEntry; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.RevokedCertificate; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.pkix.cert.Extension; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.CertID; +import com.netscape.cmsutil.ocsp.CertStatus; +import com.netscape.cmsutil.ocsp.GoodInfo; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.OCSPResponseStatus; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseBytes; +import com.netscape.cmsutil.ocsp.ResponseData; +import com.netscape.cmsutil.ocsp.RevokedInfo; +import com.netscape.cmsutil.ocsp.SingleResponse; +import com.netscape.cmsutil.ocsp.TBSRequest; +import com.netscape.cmsutil.ocsp.UnknownInfo; /** diff --git a/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java index f3ffaf3fe..eaca3c5c0 100644 --- a/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java @@ -18,31 +18,59 @@ package com.netscape.cms.ocsp; -import netscape.ldap.*; -import java.math.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.dbs.crldb.*; - -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.cmsutil.ocsp.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.cert.X509CRL; +import java.security.cert.X509CRLEntry; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.pkix.cert.Extension; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.CertID; +import com.netscape.cmsutil.ocsp.CertStatus; +import com.netscape.cmsutil.ocsp.GoodInfo; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.OCSPResponseStatus; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseBytes; +import com.netscape.cmsutil.ocsp.ResponseData; +import com.netscape.cmsutil.ocsp.RevokedInfo; +import com.netscape.cmsutil.ocsp.SingleResponse; +import com.netscape.cmsutil.ocsp.TBSRequest; +import com.netscape.cmsutil.ocsp.UnknownInfo; + /** * This is the LDAP OCSP store. It reads CA certificate and diff --git a/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java b/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java index 6901abc34..4d59f34e2 100644 --- a/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java +++ b/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java @@ -18,10 +18,10 @@ package com.netscape.cms.password; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.password.EPasswordCheckException; +import com.netscape.certsrv.password.IConfigPasswordCheck; +import com.netscape.certsrv.password.IPasswordCheck; /** diff --git a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java b/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java index d0bd6a6bc..d9a527d68 100644 --- a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java +++ b/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java @@ -18,21 +18,29 @@ package com.netscape.cms.policy; -import java.util.*; -import java.text.*; import java.io.IOException; import java.security.InvalidKeyException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.Vector; + +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.request.AgentApprovals; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.request.AgentApprovals; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import java.security.*; -import java.security.cert.*; /** diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java index 0702ef29c..2a98f12fd 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -18,17 +18,16 @@ package com.netscape.cms.policy.constraints; -import java.util.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.request.IPolicy; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.AgentApprovals; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; -import netscape.security.x509.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.AgentApprovals; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index 3410c7baa..6438dc4ae 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -18,24 +18,30 @@ package com.netscape.cms.policy.constraints; -import java.io.File; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.notification.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import java.util.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.common.*; -import java.text.DateFormat; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.certsrv.request.RequestId; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 4623826f0..3caee615e 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -18,19 +18,26 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.math.BigInteger; +import java.security.interfaces.DSAParams; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.provider.DSAPublicKey; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.CMS; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.provider.DSAPublicKey; -import java.security.interfaces.DSAParams; -import java.math.BigInteger; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index 8fca9a2fa..3d4aedc34 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -18,14 +18,16 @@ package com.netscape.cms.policy.constraints; -import java.util.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IRevocationPolicy; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index 5746a3b21..aed75bcd0 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -18,15 +18,21 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index 181752b01..8286cf319 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -18,14 +18,23 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index d88bb3c02..a2bf94373 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -18,14 +18,15 @@ package com.netscape.cms.policy.constraints; -import java.util.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Vector; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index b30e27901..7f7537bfe 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -18,16 +18,27 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.provider.RSAPublicKey; +import netscape.security.util.BigInt; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.provider.RSAPublicKey; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index 5cadafa17..08e479b84 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -18,17 +18,23 @@ package com.netscape.cms.policy.constraints; -import java.io.*; - -import java.util.*; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IRenewalPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 60f294e36..3d98f3c2e 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -18,14 +18,22 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IRenewalPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index 1afb9cbba..686529f4c 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -18,15 +18,24 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IRevocationPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index be9870935..9d5192848 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -18,19 +18,27 @@ package com.netscape.cms.policy.constraints; -import java.util.*; -import java.io.*; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.CMS; -import netscape.security.x509.*; -import com.netscape.certsrv.ca.*; -import netscape.security.extensions.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index dffde5806..8e8cd4a73 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -18,19 +18,27 @@ package com.netscape.cms.policy.constraints; -import org.mozilla.jss.crypto.*; -import java.util.*; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; +import com.netscape.certsrv.security.ISigningUnit; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java index a2aeef09d..dc8ecd79d 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java @@ -18,18 +18,6 @@ package com.netscape.cms.policy.constraints; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.policy.APolicyRule; /** diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java index 040b5e205..4e7cefe7e 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -18,20 +18,31 @@ package com.netscape.cms.policy.constraints; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; import com.netscape.cms.policy.APolicyRule; -import com.netscape.certsrv.apps.*; /** diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 832d77746..62c49450b 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -18,14 +18,21 @@ package com.netscape.cms.policy.constraints; -import java.util.*; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java index 054379bb5..b641d91ed 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java @@ -18,22 +18,29 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IGeneralNameUtil; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.ldap.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java index b170925c4..612d24925 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java @@ -18,22 +18,31 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index 73a6b58af..4c2eb4643 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -18,21 +18,33 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotDefined; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java index 84664b09d..cec8051b8 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java @@ -18,20 +18,36 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + import netscape.security.util.BitArray; -import netscape.security.x509.*; +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.CRLDistributionPointsExtension; import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.GeneralNamesException; +import netscape.security.x509.RDN; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index bcf9d11cb..4490b25ee 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -18,19 +18,36 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CPSuri; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificatePoliciesExtension; +import netscape.security.x509.CertificatePolicyId; +import netscape.security.x509.CertificatePolicyInfo; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.DisplayText; +import netscape.security.x509.NoticeReference; +import netscape.security.x509.PolicyQualifierInfo; +import netscape.security.x509.PolicyQualifiers; +import netscape.security.x509.UserNotice; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.x509.PolicyQualifierInfo; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java index e761ecfab..c5a24d630 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java @@ -18,20 +18,26 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.CertificateRenewalWindowExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java index a8d5f8a0c..e6cbddf60 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java @@ -18,22 +18,29 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.CertificateScopeEntry; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.util.BigInt; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IGeneralNameUtil; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.ldap.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 783ab2b6e..b5c4176d0 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -18,17 +18,26 @@ package com.netscape.cms.policy.extensions; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import java.security.cert.*; -import java.io.*; -import java.util.*; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index 9a07cb020..47e3de0c0 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -18,23 +18,32 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.cert.CertificateException; import java.text.ParseException; -import java.security.cert.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.GenericASN1Extension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.OIDMap; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java index 240076c95..cc2751c03 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java @@ -18,27 +18,27 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.cert.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ca.*; -import java.util.StringTokenizer; -import netscape.security.util.DerValue; -import java.util.Enumeration; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index d824e452e..4f7a72c4d 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -18,23 +18,30 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.extensions.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java index 05a17cfcd..68f5d875b 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java @@ -18,19 +18,31 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.DisplayText; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.util.*; -import netscape.security.x509.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index 5fa6bae9c..2ececcf9c 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -32,7 +32,6 @@ import netscape.security.x509.KeyUsageExtension; import netscape.security.x509.X509CertInfo; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authority.ICertAuthority; import com.netscape.certsrv.base.EBaseException; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java index b204e57b2..35106de41 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java @@ -18,18 +18,29 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralSubtree; +import netscape.security.x509.GeneralSubtrees; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java index 289e2d297..e5cbab537 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java @@ -18,17 +18,25 @@ package com.netscape.cms.policy.extensions; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import java.security.cert.*; -import java.io.*; -import java.util.*; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java index 4396a09dd..717c19f70 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java @@ -18,18 +18,26 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java index aafecb17a..452a9a3fa 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java @@ -18,18 +18,29 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificatePolicyId; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.security.util.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java index 60da8f9a3..41f08963a 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -18,22 +18,15 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.extensions.*; -import com.netscape.certsrv.ca.*; -import netscape.ldap.*; -import netscape.security.extensions.*; import com.netscape.cms.policy.APolicyRule; /** diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index 468abdf7b..ff0d5749b 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -18,20 +18,28 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.security.cert.CertificateException; import java.text.SimpleDateFormat; -import java.security.cert.*; +import java.util.Date; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index b8dba995e..de39cccd6 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -18,19 +18,23 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java index 32e2c48fb..c9ce68f65 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java @@ -18,19 +18,28 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java index eb7dba173..7ff1a6c97 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java @@ -18,19 +18,31 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IGeneralNameUtil; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.policy.ISubjAltNameConfig; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import netscape.security.x509.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index be065245a..f3ef687df 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -18,21 +18,32 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.Attribute; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.X500NameAttrMap; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.extensions.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.ldap.*; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java index a8069be29..0c763b8aa 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java @@ -18,21 +18,32 @@ package com.netscape.cms.policy.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; +import java.security.cert.CertificateException; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java index aac1bb3c0..acaf9772a 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java @@ -18,17 +18,36 @@ package com.netscape.cms.profile.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.profile.IProfileUpdater; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java index d525689bd..681f2b4a5 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java @@ -18,31 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index c3b2a5ddc..32cd51b5f 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -18,29 +18,28 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IProfileUpdater; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java index cc8789390..95c360f8c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java @@ -18,33 +18,87 @@ package com.netscape.cms.profile.common; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.util.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.Attribute; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +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.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.Extension; +import netscape.security.x509.Extensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.INTEGER; +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.crypto.CryptoToken; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs10.CertificationRequestInfo; +import org.mozilla.jss.pkix.cmc.LraPopWitness; +import org.mozilla.jss.pkix.cmc.OtherMsg; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +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.PKIArchiveOptions; +import org.mozilla.jss.pkix.crmf.ProofOfPossession; +import org.mozilla.jss.pkix.primitive.AVA; +import org.mozilla.jss.pkix.primitive.Attribute; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISharedToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EDeferException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cmsutil.util.HMACDigest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java index dd994e83a..199aa7943 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java @@ -18,10 +18,7 @@ package com.netscape.cms.profile.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IProfileContext; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java index 12bbaa783..147d9c820 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java @@ -18,9 +18,9 @@ package com.netscape.cms.profile.common; -import java.util.*; +import java.util.Hashtable; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IProfileContext; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java index bf9594fa7..a0f0ed250 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java @@ -18,7 +18,9 @@ package com.netscape.cms.profile.common; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java index cd980c5c2..f82e73138 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java @@ -18,28 +18,22 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.ra.IRAService; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java index c83f05746..4a18ff14d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java @@ -18,30 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java index a6acf111e..7d4254bff 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java @@ -18,30 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java index c9aa0c65d..4e4c2f603 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java @@ -18,19 +18,27 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.BasicConstraintsExtDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserExtensionDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java index 7455eb28c..9759af73d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java @@ -18,18 +18,10 @@ package com.netscape.cms.profile.constraint; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; -import netscape.security.x509.*; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ca.ICertificateAuthority; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java index ca7d41fc4..4d89e7391 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java @@ -18,18 +18,25 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Date; +import java.util.Locale; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.CAValidityDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserValidityDefault; +import com.netscape.cms.profile.def.ValidityDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java index 5e0627db7..0723a72c3 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java @@ -18,17 +18,26 @@ package com.netscape.cms.profile.constraint; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; -import netscape.security.x509.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java index 42a2d1aa2..539f4890f 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java @@ -18,19 +18,27 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.ExtendedKeyUsageExtDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserExtensionDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java index 5dd83f28b..cda51a07c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java @@ -18,19 +18,24 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; +import java.util.Locale; + +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.EnrollExtDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserExtensionDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java index d628f5d6a..1b77f430a 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java @@ -18,23 +18,31 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; +import java.math.BigInteger; +import java.security.interfaces.DSAParams; +import java.util.HashMap; +import java.util.Locale; +import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.provider.RSAPublicKey; import netscape.security.provider.DSAPublicKey; -import java.security.interfaces.DSAParams; -import java.math.BigInteger; +import netscape.security.provider.RSAPublicKey; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserKeyDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java index ff87f9045..4a483b43d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java @@ -18,17 +18,24 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; +import java.util.Locale; -import netscape.security.x509.*; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.KeyUsageExtDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserExtensionDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java index 2ae8e5346..fe20b766c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java @@ -18,18 +18,23 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.Locale; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NSCertTypeExtDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserExtensionDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java index 30e81e7e7..108c32b17 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java @@ -18,14 +18,21 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.def.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java index da2498b15..91d5a46aa 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java @@ -18,18 +18,23 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; import java.math.BigInteger; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.def.*; -import netscape.security.x509.*; +import java.util.Date; +import java.util.Locale; + +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java index 1e81bd682..f570c26e6 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java @@ -18,18 +18,27 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.SigningAlgDefault; +import com.netscape.cms.profile.def.UserSigningAlgDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java index 4e9a9c34d..7ce32f00e 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java @@ -18,17 +18,25 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.SubjectNameDefault; +import com.netscape.cms.profile.def.UserSubjectNameDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index 1770c13ef..b47e2230d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -18,23 +18,29 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; - -import netscape.security.x509.*; -//import netscape.security.provider.*; -import netscape.security.util.*; -import java.math.BigInteger; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; /** * This constraint is to check for publickey uniqueness. diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java index 17a5d4bc4..89b8d4602 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java @@ -17,19 +17,38 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.profile.def.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.Extension; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.SubjectNameDefault; +import com.netscape.cms.profile.def.UserSubjectNameDefault; /** * This class implements the unique subject name constraint. diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java index b4b37fcf0..95c322214 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java @@ -18,17 +18,27 @@ package com.netscape.cms.profile.constraint; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.def.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Date; +import java.util.Locale; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.def.CAValidityDefault; +import com.netscape.cms.profile.def.NoDefault; +import com.netscape.cms.profile.def.UserValidityDefault; +import com.netscape.cms.profile.def.ValidityDefault; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java index 2c42841b4..6f73cd523 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java @@ -18,20 +18,27 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.AccessDescription; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java index a2a2b9da0..63eaf5938 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java @@ -18,16 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java index 520e7c0a6..869deed22 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java @@ -18,19 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java index 49b929fa1..7ab05d755 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java @@ -18,16 +18,18 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java index 0995a142c..8c5d8094d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java @@ -18,16 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java index 907a5830c..4b883f7f8 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java @@ -18,19 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ca.ICertificateAuthority; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java index f298238b0..8bf4c75fa 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java @@ -18,18 +18,26 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.text.*; -import java.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; - -import netscape.security.x509.*; +import java.io.IOException; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java index d0a42a816..6dfb24c13 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java @@ -18,21 +18,32 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.util.BitArray; +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.CRLDistributionPointsExtension; import netscape.security.x509.CRLDistributionPointsExtension.Reason; -import com.netscape.cms.profile.common.*; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.GeneralNamesException; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RDN; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java index 7cb5e72b1..14eec785e 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java @@ -19,20 +19,34 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CPSuri; +import netscape.security.x509.CertificatePoliciesExtension; +import netscape.security.x509.CertificatePolicyId; +import netscape.security.x509.CertificatePolicyInfo; +import netscape.security.x509.DisplayText; +import netscape.security.x509.NoticeReference; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.PolicyQualifiers; +import netscape.security.x509.Qualifier; +import netscape.security.x509.UserNotice; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java index f80e98a4a..f3b68594c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java @@ -17,19 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Locale; + +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java index c45798281..b5afc1c79 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java @@ -17,23 +17,48 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import java.security.cert.CertificateException; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.pattern.*; -import com.netscape.certsrv.apps.*; - +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.NoSuchElementException; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.extensions.KerberosName; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.DNSName; +import netscape.security.x509.EDIPartyName; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.OIDName; +import netscape.security.x509.OtherName; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.pattern.Pattern; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ICertInfoPolicyDefault; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; import com.netscape.cms.profile.common.EnrollProfile; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java index e51c03b40..7cf2a3596 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java @@ -18,17 +18,6 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.common.EnrollProfile; -import netscape.security.x509.*; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java index ddc0403c9..62d21cc8c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java @@ -18,18 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java index 773182e11..7b9bcd525 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java @@ -18,20 +18,29 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.GeneralNamesException; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RDN; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java index 3403767b7..4051f31a4 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java @@ -18,18 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java index 95f670386..5bb8abd49 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java @@ -18,17 +18,18 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.text.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; - -import netscape.security.x509.*; +import java.util.Locale; + +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java index 493383b3e..c6bbc7f78 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java @@ -18,19 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.math.BigInteger; +import java.util.Locale; + +import netscape.security.extensions.InhibitAnyPolicyExtension; +import netscape.security.util.BigInt; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java index 16a5fe2be..8f8837ebd 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java @@ -18,18 +18,26 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java index 286913c5a..c8ed92810 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java @@ -18,16 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java index 05449eec2..01e92d6a7 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java @@ -18,19 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java index 1c38dedce..e3438ccf6 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java @@ -18,18 +18,20 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.security.cert.CertificateException; +import java.util.Locale; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java index 8da1809d7..f6ddd9153 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java @@ -18,20 +18,28 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralSubtree; +import netscape.security.x509.GeneralSubtrees; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java index c3ea31211..283f50833 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java @@ -18,12 +18,19 @@ package com.netscape.cms.profile.def; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java index fb6518043..28a25a6e5 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java @@ -18,18 +18,19 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java index 72d076ca5..9a36f0cd8 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java @@ -18,20 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java index d9ef59c11..19bfb3615 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java @@ -18,20 +18,27 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificatePolicyId; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java index 46fd5be18..f1a71ff98 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java @@ -18,20 +18,24 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java index b3061837a..4bca93503 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java @@ -18,18 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.text.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.ca.*; - -import netscape.security.x509.*; +import java.util.Locale; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java index 7da63e71e..64d822e8f 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java @@ -18,19 +18,30 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.pattern.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.extensions.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.UUID; + +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.pattern.Pattern; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java index afd3fcd0a..0259fb36e 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java @@ -17,20 +17,30 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.Attribute; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.X500NameAttrMap; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java index 4c20769ed..8a3f2afc8 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java @@ -18,20 +18,27 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; - -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.AccessDescription; +import netscape.security.extensions.SubjectInfoAccessExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java index 27a2c496f..d8b09f5db 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java @@ -18,19 +18,26 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.security.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Locale; + +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java index d19b5e5b8..9f404e89b 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java @@ -18,16 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java index a5594917e..c834eee19 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java @@ -18,16 +18,21 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; +import java.util.Locale; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java index 258b470fa..1cff57df2 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java @@ -18,21 +18,27 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.math.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; - +import java.io.ByteArrayInputStream; +import java.math.BigInteger; import java.security.interfaces.DSAParams; -import netscape.security.x509.*; -import netscape.security.provider.RSAPublicKey; +import java.util.Locale; + import netscape.security.provider.DSAPublicKey; +import netscape.security.provider.RSAPublicKey; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java index a8e2900d7..07e6c77e5 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java @@ -18,20 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.math.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; +import java.io.ByteArrayInputStream; +import java.util.Locale; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.X509CertInfo; -//import java.security.interfaces.DSAParams; -import netscape.security.x509.*; -//import netscape.security.provider.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java index 4bbe0669e..f589b6543 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java @@ -18,16 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java index e16c032a5..2d79b1925 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java @@ -18,20 +18,22 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.math.*; -import java.util.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; +import java.io.ByteArrayInputStream; +import java.util.Date; +import java.util.Locale; + +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertInfo; -//import java.security.interfaces.DSAParams; -import netscape.security.x509.*; -//import netscape.security.provider.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java index f0af47f70..6e9b08abf 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java @@ -18,17 +18,23 @@ package com.netscape.cms.profile.def; -import java.io.*; -import java.text.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.profile.common.*; +import java.io.IOException; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; -import netscape.security.x509.*; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java index 5a967a245..c8beca2f6 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java @@ -17,17 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.authentication.DNPattern; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java index fe1c92fc3..3a1d1c6ea 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java @@ -18,18 +18,28 @@ package com.netscape.cms.profile.def; //ldap java sdk -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; - -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java index b1f09e427..030470b39 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java @@ -17,17 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.def; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import com.netscape.cms.profile.common.*; -import com.netscape.cms.authentication.DNPattern; +import java.io.IOException; +import java.util.Locale; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java index ef7fe53cf..e9bb59e65 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java @@ -18,18 +18,28 @@ package com.netscape.cms.profile.def; //ldap java sdk -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; - -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java index 4c368c03e..d067f1e68 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java @@ -18,26 +18,22 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; +import java.util.Locale; + +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.cmc.TaggedRequest; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java index 565b7795e..12a4f549b 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java @@ -18,26 +18,25 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; +import java.util.Locale; + +import netscape.security.pkcs.PKCS10; +import netscape.security.util.DerInputStream; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.crmf.CertReqMsg; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java index dfb7be887..b887807cc 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java @@ -18,22 +18,24 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.pkcs.PKCS10; +import netscape.security.util.DerInputStream; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.crmf.CertReqMsg; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java index f704a2297..1eaf476b9 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java @@ -18,19 +18,28 @@ package com.netscape.cms.profile.input; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -import org.mozilla.jss.pkix.crmf.*; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.CryptoToken; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.common.*; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.ProofOfPossession; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java index e79372b16..70ede1e25 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java @@ -18,16 +18,21 @@ package com.netscape.cms.profile.input; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.io.BufferedInputStream; +import java.net.URL; +import java.net.URLConnection; +import java.security.MessageDigest; +import java.util.Locale; -import java.net.*; -import java.security.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java index 6358f272d..5aa85e0ef 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java @@ -18,12 +18,19 @@ package com.netscape.cms.profile.input; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java index ac913a93e..265b958d4 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java @@ -18,12 +18,17 @@ package com.netscape.cms.profile.input; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java index cc8f9a70d..00c0ffcf9 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java @@ -18,25 +18,25 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.pkcs.PKCS10; +import netscape.security.util.DerInputStream; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.crmf.CertReqMsg; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java index 2eeaac114..dce75c15d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java @@ -18,20 +18,17 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java index 1f2512ff3..8691b45c7 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java @@ -18,20 +18,24 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java index fec7ceabb..15f906f99 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java @@ -18,20 +18,24 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; -import com.netscape.cms.profile.common.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java index eac2ffc69..52df2d418 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java @@ -18,20 +18,17 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java index 20b8c571c..64988fed3 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java @@ -18,16 +18,20 @@ package com.netscape.cms.profile.input; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; - -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java index 367c20646..58984c6c3 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java @@ -18,26 +18,20 @@ package com.netscape.cms.profile.input; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import com.netscape.cms.profile.common.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; +import java.util.Locale; + +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java index 0ed01cb38..999bdc67e 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java @@ -18,26 +18,32 @@ package com.netscape.cms.profile.output; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmmf.*; -import org.mozilla.jss.pkix.primitive.*; - -import com.netscape.cms.profile.common.*; +import java.io.ByteArrayOutputStream; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.pkix.cmmf.CertOrEncCert; +import org.mozilla.jss.pkix.cmmf.CertRepContent; +import org.mozilla.jss.pkix.cmmf.CertResponse; +import org.mozilla.jss.pkix.cmmf.CertifiedKeyPair; +import org.mozilla.jss.pkix.cmmf.PKIStatusInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java index 516560c0d..7a2631da4 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java @@ -18,20 +18,21 @@ package com.netscape.cms.profile.output; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; +import netscape.security.x509.X509CertImpl; -import com.netscape.cms.profile.common.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java index 213d7a834..3013e8810 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java @@ -18,11 +18,18 @@ package com.netscape.cms.profile.output; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java index e6a9a9082..657184813 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java @@ -18,26 +18,29 @@ package com.netscape.cms.profile.output; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmmf.*; -import org.mozilla.jss.pkix.primitive.*; - -import com.netscape.cms.profile.common.*; +import java.io.ByteArrayOutputStream; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java index 4e3720880..90aa40a14 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java @@ -18,26 +18,20 @@ package com.netscape.cms.profile.output; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmmf.*; -import org.mozilla.jss.pkix.primitive.*; - -import com.netscape.cms.profile.common.*; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.profile.common.EnrollProfile; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java index 7898ce2c1..69803421a 100644 --- a/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -17,17 +17,30 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.updater; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.base.*; -import com.netscape.cms.profile.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPException; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileUpdater; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.profile.common.EnrollProfile; /** * This updater class will create the new user to the subsystem group and diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java index 334f0c98f..9f337cbb4 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -26,24 +26,27 @@ package com.netscape.cms.publish.mappers; /////////////////////// /* cert server imports */ -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPDN; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.LdapV3DNStrConverter; +import netscape.security.x509.OIDMap; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ECompSyntaxErr; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -/* LDAP imports */ -import netscape.ldap.*; - -/* security imports */ -import netscape.security.util.*; -import netscape.security.x509.*; - -/* java sdk imports */ -import java.io.*; -import java.security.*; -import java.util.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index 6bf4ca8d5..9f605678e 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -18,20 +18,35 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import netscape.ldap.util.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.ldap.util.DN; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java index 7a0bc4130..b8cc06f77 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java @@ -18,19 +18,21 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; +import java.security.cert.CRLException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java index dde5950bc..7ce49748a 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java @@ -18,18 +18,28 @@ package com.netscape.cms.publish.mappers; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.logging.*; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java index 6fcebad01..017441df0 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java @@ -18,18 +18,28 @@ package com.netscape.cms.publish.mappers; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.logging.*; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 3a55b4ebe..40283e985 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -18,19 +18,19 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; +import java.security.cert.CRLException; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java index 49fce4994..38dcca287 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java @@ -18,18 +18,33 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVA; +import netscape.security.x509.RDN; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500NameAttrMap; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPlugin; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java index ff445bb5e..c3c269515 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java @@ -26,27 +26,35 @@ package com.netscape.cms.publish.mappers; /////////////////////// /* cert server imports */ -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.ldap.util.DN; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -/* LDAP imports */ -import netscape.ldap.*; -import netscape.ldap.util.*; - -/* security imports */ -import netscape.security.util.*; -import netscape.security.x509.*; - -/* java sdk imports */ -import java.io.*; -import java.security.*; -import java.security.cert.*; -import java.util.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java index 6e9e0e74a..c08ec8493 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java @@ -18,19 +18,32 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.LDAPv3; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java index 129c12659..265030401 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -18,17 +18,28 @@ package com.netscape.cms.publish.mappers; -import java.util.*; -import com.netscape.certsrv.logging.*; -import java.io.*; -import java.security.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.ldap.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPDN; +import netscape.security.x509.AVA; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.LdapV3DNStrConverter; +import netscape.security.x509.OIDMap; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ECompSyntaxErr; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java index 2785cc6cd..547e370ad 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java @@ -18,19 +18,18 @@ package com.netscape.cms.publish.mappers; -import com.netscape.certsrv.logging.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java index e26252dda..3720d02dd 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java @@ -18,19 +18,17 @@ package com.netscape.cms.publish.mappers; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java index 85fdaae04..b1d109020 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java @@ -18,19 +18,17 @@ package com.netscape.cms.publish.mappers; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapMapper; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index 18af1a98b..1d3a949ec 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -18,19 +18,35 @@ package com.netscape.cms.publish.publishers; -import java.math.*; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import java.util.zip.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.cert.CRLException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.TimeZone; +import java.util.Vector; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import netscape.ldap.LDAPConnection; + import org.mozilla.jss.util.Base64OutputStream; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; + /** * This publisher writes certificate and CRL into * a directory. diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java index 5b6533e13..4727a6907 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java @@ -18,16 +18,29 @@ package com.netscape.cms.publish.publishers; -import netscape.ldap.*; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java index 654a93150..0c596f3b0 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java @@ -18,16 +18,31 @@ package com.netscape.cms.publish.publishers; -import java.io.*; -import java.util.*; -import netscape.ldap.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.io.IOException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +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; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java index ca8a07ef4..e4a7e0b7c 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java @@ -18,16 +18,26 @@ package com.netscape.cms.publish.publishers; -import netscape.ldap.*; -import java.security.cert.*; -import java.io.*; -import java.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +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; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java index 074d21ee0..22dc1294f 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java @@ -18,16 +18,29 @@ package com.netscape.cms.publish.publishers; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.security.cert.CRLException; +import java.security.cert.X509CRL; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index 543088ecb..dc651c155 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -18,19 +18,38 @@ package com.netscape.cms.publish.publishers; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java index fbc5cf6d1..f612d005b 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java @@ -18,14 +18,30 @@ package com.netscape.cms.publish.publishers; -import netscape.ldap.*; -import java.security.cert.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java index 846ea7c48..ad37a6669 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java @@ -18,20 +18,29 @@ package com.netscape.cms.publish.publishers; -import java.net.*; -import java.math.*; -import java.io.*; -import java.security.cert.*; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmsutil.http.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.Socket; +import java.net.URLEncoder; +import java.security.cert.CRLException; +import java.security.cert.X509CRL; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.JssSSLSocketFactory; /** diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java b/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java index 358a762b3..d5717aad4 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java @@ -18,10 +18,16 @@ package com.netscape.cms.publish.publishers; -import java.net.*; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java b/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java index 36bb5cd2a..b48af995d 100644 --- a/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java +++ b/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java @@ -18,22 +18,7 @@ package com.netscape.cms.request; -import java.io.IOException; -import java.io.NotSerializableException; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; -import java.math.BigInteger; - -import java.util.Date; -import java.util.Enumeration; import java.util.Vector; -import java.util.Hashtable; - -import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestScheduler; diff --git a/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java index d2b54c3b8..df7f02bca 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java @@ -25,11 +25,17 @@ package com.netscape.cms.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import java.util.*; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTest; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java index 19fb71cff..cf3338ef4 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java @@ -26,15 +26,23 @@ package com.netscape.cms.selftests.ca; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.cert.*; -import java.util.*; -import netscape.security.x509.*; +import java.security.cert.CertificateParsingException; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java index ec8651059..cff35ce57 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java @@ -26,15 +26,23 @@ package com.netscape.cms.selftests.ca; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.cert.*; -import java.util.*; -import netscape.security.x509.*; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java index 5338cfff8..b3388d9e1 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java +++ b/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java @@ -26,15 +26,18 @@ package com.netscape.cms.selftests.common; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.cert.*; -import java.util.*; -import netscape.security.x509.*; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java index 2cf481dde..52255e24c 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java +++ b/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java @@ -26,14 +26,20 @@ package com.netscape.cms.selftests.kra; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.*; -import java.util.*; +import java.security.PublicKey; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java index a05294a8e..507148bd5 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java @@ -26,16 +26,24 @@ package com.netscape.cms.selftests.ocsp; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.cert.*; -import java.util.*; -import netscape.security.x509.*; +import java.security.cert.CertificateParsingException; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java index 2bfe9ffd9..e6516b2a6 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java @@ -26,16 +26,24 @@ package com.netscape.cms.selftests.ocsp; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.cert.*; -import java.util.*; -import netscape.security.x509.*; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java index f87c07128..1a8b4c3e7 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java +++ b/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java @@ -26,14 +26,20 @@ package com.netscape.cms.selftests.ra; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.security.*; -import java.util.*; +import java.security.PublicKey; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; diff --git a/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java index b030759f7..ba0ae3cb7 100644 --- a/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java +++ b/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java @@ -26,15 +26,21 @@ package com.netscape.cms.selftests.tks; // import statements // /////////////////////// -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.tks.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.cms.selftests.*; -import java.util.*; -import com.netscape.symkey.*; -import org.mozilla.jss.crypto.*; +import java.util.Arrays; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.selftests.ASelfTest; +import com.netscape.symkey.SessionKey; diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 7bac528e9..cdfb772cc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -18,24 +18,32 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.math.*; -import java.text.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -//import com.netscape.certsrv.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.evaluators.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cmsutil.util.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.ACLEntry; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authorization.IAuthzManager; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java index 4e97c2d52..2024e496e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java @@ -18,7 +18,7 @@ package com.netscape.cms.servlet.admin; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index f7f9ce16a..2d13841b1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -18,24 +18,43 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import netscape.security.x509.X509CertImpl; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.servlet.base.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.UserInfo; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index fd7edfabd..b4ef5c698 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -18,25 +18,33 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthManagerProxy; +import com.netscape.certsrv.authentication.AuthMgrPlugin; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EAuthMgrNotFound; +import com.netscape.certsrv.authentication.EAuthMgrPluginNotFound; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.DestDef; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java index 354015e13..111fe0591 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java @@ -18,9 +18,12 @@ package com.netscape.cms.servlet.admin; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index 5f2bf07c9..5461e8ff5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -18,31 +18,32 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import netscape.security.x509.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmsutil.util.*; +import java.io.File; +import java.io.IOException; +import java.net.UnknownHostException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICMSCRLExtensions; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequestListener; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 77ac6437e..1f2835bc2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -18,42 +18,69 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateEncodingException; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import netscape.security.x509.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.tks.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.cert.ICrossCertPairSubsystem; -import com.netscape.cmsutil.util.*; -import com.netscape.cms.servlet.common.CMSGateway; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.math.BigInteger; +import java.net.ServerSocket; +import java.security.KeyPair; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.util.ConsolePasswordCallback; -import org.mozilla.jss.util.IncorrectPasswordException; -import com.netscape.symkey.*; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.cert.ICrossCertPairSubsystem; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTest; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.certsrv.tks.ITKSAuthority; +import com.netscape.cmsutil.util.Cert; +import com.netscape.symkey.SessionKey; /** * A class representings an administration servlet. This diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index af506433d..30c4a5dba 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -18,20 +18,29 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.DestDef; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.jobs.EJobsException; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.jobs.JobPlugin; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index 423095d51..5b318f61f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -18,24 +18,30 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index 23656942c..67f633468 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -18,20 +18,32 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ELogNotFound; +import com.netscape.certsrv.logging.ELogPluginNotFound; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogSubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogPlugin; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index aafe4f4bc..7101dc520 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -18,29 +18,26 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.ocsp.IOCSPStore; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index 91309e08c..613fbdd68 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -18,24 +18,31 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.policy.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ca.ICertificateAuthority; -import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.ra.IRegistrationAuthority; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 8306bc77e..4059b03b6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -18,27 +18,40 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.property.*; +import java.io.File; +import java.io.IOException; +import java.util.Enumeration; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; -import com.netscape.certsrv.ca.ICertificateAuthority; -import com.netscape.certsrv.ra.IRegistrationAuthority; -import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index d840f6cda..7507238a7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -18,30 +18,55 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import netscape.ldap.*; -import org.mozilla.jss.ssl.*; -import netscape.security.x509.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmsutil.password.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ExtendedPluginInfo; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.Plugin; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapBoundConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.EMapperNotFound; +import com.netscape.certsrv.publish.EMapperPluginNotFound; +import com.netscape.certsrv.publish.EPublisherNotFound; +import com.netscape.certsrv.publish.EPublisherPluginNotFound; +import com.netscape.certsrv.publish.ERuleNotFound; +import com.netscape.certsrv.publish.ERulePluginNotFound; +import com.netscape.certsrv.publish.ILdapMapper; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.certsrv.publish.ILdapRule; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.MapperPlugin; +import com.netscape.certsrv.publish.MapperProxy; +import com.netscape.certsrv.publish.PublisherPlugin; +import com.netscape.certsrv.publish.PublisherProxy; +import com.netscape.certsrv.publish.RulePlugin; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.cmsutil.password.IPasswordStore; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java index c5ec93f3a..eecd23abc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java @@ -18,26 +18,22 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.policy.*; +import java.io.IOException; +import java.util.Enumeration; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequestListener; diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index 78d88c9b3..bbd9c61ca 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -18,26 +18,26 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.registry.*; +import java.io.IOException; +import java.util.Enumeration; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; -import com.netscape.certsrv.ca.ICertificateAuthority; -import com.netscape.certsrv.ra.IRegistrationAuthority; -import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; /** * This implements the administration servlet for registry subsystem. diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index 5ac9e0dd1..b20797bfb 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -18,31 +18,45 @@ package com.netscape.cms.servlet.admin; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.pkcs.PKCS7; +import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.InternalCertificate; -import com.netscape.cmsutil.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.base.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.common.OpDef; +import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index c823143be..665a637bd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -17,72 +17,87 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.common.AuthCredentials; -import com.netscape.cmsutil.xml.*; -import com.netscape.certsrv.base.SessionContext; -import java.io.*; -import java.util.*; -import java.util.Locale; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; import java.util.Enumeration; -import java.util.Vector; import java.util.Hashtable; +import java.util.Locale; +import java.util.Random; import java.util.StringTokenizer; -import java.util.Date; -import java.math.BigInteger; - -import java.security.cert.X509Certificate; -import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; +import java.util.Vector; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.CertificateChain; -import netscape.security.x509.AlgorithmId; -import netscape.security.x509.RevokedCertImpl; -import netscape.security.x509.RevocationReason; -import netscape.security.x509.CRLReasonExtension; -import netscape.security.x509.CRLExtensions; -import netscape.security.pkcs.PKCS7; import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; import netscape.security.pkcs.SignerInfo; -import netscape.security.util.DerValue; -import netscape.security.util.DerOutputStream; -import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; import org.mozilla.jss.ssl.SSLSocket; -import org.mozilla.jss.ssl.SSLSecurityStatus; -import org.w3c.dom.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authorization.*; - -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.dbs.certdb.*; - +import org.w3c.dom.Node; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.apps.ICommandQueue; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; - -import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; - -import java.security.NoSuchAlgorithmException; -import java.security.MessageDigest; -import java.net.SocketException; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.servlet.common.AuthCredentials; +import com.netscape.cms.servlet.common.CMSFileLoader; +import com.netscape.cms.servlet.common.CMSGateway; +import com.netscape.cms.servlet.common.CMSLoadTemplate; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.GenErrorTemplateFiller; +import com.netscape.cms.servlet.common.GenPendingTemplateFiller; +import com.netscape.cms.servlet.common.GenRejectedTemplateFiller; +import com.netscape.cms.servlet.common.GenSuccessTemplateFiller; +import com.netscape.cms.servlet.common.GenSvcPendingTemplateFiller; +import com.netscape.cms.servlet.common.GenUnexpectedErrorTemplateFiller; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cms.servlet.common.Utils; +import com.netscape.cmsutil.xml.XMLObject; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java index 5a450251e..96c205251 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java @@ -18,14 +18,18 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; -import java.io.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index 706c406cd..6e4ef50c4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -18,16 +18,20 @@ package com.netscape.cms.servlet.base; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.servlet.common.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java index 59d307084..e9221a95c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java @@ -18,22 +18,26 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.IAuthority; -import com.netscape.certsrv.dbs.*; -import org.mozilla.jss.ssl.SSLSocket; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthMgrPlugin; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java index 74c6cf445..34cfe9c35 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java @@ -18,36 +18,30 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.util.*; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.certsrv.util.StatsEvent; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java index 04dfd9210..79aa65a58 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java @@ -18,22 +18,19 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.common.CMSGateway; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.IndexTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java index 7443b0144..5f68ead62 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java @@ -18,25 +18,19 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import java.net.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.http.*; -import org.xml.sax.*; -import org.w3c.dom.*; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet returns port information. diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java index 3b4315266..8103524e3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java @@ -3,21 +3,22 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java index ac6889c09..b4b852f15 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java @@ -18,21 +18,16 @@ package com.netscape.cms.servlet.base; -import com.netscape.cms.servlet.common.*; +import java.io.IOException; +import java.util.Date; -import java.util.*; -import java.io.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.apps.CMS; /** * Displays detailed information about java VM internals, including diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 9ed435c07..57ad7737c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -18,44 +18,55 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Locale; import java.io.IOException; import java.math.BigInteger; - -import java.security.cert.X509Certificate; import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -import netscape.security.x509.*; - - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.request.*; - -import com.netscape.certsrv.dbs.certdb.*; - -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.logging.*; - -import com.netscape.certsrv.publish.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index d3e7a5a32..5218233f1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -18,37 +18,53 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Locale; import java.io.IOException; import java.math.BigInteger; - import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -import netscape.security.x509.*; - - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.publish.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java index 59ee9a4ec..c9fcf25be 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -18,25 +18,26 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authentication.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java index 5e4309494..a5b989b8f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -18,34 +18,32 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.authentication.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.util.Date; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index d75844d2a..d64fd2337 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -18,34 +18,32 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.ICertAuthority; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 3a0c48a94..1bd761d82 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -18,36 +18,54 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.extensions.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.EDBRecordNotFoundException; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java index 9c7b022dd..817bf01e3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -18,31 +18,37 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; +import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CRLException; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; - -import com.netscape.cms.servlet.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index 0062a4e7e..c7d76a7a5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -18,34 +18,32 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.authentication.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.util.Date; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index 5d04ea9f5..42cb91a2d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -18,26 +18,58 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index 2969db90f..44754665e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -18,24 +18,50 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index 2f125beb7..ff43ad6d8 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -18,25 +18,43 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 8c290d0a7..4f39a3876 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -18,25 +18,42 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index a469e674e..a8082e5ac 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -18,34 +18,33 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.ICertAuthority; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.Random; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index a0de7ebdd..2d1c28f4d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -18,54 +18,64 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; - -import java.io.*; - -import java.security.cert.CertificateException; +import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; - -import netscape.security.x509.*; -import netscape.security.pkcs.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import com.netscape.cms.servlet.processors.PKIProcessor; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.KeyGenInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSGateway; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; import com.netscape.cms.servlet.processors.CMCProcessor; import com.netscape.cms.servlet.processors.CRMFProcessor; import com.netscape.cms.servlet.processors.KeyGenProcessor; import com.netscape.cms.servlet.processors.PKCS10Processor; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestStatus; - -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; - -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.policy.IPolicyProcessor; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.math.*; +import com.netscape.cms.servlet.processors.PKIProcessor; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index 196c56a9b..ce136448c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -18,41 +18,45 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; - - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index 4093b989f..81e96e3a5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -18,28 +18,36 @@ package com.netscape.cms.servlet.cert; - import com.netscape.cms.servlet.common.*; - import com.netscape.cms.servlet.base.*; - import java.io.*; - import java.util.*; - import java.math.*; - import javax.servlet.*; - import java.security.cert.*; - import javax.servlet.http.*; - import netscape.ldap.*; - import netscape.security.x509.*; - import com.netscape.certsrv.base.*; - import com.netscape.certsrv.authority.*; - import com.netscape.certsrv.policy.*; - import com.netscape.certsrv.request.IRequest; - import com.netscape.certsrv.dbs.*; - import com.netscape.certsrv.dbs.certdb.*; - import com.netscape.certsrv.ldap.*; - import com.netscape.certsrv.logging.*; - import com.netscape.certsrv.apps.CMS; - import com.netscape.certsrv.authentication.*; - import com.netscape.certsrv.authorization.*; - import com.netscape.cms.servlet.*; + import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 6298b7d59..cad231ed7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -18,34 +18,35 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CRLException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 7f260216c..362107809 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -18,28 +18,39 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.extensions.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import netscape.security.extensions.*; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; + +import netscape.security.extensions.NSCertTypeExtension; import netscape.security.x509.CertificateExtensions; import netscape.security.x509.Extension; import netscape.security.x509.KeyUsageExtension; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.util.Locale; -import com.netscape.certsrv.apps.*; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index 7f1196bab..48f0f417d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -18,33 +18,32 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.ICertAuthority; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ra.*; -import com.netscape.cms.authentication.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java index 4d9515861..9ce50fa03 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -18,30 +18,36 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.dbs.crldb.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.AlgorithmId; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 3f4eb66a9..c6c0c495a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -18,52 +18,72 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.*; -import java.io.*; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; - -import netscape.security.x509.*; -import netscape.security.util.ObjectIdentifier; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkix.crmf.CertReqMsg; import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import org.mozilla.jss.pkix.crmf.CertTemplate; import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.asn1.InvalidBERException; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.KeyGenInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestStatus; - -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.authentication.*; - -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.math.*; +import com.netscape.cms.authentication.HashAuthentication; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 98da80372..75726730a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -18,38 +18,45 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Locale; -import java.math.BigInteger; +import java.io.BufferedReader; import java.io.ByteArrayOutputStream; -import java.io.StringWriter; import java.io.StringReader; -import java.io.BufferedReader; - +import java.io.StringWriter; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Locale; import javax.servlet.http.HttpServletRequest; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; -import java.security.cert.CertificateEncodingException; -import java.security.NoSuchAlgorithmException; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.CertificateChain; -import netscape.security.x509.AlgorithmId; -import netscape.security.pkcs.PKCS7; import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.keydb.*; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.pkix.cmmf.CertOrEncCert; +import org.mozilla.jss.pkix.cmmf.CertRepContent; +import org.mozilla.jss.pkix.cmmf.CertResponse; +import org.mozilla.jss.pkix.cmmf.CertifiedKeyPair; +import org.mozilla.jss.pkix.cmmf.PKIStatusInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICertPrettyPrint; import com.netscape.certsrv.request.IRequest; - -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.cmmf.*; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index d7160daa6..edbe81b7d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -18,30 +18,45 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import netscape.security.provider.RSAPublicKey; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index 6b4e76496..b584316c9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -18,30 +18,37 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestRecord; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index bb39b3ad8..f45b488c7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -18,29 +18,35 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Random; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index f046ebc9d..465e129cb 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -18,34 +18,40 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; - -import com.netscape.cms.servlet.*; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthMgrPlugin; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index fb0bf75da..a83c390d9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -18,40 +18,43 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; import java.io.IOException; import java.math.BigInteger; - -import java.security.cert.X509Certificate; import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; -import netscape.security.x509.*; - -import javax.servlet.http.HttpServletRequest; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestStatus; - +import netscape.security.extensions.CertInfo; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertRecord; - -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; - -import com.netscape.certsrv.ca.*; - -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.AuditFormat; -import netscape.security.extensions.*; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Certificate Renewal diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 67a829f9d..eefeb4628 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -18,38 +18,44 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Enumeration; -import java.util.Locale; -import java.util.Random; import java.io.IOException; import java.math.BigInteger; - -import java.security.cert.X509Certificate; import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Random; -import netscape.security.x509.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestStatus; - -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index 95622c9bb..3a571d440 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -18,20 +18,18 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - import java.util.Locale; import javax.servlet.http.HttpServletRequest; import netscape.security.x509.RevokedCertImpl; -import org.mozilla.jss.ssl.SSLSocket; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.cms.servlet.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 3f74a2696..6c8813d63 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -18,30 +18,48 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Calendar; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import netscape.security.provider.RSAPublicKey; -import com.netscape.certsrv.common.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java index 52b66874f..c2b2a1982 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -18,32 +18,46 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.EErrorPublishCRL; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java index 5f5afad1d..3f05674e2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -18,33 +18,45 @@ package com.netscape.cms.servlet.cert; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 246d9a478..e2a402644 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -17,37 +17,110 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert.scep; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import java.security.*; +import java.io.ByteArrayInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Random; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVA; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.DNSName; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.OIDMap; +import netscape.security.x509.RDN; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500NameAttrMap; +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.ANY; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs7.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cert.Certificate; +import org.mozilla.jss.util.IncorrectPasswordException; +import org.mozilla.jss.util.PasswordCallback; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authentication.*; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.AuthCredentials; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import com.netscape.cms.servlet.profile.*; -import org.mozilla.jss.pkcs7.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.cert.Certificate; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.profile.SSLClientCertProvider; import com.netscape.cmsutil.scep.CRSPKIMessage; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java index 3e94228a1..b449a8bd8 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java @@ -17,15 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert.scep; -import java.io.*; -import java.security.*; -import java.util.Properties; -import java.util.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.cmsutil.scep.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Hashtable; + +import netscape.security.util.DerValue; +import netscape.security.x509.CertAttrSet; /** * Class for handling the decoding of a SCEP Challenge Password diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java index 616eab27b..a8757e74f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java @@ -17,15 +17,19 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.cert.scep; -import java.io.*; -import java.security.*; -import java.util.Properties; -import java.util.*; - -import netscape.security.util.*; -import netscape.security.x509.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import com.netscape.cmsutil.scep.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; public class ExtensionsRequested implements CertAttrSet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java index 7407a80cd..6f5cce8b3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java @@ -18,9 +18,12 @@ package com.netscape.cms.servlet.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java index 6cd9e7afb..4931d7869 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java @@ -18,35 +18,79 @@ package com.netscape.cms.servlet.common; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cmmf.*; -import org.mozilla.jss.pkix.primitive.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.http.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.ICertificateRepository; -import com.netscape.certsrv.base.SessionContext; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import netscape.security.x509.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.security.*; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; +import java.util.Date; +import java.util.Hashtable; + +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ENUMERATED; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +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.asn1.UTF8String; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.pkcs11.PK11PubKey; +import org.mozilla.jss.pkix.cert.Certificate; +import org.mozilla.jss.pkix.cmc.CMCCertId; +import org.mozilla.jss.pkix.cmc.CMCStatusInfo; +import org.mozilla.jss.pkix.cmc.GetCert; +import org.mozilla.jss.pkix.cmc.OtherInfo; +import org.mozilla.jss.pkix.cmc.OtherMsg; +import org.mozilla.jss.pkix.cmc.PendInfo; +import org.mozilla.jss.pkix.cmc.ResponseBody; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmmf.RevRequest; +import org.mozilla.jss.pkix.cms.ContentInfo; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.cms.SignerInfo; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.ISharedToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +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.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; /** * Utility CMCOutputTemplate diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java index 523a1f94b..7f89297cd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java @@ -23,9 +23,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java index 4a5b767ef..bf4c3cf6c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java @@ -20,11 +20,11 @@ package com.netscape.cms.servlet.common; import java.io.File; import java.io.IOException; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java index 486e28276..a76b1c753 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java @@ -18,7 +18,7 @@ package com.netscape.cms.servlet.common; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java index d05f2cefa..b5c6e3c79 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java @@ -18,22 +18,27 @@ package com.netscape.cms.servlet.common; -import java.io.*; -import java.util.*; - +import java.io.File; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Hashtable; import java.util.Locale; +import java.util.StringTokenizer; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletOutputStream; - -import java.security.cert.X509Certificate; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; - +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.logging.ILogger; diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java index 0f13f9d74..ca5abf03e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java @@ -18,7 +18,6 @@ package com.netscape.cms.servlet.common; -import com.netscape.certsrv.logging.*; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java index 61c77287c..27f1d3a5a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java @@ -18,18 +18,20 @@ package com.netscape.cms.servlet.common; -import java.util.Vector; import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletContext; -import javax.servlet.ServletConfig; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.request.RequestStatus; /** * This represents a user request. diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java index 94fcffc55..4528ea7ed 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -18,18 +18,26 @@ package com.netscape.cms.servlet.common; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.math.BigInteger; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.StringWriter; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; + +import javax.servlet.ServletOutputStream; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java index d64e21755..ced37b93e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java @@ -20,9 +20,8 @@ package com.netscape.cms.servlet.common; import java.util.Enumeration; import java.util.Vector; -import java.util.Locale; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java index eda5a6dc2..11a4dbf92 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java @@ -18,9 +18,7 @@ package com.netscape.cms.servlet.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java index a9db8ec6d..6debd2c7f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java @@ -18,12 +18,14 @@ package com.netscape.cms.servlet.common; +import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.util.Enumeration; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java index 4157b320a..15456865f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java @@ -18,27 +18,46 @@ package com.netscape.cms.servlet.common; -import java.util.Locale; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.Date; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; +import java.util.Locale; + +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CryptoManager; +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.asn1.SET; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.pkix.cmc.CMCStatusInfo; +import org.mozilla.jss.pkix.cmc.OtherInfo; +import org.mozilla.jss.pkix.cmc.PendInfo; +import org.mozilla.jss.pkix.cmc.ResponseBody; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cms.ContentInfo; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.cms.SignerInfo; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; -import netscape.security.x509.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; -import org.mozilla.jss.crypto.DigestAlgorithm; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import java.io.*; -import java.security.*; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java index 3329ce7ec..798b7f0d4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java @@ -18,13 +18,13 @@ package com.netscape.cms.servlet.common; +import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.util.Enumeration; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.IArgBlock; -import com.netscape.certsrv.base.EBaseException; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java index 1e0afb328..ff3d4f8cf 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java @@ -19,10 +19,10 @@ package com.netscape.cms.servlet.common; import java.util.Locale; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.IArgBlock; -import com.netscape.certsrv.request.IRequest; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java index b3d2c493c..d08b83a83 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java @@ -19,10 +19,11 @@ package com.netscape.cms.servlet.common; import java.util.Locale; -import com.netscape.certsrv.authority.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.CMS; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java index eff3b073a..befacf83f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java @@ -19,10 +19,10 @@ package com.netscape.cms.servlet.common; import java.util.Locale; -import com.netscape.certsrv.authority.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.IArgBlock; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java index 6064880ce..1ae6ee459 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java @@ -19,12 +19,11 @@ package com.netscape.cms.servlet.common; import java.util.Locale; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.IArgBlock; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.base.IArgBlock; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java index 60dd865f0..ddd6f0a1d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java @@ -19,7 +19,8 @@ package com.netscape.cms.servlet.common; import java.util.Locale; -import com.netscape.certsrv.authority.*; + +import com.netscape.certsrv.authority.IAuthority; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java index cd82096a7..ce1a50824 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java @@ -18,18 +18,13 @@ package com.netscape.cms.servlet.common; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; +import java.util.Locale; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java b/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java index 9259a2c12..580909cbd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java @@ -18,13 +18,15 @@ package com.netscape.cms.servlet.common; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authorization.*; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java index 0b147c58d..b3fcb0ed4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -18,28 +18,45 @@ package com.netscape.cms.servlet.connector; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; - -import java.security.cert.*; - -import java.io.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.connector.*; - -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +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.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.AuthCredentials; - -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index daf595f81..c9e5a3396 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -17,31 +17,60 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.connector; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -//import java.security.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; - -import java.io.*; -import java.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.profile.*; - -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index 2f41efc14..c8c0df353 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -17,22 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.connector; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; +import java.io.IOException; +import java.io.OutputStream; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.io.*; - -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index 1e96bf948..5ced86d62 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -17,21 +17,27 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.connector; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.io.*; - -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java index 876cd2a04..a25092878 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java @@ -18,25 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; - -import com.netscape.cms.servlet.wizard.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AdminAuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index c205dad95..78bb94854 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -18,44 +18,52 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URLEncoder; +import java.security.cert.X509Certificate; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.cmsutil.xml.*; -import org.xml.sax.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; - -import com.netscape.cms.servlet.wizard.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; +import org.mozilla.jss.asn1.SEQUENCE; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.xml.XMLObject; public class AdminPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java index 18741bfb0..a62b22b7b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java @@ -18,23 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AgentAuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java index 77aa5bda3..ceab1d8d1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java @@ -18,23 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java index 7e2aedad2..779778081 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java @@ -18,37 +18,56 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.cert.CertificateEncodingException; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.util.Password; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PBEAlgorithm; import org.mozilla.jss.crypto.PrivateKey; -import com.netscape.cmsutil.crypto.*; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; +import org.mozilla.jss.util.Password; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class BackupKeyCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java index 9bbb09005..f5f4441a0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java @@ -18,15 +18,17 @@ package com.netscape.cms.servlet.csadmin; +import java.io.IOException; +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; +import org.apache.velocity.servlet.VelocityServlet; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public class BaseServlet extends VelocityServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java index 316c5706d..33a0ff693 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java @@ -18,32 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.URL; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import org.xml.sax.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.crypto.*; -import java.io.*; -import java.util.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.cmsutil.http.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class CAInfoPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java index 4aca6cec7..fb8c2d9cc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java @@ -18,8 +18,6 @@ package com.netscape.cms.servlet.csadmin; -import java.util.StringTokenizer; -import java.util.Vector; public class Cert { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java index bd4893915..30bcc78de 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java @@ -18,33 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.*; -import java.security.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.cmsutil.crypto.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.pkcs11.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; +import netscape.security.util.CertPrettyPrint; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class CertPrettyPrintPanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 1a67cf129..5e783b1a1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -18,38 +18,41 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.math.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.pkcs.PKCS10; +import netscape.security.util.CertPrettyPrint; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.InternalCertificate; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.crypto.X509Certificate; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class CertRequestPanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index dc8adaf97..3725149d5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -17,37 +17,52 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.security.*; -import java.security.cert.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.usrgrp.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.PrivateKey; -import com.netscape.cmsutil.xml.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import netscape.security.pkcs.*; -import netscape.ldap.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.math.BigInteger; +import java.util.Date; + +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import org.xml.sax.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.profile.CertInfoProfile; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.xml.XMLObject; public class CertUtil { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java index 829e46a44..41e583bed 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -17,23 +17,24 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class CheckIdentity extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java index 8017a893f..6deea2597 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java @@ -18,15 +18,15 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public abstract class ConfigBaseServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java index 6acb71273..d95c85d13 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java @@ -17,10 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.ssl.*; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; public class ConfigCertApprovalCallback diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java index 0a9d9a9cd..b9f129fd4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigCertReqServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java index 73150946b..0a0e5f08d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigCloneServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java index 56da3a232..0a54dd476 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java @@ -18,14 +18,15 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import java.io.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class ConfigDatabaseServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java index caee8c1d4..a3198414a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java @@ -18,30 +18,29 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; +import java.io.FileNotFoundException; +import java.io.IOException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.property.*; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import java.io.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.IncorrectPasswordException; -import com.netscape.cmsutil.password.*; +import org.mozilla.jss.util.Password; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.password.PlainPasswordReader; +import com.netscape.cmsutil.password.PlainPasswordWriter; public class ConfigHSMLoginPanel extends WizardPanelBase { private CryptoManager mCryptoManager = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java index 536dfe770..3cd548542 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java @@ -18,20 +18,26 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11Module; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmsutil.crypto.Module; public class ConfigHSMServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java index 892d24584..e8ca8a080 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigImportCertServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java index b22178b48..b960b2333 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java @@ -18,27 +18,17 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.profile.*; -import com.netscape.cmsutil.crypto.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import java.util.*; -import java.io.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmsutil.crypto.CryptoUtil; public class ConfigJoinServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java index e07ea3c3b..a28dbbdf1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java @@ -18,17 +18,19 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Vector; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.profile.*; -import java.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.CertInfoProfile; public class ConfigRootCAServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java index a99969880..daf14c9e2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java @@ -18,27 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.URL; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.crypto.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.crypto.*; -import java.net.*; -import java.io.*; -import java.util.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.xml.sax.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class CreateSubsystemPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java index bdd0b0d08..17a4bae66 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java @@ -18,27 +18,48 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Enumeration; +import java.util.Random; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv3; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import java.io.*; -import java.util.*; -import com.netscape.cmsutil.ldap.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.ldap.LDAPUtil; public class DatabasePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java index 03f8f2f86..8f1b61601 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class DatabaseServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java index cf25ab0e9..1e1b6dec2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java @@ -18,34 +18,27 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import org.xml.sax.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.xml.*; -import java.io.*; -import java.net.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.cmsutil.http.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import netscape.security.util.*; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.util.CertPrettyPrint; import netscape.security.x509.X509CertImpl; -import com.netscape.cmsutil.crypto.*; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class DisplayCertChainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java index 2c0184f26..f9725294c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class DisplayServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index fa5840dcd..9669ddb1f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -18,34 +18,40 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.math.BigInteger; +import java.net.URLEncoder; +import java.security.cert.X509Certificate; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.password.IPasswordStore; import com.netscape.cmsutil.util.Cert; -import com.netscape.cmsutil.util.*; -import com.netscape.cmsutil.password.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import java.net.*; -import java.io.*; -import java.math.*; -import java.security.cert.*; -import org.w3c.dom.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; +import com.netscape.cmsutil.util.Utils; public class DonePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java index ecc1e7e40..bfea4d644 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -17,38 +17,22 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.crypto.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.crypto.CryptoUtil; public class DownloadPKCS12 extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java index 3a9a36e91..24652db2e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -18,30 +18,27 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CertificateChain; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetCertChain extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index c47bfdc1c..d7d32f064 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -17,22 +17,31 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.password.IPasswordStore; +import com.netscape.cmsutil.xml.XMLObject; public class GetConfigEntries extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 7b3e69dc5..962f87bff 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -17,25 +17,33 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URL; +import java.net.URLDecoder; +import java.util.Locale; +import java.util.Random; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; public class GetCookie extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java index f2b4589e3..5957151ff 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java @@ -18,36 +18,35 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class GetDomainXML extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index 5f533fbe4..696669632 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -18,30 +18,23 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetStatus extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index ab6a1aa01..05882ad59 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -18,34 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.crypto.*; -import org.w3c.dom.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.X509Certificate; +import org.w3c.dom.Node; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.xml.XMLObject; public class GetSubsystemCert extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java index 442826c42..c7fcd6a41 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -17,22 +17,25 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetTokenInfo extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java index 21e64086e..4e98c4d4f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -18,41 +18,31 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.CertificateEncodingException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.util.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet retrieves the transport certificate from DRM. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java index 653387bf4..a00b0fb71 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java @@ -18,33 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.net.URL; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; - -import java.util.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; - -import netscape.security.x509.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class HierarchyPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index 9b4a3ae3f..d4f93a9b6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -18,36 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.math.BigInteger; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import org.mozilla.jss.asn1.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class ImportAdminCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java index 8a730d519..0c2e7fa0a 100755 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java @@ -18,36 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import org.mozilla.jss.asn1.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class ImportCAChainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 1d884856f..b480d854c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -18,49 +18,29 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mozilla.jss.CryptoManager; +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.PrivateKey.Type; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.Attribute; -import java.security.interfaces.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet imports DRM's transport certificate into TKS. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java index 5c89e5888..da2a3ccbd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java @@ -17,12 +17,23 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import netscape.ldap.*; -import com.netscape.cmsutil.password.*; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.cmsutil.password.IPasswordStore; /** * This object stores the values for IP, uid and group based on the cookie id in LDAP. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java index ca3879adb..c16238e78 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java @@ -18,13 +18,12 @@ package com.netscape.cms.servlet.csadmin; -import java.util.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java index ff8d08b85..efb765966 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -18,19 +18,25 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.template.ArgList; -import com.netscape.certsrv.template.ArgSet; -import com.netscape.cms.servlet.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; public class MainPageServlet extends CMSServlet { private static final String PROP_AUTHORITY_ID="authorityId"; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java index e5852cf59..38185a33b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java @@ -18,27 +18,31 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import com.netscape.certsrv.apps.CMS; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11Module; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.Module; public class ModulePanel extends WizardPanelBase { private CryptoManager mCryptoManager = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java index 9230ef5b7..840978466 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index 9e0b3c863..ec3686e92 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -18,34 +18,37 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; - -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import java.net.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; - -import netscape.security.x509.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class NamePanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index e7a1286c0..e63782a77 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -18,38 +18,36 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet creates a TPS user in the CA, diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index d9ee171d9..76f5a7495 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -18,35 +18,61 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.Principal; +import java.security.PublicKey; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPDN; +import netscape.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.*; -import java.math.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.PrivateKey.Type; -import org.mozilla.jss.pkix.primitive.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.BMPString; +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.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +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.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11Store; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; import org.mozilla.jss.pkix.primitive.Attribute; -import com.netscape.cms.servlet.wizard.*; -import netscape.ldap.*; -import java.security.interfaces.*; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; +import org.mozilla.jss.util.Password; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class RestoreKeyCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java index f336cd84c..854e8f10e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java @@ -17,36 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.util.Password; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.PrivateKey; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class SavePKCS12Panel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java index 4f0a19d8b..ac2025669 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java @@ -18,16 +18,18 @@ package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.net.*; +import java.net.URL; +import java.net.URLDecoder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class SecurityDomainLogin extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index 160cc74c3..90a6aeb07 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -18,27 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.crypto.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.crypto.*; -import java.net.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class SecurityDomainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java index b4ee2721c..3d3530f2e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.ISecurityDomainSessionTable; /** * This object stores the values for IP, uid and group based on the cookie id. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java index 92f2e2568..c3a1e325a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.TimerTask; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.logging.ILogger; public class SessionTimer extends TimerTask { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java index 48601629c..0e6a507a2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -18,29 +18,33 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.RSAPublicKey; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.cmsutil.crypto.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.security.interfaces.RSAPublicKey; -import java.util.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.pkcs11.PK11KeyPairGenerator; - -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.TokenException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class SizePanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java index ebcafe86b..c4373ebc3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -17,21 +17,24 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.net.*; -import org.w3c.dom.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class TokenAuthenticate extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java index d5c4f017d..93bcc1fb3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -18,37 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateConnector extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index 78763dfb2..a41fae5f6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -18,36 +18,42 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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 org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateDomainXML extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java index 77650dbfd..cf0f3a095 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -18,39 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateNumberRange extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java index b2b8b5d28..34074cb5f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -17,31 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateOCSPConfig extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java index cb3cf7543..7b1c99598 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java @@ -18,19 +18,20 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; +import org.apache.velocity.context.Context; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class WelcomePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java index 2871b9e41..1dbec3996 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class WelcomeServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index 2ec81f7b7..a2a7d5df5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -18,33 +18,49 @@ package com.netscape.cms.servlet.csadmin; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.ConnectException; +import java.net.URLEncoder; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; + import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; -import java.io.*; -import java.util.*; -import java.net.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cms.servlet.wizard.*; -import com.netscape.cms.servlet.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.Base64OutputStream; -import org.mozilla.jss.pkcs11.*; -import netscape.security.x509.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.http.*; -import org.w3c.dom.*; -import org.xml.sax.*; -import java.security.cert.*; -import java.security.*; -import netscape.ldap.*; - -import com.netscape.cmsutil.crypto.*; -import com.netscape.cms.servlet.wizard.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.pkcs11.PK11Store; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.wizard.IWizardPanel; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.xml.XMLObject; public class WizardPanelBase implements IWizardPanel { public static String PCERT_PREFIX = "preop.cert."; diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java index 75e02a24b..bbfa4b399 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java +++ b/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java @@ -17,9 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -import javax.servlet.http.*; -import javax.servlet.*; -import com.netscape.certsrv.apps.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; public class AdminRequestFilter implements Filter { diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java index da16dc01d..1ae44a646 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java +++ b/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java @@ -17,9 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -import javax.servlet.http.*; -import javax.servlet.*; -import com.netscape.certsrv.apps.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; public class AgentRequestFilter implements Filter { diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java index 3c11dbd55..8b53c6c61 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java +++ b/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java @@ -17,9 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -import javax.servlet.http.*; -import javax.servlet.*; -import com.netscape.certsrv.apps.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; public class EEClientAuthRequestFilter implements Filter { diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java index 69634506e..f66cf0872 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java +++ b/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java @@ -17,9 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.filter; -import javax.servlet.http.*; -import javax.servlet.*; -import com.netscape.certsrv.apps.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; public class EERequestFilter implements Filter { diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 1fe0e2f11..0e3b08c69 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -18,31 +18,30 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index fc1d9e8f4..fa762e963 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -18,31 +18,31 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index dcc687597..3b340672f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -18,31 +18,32 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java index e52bb44ed..ac567beea 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java @@ -18,31 +18,21 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.base.*; -import com.netscape.cms.servlet.common.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index 4d4607ba1..e01a124db 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -18,35 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java index 36d991937..fab14919a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -18,36 +18,32 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.Credential; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java index 47ed5d0e9..52bd8ef33 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -18,35 +18,29 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index 4c5f86c3e..27bf34180 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -18,35 +18,30 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index dbb5356cc..860dc901f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -17,36 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.key; -import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index 8119e4e37..356980ae6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -18,35 +18,29 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index 709f34337..9ce8585f7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -18,26 +18,13 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; +import java.util.Date; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; /** * Output a 'pretty print' of a Key Archival record diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index b1b46807a..f990e0dba 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -18,6 +18,20 @@ package com.netscape.cms.servlet.key; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; @@ -34,18 +48,6 @@ import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; import com.netscape.cmsutil.util.Cert; -import netscape.security.x509.X509CertImpl; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.math.BigInteger; -import java.util.Hashtable; -import java.util.Locale; -import java.util.Vector; /** * A class representing a recoverBySerial servlet. diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index 21e61ed7d..ea219d1c0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -18,31 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching search criteria diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index bd5bca4d5..fc9e6966a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -18,31 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching given public key material diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java index 1e8e02379..e0823d66b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java @@ -18,40 +18,33 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.math.*; -import java.util.Vector; -import java.io.InputStream; import java.io.IOException; -import javax.servlet.http.HttpServlet; +import java.math.BigInteger; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.util.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import java.security.cert.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java index 9bf6c0b66..ac2f94644 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java @@ -18,44 +18,42 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.math.*; -import java.util.Vector; -import java.io.InputStream; import java.io.IOException; -import javax.servlet.http.HttpServlet; +import java.math.BigInteger; +import java.security.cert.CRLException; +import java.security.cert.X509CRL; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.util.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import java.security.cert.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509ExtensionException; + +import org.mozilla.jss.CryptoManager; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java index bfed10291..1948d06cc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java @@ -18,40 +18,35 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.Vector; -import java.io.InputStream; import java.io.IOException; -import javax.servlet.http.HttpServlet; +import java.security.cert.X509CRLEntry; +import java.security.cert.X509Certificate; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.authority.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmsutil.util.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import java.security.cert.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 6885eb067..d54f02e95 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -18,35 +18,28 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IOCSPService; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java index df52d1256..9c36b18ed 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java @@ -18,40 +18,32 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.math.*; -import java.util.Vector; -import java.io.InputStream; import java.io.IOException; -import javax.servlet.http.HttpServlet; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.authority.*; -import com.netscape.cmsutil.util.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import java.security.cert.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 1054c794e..a55e6a754 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -18,40 +18,33 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.*; -import java.security.*; -import java.util.Vector; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.io.IOException; +import java.io.OutputStream; + import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServlet; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import netscape.security.x509.*; -import java.security.cert.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cmsutil.ocsp.*; -import com.netscape.certsrv.base.*; +import org.mozilla.jss.asn1.ASN1Util; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ocsp.IOCSPService; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.ResponseBytes; +import com.netscape.cmsutil.ocsp.ResponseData; +import com.netscape.cmsutil.ocsp.SingleResponse; +import com.netscape.cmsutil.ocsp.TBSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java index 5a1f7a432..2e0b007a6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java @@ -18,32 +18,28 @@ package com.netscape.cms.servlet.ocsp; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.math.*; -import java.util.Vector; -import java.io.InputStream; import java.io.IOException; -import javax.servlet.http.HttpServlet; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.util.*; - -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java index 0d9c1137c..1e44dad18 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java @@ -18,85 +18,59 @@ package com.netscape.cms.servlet.processors; -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Hashtable; - -import java.io.*; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.security.InvalidKeyException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; import java.security.MessageDigest; import java.security.PublicKey; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Hashtable; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.asn1.InvalidBERException; import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.pkix.cert.Certificate; import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.cms.servlet.*; - -import com.netscape.certsrv.apps.*; - -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.RequestId; - -import com.netscape.certsrv.authentication.*; -import com.netscape.cms.servlet.*; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import java.math.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import com.netscape.cms.servlet.processors.*; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java index 91867216b..27648758b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -18,39 +18,43 @@ package com.netscape.cms.servlet.processors; -import com.netscape.cms.servlet.base.*; -import com.netscape.cms.servlet.common.*; - -import java.io.*; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.security.InvalidKeyException; import java.security.cert.CertificateException; - -import netscape.security.x509.*; import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkix.crmf.CertReqMsg; import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.pkix.crmf.ProofOfPossession; import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.asn1.InvalidBERException; -import org.mozilla.jss.pkix.crmf.*; - -import com.netscape.certsrv.apps.*; - -import com.netscape.certsrv.request.IRequest; - -import com.netscape.certsrv.authentication.*; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.logging.ILogger; - -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.processors.PKIProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java index d74dbcd95..d021f6537 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java @@ -18,78 +18,8 @@ package com.netscape.cms.servlet.processors; -import com.netscape.cms.servlet.common.*; -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Hashtable; - -import java.io.*; - -import java.security.InvalidKeyException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.security.MessageDigest; -import java.security.PublicKey; - - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.InvalidBERException; -import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.RequestId; - -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import java.math.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java index c8db3e3d0..cc035033a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java @@ -18,87 +18,24 @@ package com.netscape.cms.servlet.processors; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Hashtable; - -import java.io.*; - -import java.security.InvalidKeyException; +import java.io.IOException; import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.security.MessageDigest; -import java.security.PublicKey; - - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.InvalidBERException; -import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.cms.servlet.*; - -import com.netscape.certsrv.apps.*; - -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.RequestId; - -import com.netscape.certsrv.authentication.*; -import com.netscape.cms.servlet.*; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.KeyGenInfo; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import java.math.*; - -import com.netscape.cms.servlet.processors.IPKIProcessor; -import com.netscape.cms.servlet.processors.PKIProcessor; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java index bcbe839c1..53d38455f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -18,86 +18,33 @@ package com.netscape.cms.servlet.processors; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Hashtable; - -import java.io.*; - -import java.security.InvalidKeyException; +import java.io.IOException; import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.security.MessageDigest; -import java.security.PublicKey; - - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.InvalidBERException; -import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.cms.servlet.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.RequestId; - -import com.netscape.certsrv.authentication.*; -import com.netscape.cms.servlet.*; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import java.math.*; - -import com.netscape.cms.servlet.processors.IPKIProcessor; -import com.netscape.cms.servlet.processors.PKIProcessor; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java index e1aea796b..625808d79 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -18,85 +18,29 @@ package com.netscape.cms.servlet.processors; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Hashtable; - -import java.io.*; - -import java.security.InvalidKeyException; +import java.io.IOException; import java.security.cert.CertificateException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.security.MessageDigest; -import java.security.PublicKey; - - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; +import java.util.Date; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.InvalidBERException; -import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.cms.servlet.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.RequestId; - -import com.netscape.certsrv.authentication.*; -import com.netscape.cms.servlet.*; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.logging.AuditFormat; - -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import java.math.*; - -import com.netscape.cms.servlet.processors.IPKIProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index eb4f603e7..2c6e83fb6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -18,22 +18,33 @@ package com.netscape.cms.servlet.profile; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cms.servlet.common.*; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java index 0090e6fdc..fe98814a6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -20,8 +20,12 @@ package com.netscape.cms.servlet.profile; import java.util.Enumeration; import java.util.Locale; -import javax.servlet.*; -import javax.servlet.http.*; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index 92cfa9bff..6c18cf412 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -18,26 +18,50 @@ package com.netscape.cms.servlet.profile; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cms.servlet.common.*; - -import java.security.cert.*; -import netscape.security.x509.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EDeferException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java index 1591d5fdf..e9ebabc50 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java @@ -18,23 +18,41 @@ package com.netscape.cms.servlet.profile; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cms.servlet.common.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Random; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index 7d0edbbc0..869443171 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -18,27 +18,35 @@ package com.netscape.cms.servlet.profile; -import com.netscape.cms.servlet.common.*; - -import java.io.*; -import java.util.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cms.servlet.common.*; - -import netscape.security.x509.*; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java index fe7936baf..ed2d5f68e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -18,28 +18,33 @@ package com.netscape.cms.servlet.profile; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.util.*; -import java.io.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authentication.AuthCredentials; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.certsrv.template.ArgString; +import com.netscape.certsrv.template.IArgValue; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 27280d4e5..9dbb01d25 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -18,26 +18,52 @@ package com.netscape.cms.servlet.profile; -import java.util.*; -import java.security.cert.*; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cms.servlet.common.*; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateEncodingException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.asn1.UTF8String; +import org.mozilla.jss.pkix.cmc.LraPopWitness; +import org.mozilla.jss.pkix.cmc.OtherInfo; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EDeferException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.template.ArgSet; import com.netscape.cms.servlet.common.AuthCredentials; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.cmc.*; - -import netscape.security.x509.*; +import com.netscape.cms.servlet.common.CMCOutputTemplate; +import com.netscape.cms.servlet.common.CMSRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index ce9e5a630..68a5de011 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -18,31 +18,59 @@ package com.netscape.cms.servlet.profile; -import java.util.*; import java.math.BigInteger; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cms.servlet.common.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.w3c.dom.Node; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EDeferException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.template.ArgList; +import com.netscape.certsrv.template.ArgSet; +import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.cms.servlet.common.AuthCredentials; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.util.*; -import org.w3c.dom.*; -import netscape.security.x509.*; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.util.Cert; +import com.netscape.cmsutil.xml.XMLObject; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java index c548d0db9..989710e30 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.profile; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import java.security.cert.*; -import com.netscape.certsrv.authentication.*; +import java.security.cert.X509Certificate; + +import javax.servlet.http.HttpServletRequest; + +import com.netscape.certsrv.authentication.ISSLClientCertProvider; public class SSLClientCertProvider implements ISSLClientCertProvider { private HttpServletRequest mRequest = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index bfa971052..60a8d16d5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -18,23 +18,48 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; - -import java.io.*; -import java.util.*; -import java.math.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.lang.reflect.Array; +import java.math.BigInteger; import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.lang.reflect.Array; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.certsrv.request.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.RawJS; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index 162946c74..e72e0feba 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -18,44 +18,68 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; - -import java.security.*; -import java.security.cert.*; -import netscape.security.pkcs.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.pkcs.PKCS7; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.asn1.ASN1Util; +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.asn1.SET; import org.mozilla.jss.crypto.DigestAlgorithm; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.pkix.cmc.CMCStatusInfo; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.ResponseBody; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java index a41264f70..0e3974a16 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java @@ -18,23 +18,12 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; +import java.util.Locale; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; - -import com.netscape.certsrv.request.*; -import com.netscape.cms.servlet.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.servlet.common.CMSTemplateParams; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java index 00039067b..459aca633 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java @@ -18,6 +18,9 @@ package com.netscape.cms.servlet.request; +import java.math.BigInteger; +import java.util.Locale; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; @@ -26,9 +29,6 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.key.KeyRecordParser; -import java.math.BigInteger; -import java.util.Locale; - /** * Output a 'pretty print' of a Key Archival request diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java index 6ad77a3f6..e90c3355d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -18,31 +18,66 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; +import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.authority.*; -import com.netscape.cms.servlet.cert.*; - -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.PresenceServerExtension; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.Extension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.cert.ImportCertsTemplateFiller; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index 899f4c309..f03fde857 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -18,31 +18,37 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index 68c4606df..7a3d15de7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -18,26 +18,33 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestVirtualList; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java index a9fc6aaac..29414ca5b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java @@ -18,22 +18,13 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Locale; -import com.netscape.certsrv.request.*; -import com.netscape.cms.servlet.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cms.servlet.common.CMSTemplateParams; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 0211c311e..5f40b7f33 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -18,29 +18,35 @@ package com.netscape.cms.servlet.request; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -//import netscape.security.provider.*; -import com.netscape.certsrv.common.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Date; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.authority.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java index 4cc2654b7..98d224af0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java @@ -17,37 +17,40 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.tks; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs11.*; - -import sun.misc.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import java.net.URLEncoder; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11SymKey; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.servlet.base.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cmsutil.util.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.tks.*; -import com.netscape.symkey.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.tks.ITKSAuthority; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.symkey.SessionKey; diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java b/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java index 199a4f4d1..9d67065d6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java @@ -17,15 +17,16 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.wizard; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import com.netscape.certsrv.property.*; +import com.netscape.certsrv.property.PropertySet; public interface IWizardPanel { diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java index 5de52fc28..d5290da0e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java @@ -17,19 +17,24 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.wizard; +import java.io.IOException; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; - -import java.io.*; -import java.util.*; +import org.apache.velocity.servlet.VelocityServlet; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cms.servlet.csadmin.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.cms.servlet.csadmin.Cert; +import com.netscape.cmsutil.crypto.Module; /** * wizard?p=[panel number]&op=usage <= usage in xml diff --git a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java index 0e29e1f0c..0c4dade84 100644 --- a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java +++ b/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.shares; -import java.lang.reflect.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + +import com.netscape.certsrv.kra.IJoinShares; /** * Use Java's reflection API to leverage CMS's diff --git a/pki/base/common/src/com/netscape/cms/shares/OldShare.java b/pki/base/common/src/com/netscape/cms/shares/OldShare.java index 8c3d75b22..4e92f76a0 100644 --- a/pki/base/common/src/com/netscape/cms/shares/OldShare.java +++ b/pki/base/common/src/com/netscape/cms/shares/OldShare.java @@ -17,11 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.shares; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.kra.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; -import java.lang.reflect.*; -import java.io.*; +import com.netscape.certsrv.kra.IShare; /** * Use Java's reflection API to leverage CMS's diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index afaa5c9fc..a760f4fc1 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -18,94 +18,160 @@ package com.netscape.cmscore.apps; -import java.util.*; -import java.math.*; -import java.text.*; -import java.io.*; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.Date; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.text.MessageFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.Timer; +import java.util.Vector; -import netscape.ldap.*; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.extensions.CertInfo; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.cms.servlet.csadmin.*; -import com.netscape.cmsutil.net.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.NoSuchAlgorithmException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.password.*; +import org.apache.xerces.parsers.DOMParser; +import org.mozilla.jss.CryptoManager.CertificateUsage; +import org.mozilla.jss.util.PasswordCallback; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.ACLEntry; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.apps.ICMSEngine; +import com.netscape.certsrv.apps.ICommandQueue; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.profile.IEnrollProfile; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.ITimeSource; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ILogEvent; -import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.common.Constants; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; - +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.csadmin.LDAPSecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SessionTimer; +import com.netscape.cmscore.authentication.AuthSubsystem; +import com.netscape.cmscore.authentication.VerifiedCert; +import com.netscape.cmscore.authentication.VerifiedCerts; +import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.base.ArgBlock; +import com.netscape.cmscore.base.FileConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.cert.CrlCachePrettyPrint; import com.netscape.cmscore.cert.CrlPrettyPrint; import com.netscape.cmscore.cert.ExtPrettyPrint; -import com.netscape.cmscore.policy.*; -import com.netscape.cmscore.time.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmscore.connector.*; -import com.netscape.cmscore.notification.*; -import com.netscape.cmscore.request.*; -import com.netscape.cmscore.cert.*; +import com.netscape.cmscore.cert.OidLoaderSubsystem; +import com.netscape.cmscore.cert.X500NameSubsystem; +import com.netscape.cmscore.connector.HttpConnection; +import com.netscape.cmscore.connector.HttpPKIMessage; +import com.netscape.cmscore.connector.HttpRequestEncoder; +import com.netscape.cmscore.connector.Resender; +import com.netscape.cmscore.dbs.CRLIssuingPointRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.RepositoryRecord; +import com.netscape.cmscore.jobs.JobsScheduler; +import com.netscape.cmscore.ldapconn.LdapAnonConnFactory; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapBoundConnection; +import com.netscape.cmscore.ldapconn.LdapConnInfo; +import com.netscape.cmscore.ldapconn.LdapJssSSLSocketFactory; import com.netscape.cmscore.logging.LogSubsystem; import com.netscape.cmscore.logging.Logger; import com.netscape.cmscore.logging.SignedAuditLogger; -import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmscore.notification.EmailFormProcessor; +import com.netscape.cmscore.notification.EmailResolverKeys; +import com.netscape.cmscore.notification.EmailTemplate; +import com.netscape.cmscore.notification.ReqCertSANameEmailResolver; +import com.netscape.cmscore.policy.GeneralNameUtil; +import com.netscape.cmscore.registry.PluginRegistry; +import com.netscape.cmscore.request.CertRequestConstants; +import com.netscape.cmscore.request.RequestSubsystem; import com.netscape.cmscore.security.JssSubsystem; -import com.netscape.cmscore.dbs.DBSubsystem; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.authentication.*; -import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.security.PWCBsdr; +import com.netscape.cmscore.security.PWsdrCache; +import com.netscape.cmscore.time.SimpleTimeSource; import com.netscape.cmscore.usrgrp.UGSubsystem; -import com.netscape.cmscore.request.RequestSubsystem; -import com.netscape.cmscore.jobs.JobsScheduler; -import com.netscape.osutil.*; - -import com.netscape.cmscore.cert.OidLoaderSubsystem; -import com.netscape.cmscore.cert.X500NameSubsystem; - -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.CryptoManager.CertificateUsage; -import netscape.security.pkcs.*; -import com.netscape.cmscore.security.*; -import com.netscape.cmscore.registry.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; +import com.netscape.osutil.OSUtil; public class CMSEngine implements ICMSEngine { private static final String ID = "MAIN"; diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java index 638eae082..e9f1f77aa 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java @@ -19,9 +19,8 @@ package com.netscape.cmscore.apps; import java.util.Hashtable; -import java.util.Enumeration; -import java.util.TimeZone; -import com.netscape.certsrv.apps.*; + +import com.netscape.certsrv.apps.ICommandQueue; /*--------------------------------------------------------------- diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java index 21a39ec8f..3eb897cc4 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java @@ -18,12 +18,8 @@ package com.netscape.cmscore.apps; -import java.io.File; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.base.EBaseException; -import netscape.ldap.*; -import java.io.*; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java index f04eb1869..b77c8a7da 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java @@ -18,16 +18,11 @@ package com.netscape.cmscore.apps; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.util.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; import java.io.File; -import java.lang.*; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmscore.util.OsSubsystem; public final class Upgrade { diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index b6cb0e6f7..d3793e344 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -18,13 +18,27 @@ package com.netscape.cmscore.authentication; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthManagerProxy; +import com.netscape.certsrv.authentication.AuthMgrPlugin; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EAuthMgrNotFound; +import com.netscape.certsrv.authentication.EAuthMgrPluginNotFound; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java index b9e0ede9d..c82142942 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java @@ -18,33 +18,25 @@ package com.netscape.cmscore.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.ra.*; -import com.netscape.cmscore.request.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cmscore.usrgrp.*; - -import com.netscape.cmscore.util.*; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.cmscore.usrgrp.ExactMatchCertUserLocator; +import com.netscape.cmscore.usrgrp.User; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java index 518e89f53..bf698ddad 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java @@ -18,23 +18,37 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; -import java.security.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.cmscore.base.SubsystemRegistry; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java index b2914686e..e9bcbcb6b 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java @@ -18,13 +18,16 @@ package com.netscape.cmscore.authentication; -import java.util.*; -import java.lang.Class; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java index 1c675b8ae..88dc72969 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java @@ -18,24 +18,30 @@ package com.netscape.cmscore.authentication; -import netscape.ldap.*; +import netscape.ldap.LDAPConnection; import netscape.ldap.LDAPEntry; -import java.util.*; -import java.lang.Class; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.ldap.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.usrgrp.*; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.ldapconn.LdapAnonConnFactory; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; +import com.netscape.cmscore.usrgrp.UGSubsystem; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java index 7aca9ae54..569275376 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java @@ -21,26 +21,31 @@ package com.netscape.cmscore.authentication; // ldap java sdk // cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import java.math.BigInteger; +import java.security.Principal; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; - import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; - -// cert server x509 imports -import netscape.security.x509.*; - -import java.security.*; -import java.security.cert.*; - -// java sdk imports. -import java.math.*; - -import com.netscape.cmscore.util.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java index 90963e324..69192f3f0 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java @@ -18,10 +18,10 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; +import java.util.Date; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java index 9ceae4487..ca0f63e55 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java @@ -18,9 +18,9 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; -import netscape.security.x509.*; + +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 9dd1ef57d..db1f593cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -18,14 +18,25 @@ package com.netscape.cmscore.authorization; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzManagerProxy; +import com.netscape.certsrv.authorization.AuthzMgrPlugin; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzException; +import com.netscape.certsrv.authorization.EAuthzMgrNotFound; +import com.netscape.certsrv.authorization.EAuthzMgrPluginNotFound; +import com.netscape.certsrv.authorization.IAuthzManager; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java index 2e0d19201..01519ccda 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java +++ b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java @@ -18,13 +18,21 @@ package com.netscape.cmscore.base; -import java.util.*; -import java.io.*; -import netscape.security.pkcs.*; -import java.security.*; +import java.io.IOException; import java.math.BigInteger; -import com.netscape.certsrv.base.*; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.SignatureException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import netscape.security.pkcs.PKCS10; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.KeyGenInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java index 79bb60c67..95e3ba674 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java @@ -18,10 +18,19 @@ package com.netscape.cmscore.base; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java index 93d88a550..2a7a1ef23 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java +++ b/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java @@ -18,15 +18,31 @@ package com.netscape.cmscore.base; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.CryptoToken; -import javax.swing.border.EmptyBorder; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java index f8dd97aa5..8eb6a829c 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java @@ -18,12 +18,25 @@ package com.netscape.cmscore.base; -import java.io.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import org.mozilla.jss.util.Base64OutputStream; -import com.netscape.certsrv.base.*; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotDefined; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISourceConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index e2584accf..98970df01 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -18,18 +18,17 @@ package com.netscape.cmscore.base; -import com.netscape.certsrv.base.*; -import java.util.Date; -import java.util.Enumeration; +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/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java index 9b192905f..25860cb02 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.base; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.ISourceConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java index 442a93671..83c74ebc1 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java @@ -18,9 +18,12 @@ package com.netscape.cmscore.base; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java index f95a61610..fdae65a5b 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java @@ -19,7 +19,8 @@ package com.netscape.cmscore.base; import java.util.Hashtable; -import com.netscape.certsrv.base.*; + +import com.netscape.certsrv.base.ISubsystem; public class SubsystemRegistry extends Hashtable { diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java index 9b6c3dfe0..ed20d76f3 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; +import java.util.Comparator; +import java.util.Date; + +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java index 882a38c0c..3168b92f2 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.PublicKey; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; +import java.security.cert.Certificate; + +import com.netscape.certsrv.base.ICertPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java index 6731ae35d..5a49d06e8 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java @@ -18,28 +18,51 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.osutil.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.logging.ILogger; - +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import netscape.security.pkcs.*; -import java.net.SocketException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Date; +import java.util.StringTokenizer; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import javax.servlet.http.HttpServletRequest; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.CertificateUsage; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.osutil.OSUtil; + /** * Utility class with assorted methods to check for * smime pairs, determining the type of cert - signature diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java index 979e0fdd8..effd86edd 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java @@ -18,12 +18,20 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.security.cert.*; -import org.mozilla.jss.asn1.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; +import java.io.IOException; +import java.io.OutputStream; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import org.mozilla.jss.asn1.ANY; +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 com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.cert.ICrossCertPairSubsystem; diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java index 693d881c5..232035250 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java @@ -18,15 +18,21 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; -import com.netscape.certsrv.apps.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; /** * This class will display the certificate content in predefined diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java index 2f7c08dee..1a3969b4e 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.util.*; -import java.security.*; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.ICRLPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 41020abd1..663585bf0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -18,22 +18,34 @@ package com.netscape.cmscore.cert; -import netscape.ldap.*; -import java.awt.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.cert.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.ldapconn.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttribute; +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; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.cert.ICrossCertPairSubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.IXcertPublisherProcessor; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java index 09aea0aca..ea9fabf24 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java @@ -18,17 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import java.security.*; -import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.Extension; + +import com.netscape.certsrv.base.IExtPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java index 7fd33f95f..b340ea236 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java @@ -18,15 +18,25 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.ObjectIdentifier; import java.security.cert.CertificateException; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; + +import netscape.security.extensions.CertificateRenewalWindowExtension; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.OIDMap; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java index 550756f31..3ace3c67b 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java @@ -18,10 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.IPrettyPrintFormat; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java index 026dbfcbc..4bf1147ac 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java @@ -18,9 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java index 1f2d16136..01e58fa15 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java @@ -18,15 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.provider.RSAPublicKey; -import com.netscape.cmscore.util.*; -import java.security.*; +import java.security.PublicKey; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java index 0efc09d33..539ec82b0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java @@ -18,15 +18,22 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.DirStrConverter; +import netscape.security.x509.X500NameAttrMap; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java index 208fc5e7f..5a607ee9d 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java @@ -18,17 +18,15 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.connector.*; -import com.netscape.cmscore.connector.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.certsrv.authority.*; -import java.util.*; -import java.io.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.net.ISocketFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java index 7db508fb6..e8b03542e 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java @@ -18,16 +18,20 @@ package com.netscape.cmscore.connector; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; +import java.io.IOException; +import java.util.StringTokenizer; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.apps.*; -import java.io.*; -import java.util.*; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.net.ISocketFactory; public class HttpConnection implements IHttpConnection { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java index 4ce3ed848..fefbe0f31 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java @@ -18,15 +18,23 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import java.util.*; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IHttpPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.net.ISocketFactory; public class HttpConnector implements IConnector { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java index b9e32cbd9..6e29f7efc 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java @@ -18,12 +18,19 @@ package com.netscape.cmscore.connector; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.OptionalDataException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.connector.IHttpPKIMessage; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.apps.*; import com.netscape.cmscore.util.Debug; -import java.util.*; -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java index 50b09fd2a..4a762dd8b 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java @@ -18,11 +18,15 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.cmscore.util.Debug; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OptionalDataException; -import java.io.*; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java index efc97c435..9272cc93f 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java @@ -18,14 +18,23 @@ package com.netscape.cmscore.connector; -import java.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Hashtable; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; public class LocalConnector implements IConnector { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java index 6a9703b69..ddd02f82b 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java @@ -18,8 +18,9 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IRemoteAuthority; public class RemoteAuthority implements IRemoteAuthority { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java index 825f4d564..b00950209 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.connector; -import java.util.*; - -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.request.IRequest; import com.netscape.cmscore.authentication.ChallengePhraseAuthentication; diff --git a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java index 78fddaf5c..ad89a34a1 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java @@ -18,19 +18,23 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmsutil.http.*; - -import java.util.Vector; +import java.io.IOException; import java.util.Enumeration; -import java.io.*; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmsutil.http.JssSSLSocketFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java index fbb652282..e2bee6d14 100644 --- a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java +++ b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java @@ -18,19 +18,21 @@ package com.netscape.cmscore.crmf; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.primitive.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Vector; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkcs11.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public class CRMFParser { diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java index 04529be69..d7899da3d 100644 --- a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java +++ b/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.crmf; -import org.mozilla.jss.pkix.crmf.*; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; public class PKIArchiveOptionsContainer { diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java index c0afbe742..8d6c325fa 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java index fcb806bb5..b8e5b73dd 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java index ad065f924..58342a557 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java index 8d7f19ca6..e1c07d302 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java @@ -18,18 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.crldb.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java index c2eba5acb..ba3ed5a7f 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java @@ -18,22 +18,22 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; - -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; /** * A class represents a CRL repository. It stores all the diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java index c444a45ac..83164aab5 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java index 308d801e3..877179947 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java @@ -18,17 +18,21 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.security.cert.Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java index 18b8c1bf5..e8d7df9c8 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java @@ -18,15 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java index 6b910ebbb..510da3c54 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java @@ -18,18 +18,21 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.Debug; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index df5fe2cf0..740948712 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -19,25 +19,41 @@ package com.netscape.cmscore.dbs; import java.math.BigInteger; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; import java.security.cert.Certificate; -import netscape.security.x509.*; -import netscape.ldap.*; +import java.util.Arrays; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.cert.*; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 660e385fe..adbae506c 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -18,12 +18,25 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IFilterConverter; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java index 03c86a219..efdbceec7 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java @@ -18,13 +18,34 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; + +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.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.controls.LDAPPersistSearchControl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.EDBNotAvailException; +import com.netscape.certsrv.dbs.EDBRecordNotFoundException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java index 475a77dcb..123fb8478 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java @@ -18,10 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java index b7f6cd616..c515b3305 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java @@ -18,12 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index 797dd8324..1c437896d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -18,24 +18,40 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.cert.*; +import java.math.BigInteger; +import java.util.Hashtable; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSchema; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPObjectClassSchema; +import netscape.ldap.LDAPSchema; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv3; +import netscape.security.x509.CertificateValidity; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.EDBNotAvailException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.PropConfigStore; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java index 8a3b3cba7..e5fc8c7bb 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java @@ -18,13 +18,25 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Arrays; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPControl; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPSortKey; +import netscape.ldap.controls.LDAPSortControl; +import netscape.ldap.controls.LDAPVirtualListControl; +import netscape.ldap.controls.LDAPVirtualListResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java index e073fe633..b8df1240c 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java @@ -18,10 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java index 8b0009479..d547a4459 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java @@ -18,11 +18,18 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.text.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java index 2293bea26..c5601a9bf 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java @@ -18,10 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java index 7a5e02a04..ff7764247 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java index 7b6fcdb8d..316c67381 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java @@ -18,21 +18,16 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -//import netscape.security.provider.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.ldap.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.keydb.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.KeyState; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java index 250e66e6c..a3a3a98c0 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java @@ -18,13 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRecordList; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java index eaaf3779f..1cbd3229d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java @@ -18,18 +18,21 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java index cc4298993..6d4e4688d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java @@ -18,20 +18,27 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.dbs.*; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRecordList; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java index 0630efa7c..7f13c8ed2 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java @@ -18,12 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.KeyState; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java index db5db02c9..909bf47e1 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java @@ -18,9 +18,12 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.AttributeNameHelper; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IFilterConverter; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java index 9006081f5..cdd9aeb77 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java @@ -18,11 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java index c3248ec12..605e2fadf 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java index 5c02b4014..cb5e4cb68 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java @@ -25,7 +25,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.Enumeration; import java.util.Vector; -import netscape.ldap.*; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java index 4d93f843a..f55248eec 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java @@ -18,16 +18,20 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.cert.*; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.cert.CertUtils; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java index ddf292b12..61beb4236 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java @@ -20,10 +20,11 @@ package com.netscape.cmscore.dbs; import java.math.BigInteger; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; /** * A class represents a replica repository. It diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java index df84b1156..858e7a639 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java @@ -18,18 +18,22 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.math.BigInteger; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** * A class represents a generic repository. It maintains unique diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java index 7aa63fa1d..7148eb1e1 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java @@ -18,16 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java index 436c8633e..67cc5c1cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java index 81ae72053..c55685692 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java @@ -18,18 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.io.Serializable; +import java.util.Date; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; + +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java index 6ee2c7bb2..fc0eb3866 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java @@ -18,16 +18,23 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cmscore.dbs.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java index e9fbd64e7..39fdac87e 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java @@ -18,10 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.NoSuchElementException; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java index 2ec203eb6..d14470a2b 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java @@ -18,10 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java index b7e386f77..963c2fdc9 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java @@ -18,14 +18,20 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.util.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java index 29e1db849..e1aa144b9 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java @@ -18,20 +18,30 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.util.*; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Set; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.util.Debug; +import com.netscape.certsrv.base.AttributeNameHelper; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java index aceb6f1bf..a5eb391d8 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java @@ -18,17 +18,17 @@ package com.netscape.cmscore.extensions; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; -import netscape.security.x509.Extension; import netscape.security.util.ObjectIdentifier; -import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.extensions.*; +import com.netscape.certsrv.extensions.EExtensionsException; +import com.netscape.certsrv.extensions.ICMSExtension; /** diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java index db618f6f0..a5378ced3 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java @@ -20,21 +20,21 @@ package com.netscape.cmscore.extensions; import java.io.IOException; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.extensions.EExtensionsException; +import com.netscape.certsrv.extensions.ICMSExtension; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.extensions.*; - -import netscape.security.x509.Extension; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.KeyUsageExtension; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerOutputStream; - -import com.netscape.cmscore.util.*; +import com.netscape.cmscore.util.Debug; public class KeyUsage implements ICMSExtension { diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java index b97168163..fda9069b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java @@ -18,11 +18,12 @@ package com.netscape.cmscore.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.util.StringTokenizer; +import java.util.Vector; -import java.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java index e8923eef8..59293ee1b 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java @@ -18,7 +18,6 @@ package com.netscape.cmscore.jobs; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java index a52f37526..13ef7f256 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java @@ -18,13 +18,15 @@ package com.netscape.cmscore.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.apps.*; - -import java.util.*; -import java.lang.*; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java index feddc69ad..a37fcf93d 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java @@ -18,18 +18,22 @@ package com.netscape.cmscore.jobs; -import java.util.*; -import java.io.*; -import java.lang.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.jobs.EJobsException; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.jobs.JobPlugin; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java index 598ae198b..c41f361ef 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java @@ -18,11 +18,10 @@ package com.netscape.cmscore.ldap; -import com.netscape.certsrv.base.IAttrSet; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java index 273a21c96..7574bf1b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java @@ -18,27 +18,21 @@ package com.netscape.cmscore.ldap; -import java.util.Hashtable; -import java.util.Enumeration; -import java.math.BigInteger; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.util.Debug; +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapBoundConnFactory; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.ldap.ILdapConnModule; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; public class LdapConnModule implements ILdapConnModule { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java index ae0e1a310..aaf9f35de 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java @@ -18,10 +18,10 @@ package com.netscape.cmscore.ldap; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index b8e62d896..c3abbdd5a 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -18,13 +18,16 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java index 0afd0ed43..8e890f06b 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java @@ -18,29 +18,43 @@ package com.netscape.cmscore.ldap; -import java.util.Hashtable; -import java.util.Enumeration; +import java.io.IOException; import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Hashtable; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; +import netscape.ldap.LDAPConnection; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapCrlMapper; +import com.netscape.certsrv.publish.ILdapMapper; +import com.netscape.certsrv.publish.ILdapPlugin; +import com.netscape.certsrv.publish.ILdapPublishModule; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.authority.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.apps.*; public class LdapPublishModule implements ILdapPublishModule { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java index d467bd957..6c1e1e8ad 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java @@ -18,25 +18,29 @@ package com.netscape.cmscore.ldap; +import java.math.BigInteger; +import java.security.cert.Certificate; import java.util.Hashtable; -import java.util.Enumeration; -import java.math.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.publish.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cmscore.dbs.CertRecord; public class LdapRequestListener implements IRequestListener { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java index d3872740e..16bc7f02b 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java @@ -18,13 +18,17 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.publish.ILdapRule; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java index d3646c7b8..a2a7e5583 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java @@ -18,13 +18,15 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmscore.util.AssertionException; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java index 6818a48bf..fc2ace23c 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java @@ -18,14 +18,8 @@ package com.netscape.cmscore.ldap; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ldap.*; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 488524e9d..a1e45a58a 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -18,35 +18,47 @@ package com.netscape.cmscore.ldap; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; +import java.math.BigInteger; +import java.security.cert.X509CRL; import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnModule; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.publish.ILdapMapper; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.certsrv.publish.ILdapRule; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.IXcertPublisherProcessor; +import com.netscape.certsrv.publish.LdapCertMapResult; +import com.netscape.certsrv.publish.MapperPlugin; +import com.netscape.certsrv.publish.MapperProxy; +import com.netscape.certsrv.publish.PublisherPlugin; +import com.netscape.certsrv.publish.PublisherProxy; +import com.netscape.certsrv.publish.RulePlugin; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.cmscore.dbs.CertRecord; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index fbc99608a..61323aad8 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java index 4be6bc33b..ba6707fb9 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; +import netscape.ldap.LDAPv2; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java index 667e68a85..b499dd07e 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java @@ -19,17 +19,15 @@ package com.netscape.cmscore.ldapconn; import java.util.Hashtable; + import netscape.ldap.LDAPConnection; import netscape.ldap.LDAPException; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmsutil.password.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.cmsutil.password.IPasswordStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index 31e3dca1c..e5322d274 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.ldap.ILdapBoundConnFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java index 8a6b98fc3..b7973e8ce 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import java.util.Properties; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPRebind; +import netscape.ldap.LDAPRebindAuth; +import netscape.ldap.LDAPSocketFactory; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java index ba037d854..70361f87f 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java @@ -18,11 +18,14 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPv2; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index b9f7d78eb..1b9898840 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -18,13 +18,19 @@ package com.netscape.cmscore.ldapconn; -import java.net.*; -import java.io.*; -import netscape.ldap.*; -import org.mozilla.jss.ssl.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import java.io.IOException; +import java.net.Socket; +import java.net.UnknownHostException; + +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; + +import org.mozilla.jss.ssl.SSLHandshakeCompletedEvent; +import org.mozilla.jss.ssl.SSLHandshakeCompletedListener; +import org.mozilla.jss.ssl.SSLSocket; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java index a7961e207..181ea34b0 100644 --- a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java +++ b/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java @@ -18,9 +18,6 @@ package com.netscape.cmscore.listeners; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java index e8c7032d1..46b42f047 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java index 0af38f168..7d7f817f8 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.logging; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java index 24336d308..faddc44d2 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -18,12 +18,12 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.CMS; +import java.util.Vector; + +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 9a9d4bd4f..0f1f93042 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -18,12 +18,19 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; +import com.netscape.certsrv.logging.ILogSubsystem; +import com.netscape.certsrv.logging.LogPlugin; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java b/pki/base/common/src/com/netscape/cmscore/logging/Logger.java index b15717ca4..3c97023a1 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/Logger.java @@ -18,11 +18,13 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; +import java.util.Properties; -import com.netscape.cmscore.util.*; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogQueue; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java index 5faa0baba..970516c1e 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java index 0bb99fb5b..013447cef 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java @@ -18,11 +18,6 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; - -import com.netscape.cmscore.util.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java index 4e5131311..7bef282b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SystemEvent; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java index b04186c3a..aa1fd15f2 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java @@ -18,11 +18,14 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.notification.*; -import java.util.*; -import java.lang.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java index 5f053c297..17febae1c 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java @@ -18,9 +18,11 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.notification.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.notification.IEmailResolverKeys; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java index 483426414..5c9e9ae0a 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java @@ -18,16 +18,15 @@ package com.netscape.cmscore.notification; -import java.lang.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailTemplate; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java index 28f0e364c..04dd9b5f8 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java @@ -18,16 +18,18 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java index 440e62e85..b592ea168 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java @@ -18,19 +18,31 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.notification.*; -import java.util.Enumeration; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ca.*; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java index fb3134ffa..d58cfe132 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 7a8ab4342..8f16548db 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -18,16 +18,36 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import java.util.Vector; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DNSName; +import netscape.security.x509.EDIPartyName; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.InvalidIPAddressException; +import netscape.security.x509.OIDName; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNameConfig; +import com.netscape.certsrv.policy.IGeneralNameUtil; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 63b28d995..95d668283 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -18,21 +18,35 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.text.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.policy.IKeyArchivalPolicy; +import com.netscape.certsrv.policy.IKeyRecoveryPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.policy.IPolicySet; +import com.netscape.certsrv.policy.IRenewalPolicy; +import com.netscape.certsrv.policy.IRevocationPolicy; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IPolicy; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.cmscore.util.*; +import com.netscape.cmscore.base.PropConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.request.ARequestQueue; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java index 3f421fca4..fde12d04f 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -18,10 +18,9 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.cmscore.util.Debug; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; public class JavaScriptRequestProxy { diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java index dfbcb0ef6..f1bb6457a 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 46a874291..a7f6f2218 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -18,12 +18,16 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java index 6ec1fa5c2..17a19e9d4 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -21,9 +21,6 @@ package com.netscape.cmscore.policy; import java.util.Enumeration; import java.util.Vector; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.policy.IExpression; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index 7b771442c..5e6458be2 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -18,12 +18,15 @@ package com.netscape.cmscore.policy; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.request.IRequest; +import java.util.Enumeration; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 25635e901..3af3321d1 100644 --- a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -18,12 +18,21 @@ package com.netscape.cmscore.profile; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.profile.*; +import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; public class ProfileSubsystem implements IProfileSubsystem { diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java index d0ed9324e..2766bcdbb 100644 --- a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java @@ -18,9 +18,9 @@ package com.netscape.cmscore.registry; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; +import java.util.Locale; + +import com.netscape.certsrv.registry.IPluginInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java index a424d8b73..cde61d665 100644 --- a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java @@ -18,10 +18,18 @@ package com.netscape.cmscore.registry; -import java.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.registry.ERegistryException; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; public class PluginRegistry implements IPluginRegistry { diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 8b06fffbe..97a2e44ea 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -18,32 +18,49 @@ package com.netscape.cmscore.request; -import java.util.*; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateException; -import java.security.cert.CRLException; -import java.math.BigInteger; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ByteArrayInputStream; - -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.base.IAttrSet; - -import com.netscape.certsrv.logging.ILogger; +import java.math.BigInteger; +import java.security.cert.CRLException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.util.Arrays; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Locale; +import java.util.Set; +import java.util.Vector; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.IAuthToken; -import com.netscape.certsrv.authentication.AuthToken; +import netscape.security.util.DerInputStream; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RevokedCertImpl; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509CertInfo; -import netscape.security.x509.RevokedCertImpl; import netscape.security.x509.X509ExtensionException; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateSubjectName; -import netscape.security.util.DerInputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.AgentApprovals; +import com.netscape.certsrv.request.IEnrollmentRequest; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestScheduler; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java index b81d5d211..f85beca0a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.request; -import java.util.Hashtable; import java.util.Date; +import java.util.Hashtable; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; diff --git a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java index cdc5a7eea..b72eb5f5a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java @@ -1,6 +1,9 @@ package com.netscape.cmscore.request; -import java.util.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * Subclass of Hashtable returned by IRequest.getExtDataInHashtable. Its diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java index ea60dc470..4583a1fac 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.request; +import com.netscape.certsrv.dbs.IDBAttrMapper; import com.netscape.certsrv.dbs.Modification; import com.netscape.certsrv.dbs.ModificationSet; -import com.netscape.certsrv.dbs.IDBAttrMapper; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.ldap.*; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.ldap.IRequestMod; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java index f390d436d..b748f23bb 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java @@ -19,33 +19,28 @@ package com.netscape.cmscore.request; import java.math.BigInteger; - import java.util.Date; import java.util.Enumeration; -import com.netscape.certsrv.dbs.ModificationSet; -import com.netscape.certsrv.dbs.IDBSearchResults; -import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; import com.netscape.certsrv.dbs.IDBSubsystem; -import com.netscape.cmscore.dbs.DBSubsystem; - -import com.netscape.certsrv.base.EBaseException; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.ldap.*; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestRecord; -import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; import com.netscape.certsrv.request.INotify; -import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestRecord; import com.netscape.certsrv.request.IRequestVirtualList; -import com.netscape.cmscore.request.ARequestQueue; -import com.netscape.certsrv.dbs.repository.IRepository; - +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.request.ldap.IRequestMod; +import com.netscape.cmscore.dbs.DBSubsystem; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java index 85995aaa3..46f69eaab 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java @@ -18,38 +18,39 @@ package com.netscape.cmscore.request; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.NotSerializableException; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectOutputStream; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamException; import java.math.BigInteger; - import java.util.Date; import java.util.Enumeration; -import java.util.Vector; import java.util.Hashtable; - +import java.util.Vector; import netscape.ldap.LDAPAttribute; import netscape.ldap.LDAPAttributeSet; import com.netscape.certsrv.base.EBaseException; - -import com.netscape.certsrv.dbs.*; -import com.netscape.cmscore.dbs.StringMapper; -import com.netscape.cmscore.dbs.DateMapper; -import com.netscape.cmscore.dbs.BigIntegerMapper; - -import com.netscape.certsrv.request.ldap.*; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestRecord; - +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.request.ldap.IRequestMod; +import com.netscape.cmscore.dbs.BigIntegerMapper; +import com.netscape.cmscore.dbs.DateMapper; +import com.netscape.cmscore.dbs.StringMapper; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java index c6ab7129e..1dafc2a7a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java @@ -17,17 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.request; -import java.util.*; -import java.io.*; -import java.math.*; +import java.math.BigInteger; +import java.util.Enumeration; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.dbs.*; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cmscore.dbs.Repository; +import com.netscape.cmscore.dbs.RepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java index 2e05e54eb..90df99248 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java @@ -18,19 +18,20 @@ package com.netscape.cmscore.request; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; - -import com.netscape.certsrv.logging.ILogger; - import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestSubsystem; +import com.netscape.certsrv.request.IService; import com.netscape.cmscore.dbs.DBSubsystem; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; - /** * RequestSubsystem diff --git a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java index 22d0b8c17..04f442a35 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index f702f2e87..c492feac0 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -18,24 +18,46 @@ package com.netscape.cmscore.security; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateException; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.Signature; +import java.util.Date; + +import netscape.security.util.DerInputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.CertificateAlgorithmId; +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.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java index f9d8114cd..d0df7d1a9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java @@ -18,42 +18,88 @@ package com.netscape.cmscore.security; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.KeyPairGenerator; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.math.BigInteger; +import java.net.SocketException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.util.DN; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.CryptoManager.UserCertConflictException; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11SecureRandom; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import org.mozilla.jss.ssl.SSLServerSocket; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.util.IncorrectPasswordException; import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.ConsolePasswordCallback; -import org.mozilla.jss.util.IncorrectPasswordException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePair; +import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.security.*; -import java.util.*; -import java.net.*; -import java.io.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateEncodingException; -import netscape.security.x509.*; -import java.security.cert.CertificateException; -import org.mozilla.jss.CryptoManager.NotInitializedException; -import org.mozilla.jss.CryptoManager.NicknameConflictException; -import org.mozilla.jss.CryptoManager.UserCertConflictException; -import org.mozilla.jss.pkcs11.PK11SecureRandom; -import com.netscape.cmscore.cert.*; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; import com.netscape.cmscore.util.Debug; -import netscape.ldap.util.*; -import com.netscape.cmsutil.crypto.*; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java index 4f551cd26..753c6cc46 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java @@ -18,48 +18,103 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.asn1.*; - -import java.security.PrivateKey; -import java.security.*; -import java.util.*; -import java.security.interfaces.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; import java.io.IOException; -import java.io.*; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.crypto.*; -import java.math.*; -//import java.security.cert.*; -import org.mozilla.jss.crypto.X509Certificate; -//import netscape.security.provider.DSAPublicKey; -// ADDED next line by MLH on 1/9/99 -// REMOVED the line added by MLH on 1/10/99 -//import netscape.security.provider.RSAPublicKey; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.CryptoManager.NotInitializedException; +import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Enumeration; +import java.util.Vector; + +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.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.Extensions; +import netscape.security.x509.GeneralName; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.URIName; +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.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; import org.mozilla.jss.CryptoManager.UserCertConflictException; -import java.security.cert.CertificateEncodingException; -import netscape.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmsutil.crypto.*; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Header; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +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.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11ECPublicKey; +import org.mozilla.jss.util.Base64OutputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.dbs.BigIntegerMapper; +import com.netscape.cmscore.dbs.DateMapper; +import com.netscape.cmscore.dbs.X509CertImplMapper; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java index 279a62347..efeade921 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java index 299b9f6e6..48b19f62b 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java @@ -18,20 +18,17 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.SecretDecoderRing; -import org.mozilla.jss.crypto.TokenException; -import java.io.*; -import java.lang.*; -import java.util.Hashtable; -import java.util.StringTokenizer; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; import org.mozilla.jss.util.PasswordCallbackInfo; -import com.netscape.cmscore.base.*; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.JDialogPasswordCallback; /* diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java index afba0a4db..3be636912 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.security; -import java.lang.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; public class diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index 309978f28..12412f59c 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -18,22 +18,31 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.SecretDecoderRing.KeyManager; -import org.mozilla.jss.SecretDecoderRing.Encryptor; -import org.mozilla.jss.SecretDecoderRing.Decryptor; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.Base64OutputStream; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.EBaseException; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.SecretDecoderRing.Decryptor; +import org.mozilla.jss.SecretDecoderRing.Encryptor; +import org.mozilla.jss.SecretDecoderRing.KeyManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.util.Base64OutputStream; +import org.mozilla.jss.util.Password; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java index c6f2f7cbc..1ac8f0ea7 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java index 0967b0930..eab48bdf5 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java index d38b35b44..ac7eb2ad9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java index 4244d0212..bd630de84 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java index 22e4044ac..f462c2e22 100644 --- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java +++ b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java @@ -25,7 +25,7 @@ package com.netscape.cmscore.selftests; // import statements // /////////////////////// -import java.util.*; +import java.util.StringTokenizer; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 5c75d8fd5..209be47df 100644 --- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -25,13 +25,29 @@ package com.netscape.cmscore.selftests; // import statements // /////////////////////// -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.ListIterator; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTest; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java index 0427d82d7..082ae4bef 100644 --- a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java +++ b/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java @@ -18,8 +18,9 @@ package com.netscape.cmscore.time; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Date; + +import com.netscape.certsrv.base.ITimeSource; public class SimpleTimeSource implements ITimeSource { diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java index f9312c1c4..4bf348ff7 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java @@ -18,14 +18,17 @@ package com.netscape.cmscore.usrgrp; -import netscape.ldap.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; +import java.security.cert.X509Certificate; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java index 0fb4d0d98..a7aeeb1ed 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java @@ -18,14 +18,17 @@ package com.netscape.cmscore.usrgrp; -import netscape.ldap.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; +import java.security.cert.X509Certificate; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java index 05aec23dc..79f60dbde 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java @@ -18,10 +18,13 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUsrGrp; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index d19cbf2d3..0c1180362 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -18,22 +18,40 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import java.lang.*; -import netscape.ldap.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.ldap.*; -import com.netscape.cmscore.util.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.usrgrp.IUsrGrp; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java index 5ecb4f169..c8eb780a0 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java @@ -18,14 +18,14 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.usrgrp.IUsrGrp; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/pki/base/common/src/com/netscape/cmscore/util/Debug.java index b9b794e9c..417f3159b 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/Debug.java +++ b/pki/base/common/src/com/netscape/cmscore/util/Debug.java @@ -18,13 +18,17 @@ package com.netscape.cmscore.util; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.util.*; - -import java.lang.*; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.cmsutil.util.Utils; public class Debug diff --git a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java index 61f6f49ec..5cb94fccd 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java @@ -18,7 +18,9 @@ package com.netscape.cmscore.util; -import java.io.*; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.io.PrintWriter; public class ExceptionFormatter { diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java index 968f9cb80..715559f84 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.lang.StringBuffer; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; public class FileAsString { diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java index 98a2e8422..37410533a 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java @@ -18,7 +18,8 @@ package com.netscape.cmscore.util; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java index a3cdcbdef..47bb62801 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java @@ -18,16 +18,24 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IConfigStore; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.base.*; -import com.netscape.osutil.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.SubsystemRegistry; +import com.netscape.osutil.LibC; +import com.netscape.osutil.OSUtil; +import com.netscape.osutil.ResourceLimit; +import com.netscape.osutil.Signal; +import com.netscape.osutil.SignalListener; +import com.netscape.osutil.UserID; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java index ed268df46..7cde72cce 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java @@ -18,20 +18,27 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.util.*; -import java.text.*; - -import java.security.*; -import java.security.cert.*; - -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; +import java.io.ByteArrayOutputStream; +import java.security.MessageDigest; +import java.security.cert.X509Certificate; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; public class PFXUtils { diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index d7ba11c02..77952d99e 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -18,13 +18,26 @@ package com.netscape.cmscore.util; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.table.*; -import com.netscape.certsrv.base.*; +import java.awt.Frame; +import java.awt.TextArea; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.table.AbstractTableModel; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java index ba07b2ca0..4cc393e06 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java @@ -18,15 +18,16 @@ package com.netscape.cmscore.util; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.table.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.certsrv.util.StatsEvent; /** * A class represents a internal subsystem. This subsystem diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java index e9b2a6cdd..a69a976cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java +++ b/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java @@ -18,9 +18,10 @@ package com.netscape.cmscore.util; -import com.netscape.certsrv.base.MessageFormatter; import java.util.Locale; +import com.netscape.certsrv.base.MessageFormatter; + /** * This object is used to easily create I18N messages for utility diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java index 8114413b0..5892adc39 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java +++ b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.util; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java index fff90ed8b..ac5fe2247 100644 --- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java @@ -1,49 +1,69 @@ package com.netscape.certsrv.app; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.CryptoManager.CertificateUsage; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; import com.netscape.certsrv.apps.ICMSEngine; import com.netscape.certsrv.apps.ICommandQueue; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.acls.IACL; -import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.repository.IRepositoryRecord; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.ICRLIssuingPoint; -import com.netscape.certsrv.ldap.ILdapConnInfo; import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.ldap.ILdapAuthInfo; import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; import com.netscape.certsrv.password.IPasswordCheck; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.policy.IGeneralNamesConfig; import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; import com.netscape.certsrv.policy.ISubjAltNameConfig; -import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.request.IRequest; import com.netscape.cmsutil.net.ISocketFactory; import com.netscape.cmsutil.password.IPasswordStore; -import java.util.*; -import java.math.BigInteger; -import java.security.cert.Certificate; -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; -import java.security.cert.X509CRL; -import java.security.NoSuchAlgorithmException; - -import netscape.security.x509.Extension; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.GeneralName; -import netscape.security.util.ObjectIdentifier; -import netscape.ldap.LDAPSSLSocketFactoryExt; -import netscape.ldap.LDAPConnection; -import netscape.ldap.LDAPException; - -import org.mozilla.jss.CryptoManager.CertificateUsage; -import org.mozilla.jss.util.PasswordCallback; - /** * Default engine stub for testing. */ diff --git a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java index 0df5ac1aa..3f83b3b05 100644 --- a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java +++ b/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java @@ -1,25 +1,23 @@ package com.netscape.certsrv.authentication; -import com.netscape.cmscore.test.CMSBaseTestCase; -import com.netscape.certsrv.app.CMSEngineDefaultStub; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.usrgrp.Certificates; -import junit.framework.Test; -import junit.framework.TestSuite; - +import java.io.IOException; import java.math.BigInteger; -import java.util.Hashtable; -import java.util.Date; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.io.IOException; +import java.util.Date; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.CertificateExtensions; +import junit.framework.Test; +import junit.framework.TestSuite; +import netscape.security.util.DerOutputStream; import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; import netscape.security.x509.PKIXExtensions; -import netscape.security.util.DerValue; -import netscape.security.util.DerOutputStream; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.app.CMSEngineDefaultStub; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.cmscore.test.CMSBaseTestCase; public class AuthTokenTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java index 222944a7e..28ea16691 100644 --- a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java +++ b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java @@ -1,10 +1,11 @@ package com.netscape.certsrv.request; -import com.netscape.cmscore.test.CMSBaseTestCase; +import java.util.Vector; + import junit.framework.Test; import junit.framework.TestSuite; -import java.util.Vector; +import com.netscape.cmscore.test.CMSBaseTestCase; public class AgentApprovalsTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java index 2d419b720..3fd6a96fd 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.dbs; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IElementProcessor; diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java index b533475a1..2095e1624 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java @@ -1,10 +1,16 @@ package com.netscape.cmscore.dbs; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.dbs.*; -import netscape.ldap.LDAPAttributeSet; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IFilterConverter; /** * A default stub ojbect for tests to extend. diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java index 6517c6bf1..e18cbf8a7 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java @@ -1,22 +1,22 @@ package com.netscape.cmscore.dbs; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; + +import junit.framework.Test; +import junit.framework.TestSuite; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; import com.netscape.certsrv.dbs.IDBObj; import com.netscape.certsrv.dbs.IDBRegistry; import com.netscape.certsrv.request.IRequestRecord; import com.netscape.cmscore.request.DBDynAttrMapperDefaultStub; -import com.netscape.cmscore.request.RequestRecord; import com.netscape.cmscore.test.CMSBaseTestCase; import com.netscape.cmscore.test.TestHelper; -import junit.framework.Test; -import junit.framework.TestSuite; -import netscape.ldap.LDAPAttributeSet; -import netscape.ldap.LDAPAttribute; - -import java.util.Enumeration; -import java.util.Collections; -import java.util.Arrays; public class DBRegistryTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java index d5a6088d4..aef21db14 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java @@ -1,11 +1,15 @@ package com.netscape.cmscore.dbs; -import com.netscape.certsrv.dbs.*; +import netscape.ldap.LDAPSearchResults; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IConfigStore; -import netscape.ldap.LDAPAttributeSet; -import netscape.ldap.LDAPSearchResults; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.ModificationSet; /** * A default stub ojbect for tests to extend. diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java index 15b265996..68f24d505 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java @@ -1,5 +1,9 @@ package com.netscape.cmscore.dbs; +import java.math.BigInteger; + +import netscape.ldap.LDAPConnection; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; @@ -7,9 +11,6 @@ import com.netscape.certsrv.dbs.EDBException; import com.netscape.certsrv.dbs.IDBRegistry; import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; -import netscape.ldap.LDAPConnection; - -import java.math.BigInteger; /** * A default stub ojbect for tests to extend. diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java index ad0572aab..edb703b13 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java @@ -1,11 +1,11 @@ package com.netscape.cmscore.dbs; -import com.netscape.certsrv.request.IRequestRecord; -import com.netscape.certsrv.request.RequestId; +import java.util.Enumeration; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBObj; - -import java.util.Enumeration; +import com.netscape.certsrv.request.IRequestRecord; +import com.netscape.certsrv.request.RequestId; /** * Default stub for RequestRecord tests. diff --git a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java index 3beda6a90..d68fbde80 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java @@ -1,11 +1,12 @@ package com.netscape.cmscore.request; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBDynAttrMapper; import com.netscape.certsrv.dbs.IDBObj; -import netscape.ldap.LDAPAttributeSet; - -import java.util.Enumeration; /** * Default testing stub for the IRequest interface. diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java index 4c8aaddaa..a72b10de6 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java @@ -1,14 +1,14 @@ package com.netscape.cmscore.request; -import junit.framework.Test; -import junit.framework.TestSuite; - import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; -import netscape.ldap.LDAPAttributeSet; +import junit.framework.Test; +import junit.framework.TestSuite; import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.IRequestRecord; import com.netscape.certsrv.request.RequestId; diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java index 177ccbbc3..7569ff20a 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java @@ -1,17 +1,11 @@ package com.netscape.cmscore.request; -import com.netscape.cmscore.test.CMSBaseTestCase; -import com.netscape.cmscore.dbs.RequestRecordDefaultStub; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.request.IRequestRecord; -import com.netscape.certsrv.request.RequestId; +import java.util.Hashtable; + import junit.framework.Test; import junit.framework.TestSuite; -import java.util.*; - -import netscape.ldap.LDAPAttributeSet; -import netscape.ldap.LDAPAttribute; +import com.netscape.cmscore.test.CMSBaseTestCase; public class ExtDataHashtableTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java index 884405362..f00eb8a74 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -1,23 +1,23 @@ package com.netscape.cmscore.request; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.base.IAttrSet; -import com.netscape.certsrv.authentication.IAuthToken; - +import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; -import java.util.Locale; import java.util.Hashtable; +import java.util.Locale; import java.util.Vector; -import java.math.BigInteger; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.RevokedCertImpl; import netscape.security.x509.CertificateExtensions; import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; /** * Default testing stub for the IRequest interface. diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java index 648f019f3..730928bdb 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java @@ -1,11 +1,11 @@ package com.netscape.cmscore.request; +import java.util.Date; + import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.request.ldap.IRequestMod; -import java.util.Date; - /** * Default testing stub for the IRequest interface. */ diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java index 02ffbc6b2..4ae5be9a6 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java @@ -1,13 +1,14 @@ package com.netscape.cmscore.request; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; + import junit.framework.Test; import junit.framework.TestSuite; -import com.netscape.cmscore.test.CMSBaseTestCase; -import com.netscape.certsrv.base.EBaseException; -import java.util.Enumeration; -import java.util.Arrays; -import java.util.Collections; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.cmscore.test.CMSBaseTestCase; public class RequestQueueTest extends CMSBaseTestCase { RequestStub request; diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java index 40f90a0da..ba3689fbc 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java @@ -1,17 +1,22 @@ package com.netscape.cmscore.request; -import com.netscape.certsrv.request.IRequestRecord; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.dbs.*; -import com.netscape.cmscore.test.TestHelper; -import com.netscape.cmscore.test.CMSBaseTestCase; -import com.netscape.cmscore.dbs.DBSubsystemDefaultStub; -import com.netscape.cmscore.dbs.DBRegistryDefaultStub; +import java.util.Hashtable; + import junit.framework.Test; import junit.framework.TestSuite; -import java.util.Hashtable; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.request.IRequestRecord; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cmscore.dbs.DBRegistryDefaultStub; +import com.netscape.cmscore.dbs.DBSubsystemDefaultStub; +import com.netscape.cmscore.test.CMSBaseTestCase; +import com.netscape.cmscore.test.TestHelper; public class RequestRecordTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java index 310469437..a088f0b47 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -1,34 +1,32 @@ package com.netscape.cmscore.request; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.util.Hashtable; -import java.util.Vector; +import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CRLException; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import java.security.cert.CRLException; -import java.math.BigInteger; -import java.io.IOException; +import java.util.Hashtable; +import java.util.Vector; + +import junit.framework.Test; +import junit.framework.TestSuite; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.PKIXExtensions; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.app.CMSEngineDefaultStub; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.IAuthToken; -import com.netscape.certsrv.usrgrp.Certificates; -import com.netscape.cmscore.test.TestHelper; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.request.RequestId; import com.netscape.cmscore.test.CMSBaseTestCase; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.RevokedCertImpl; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.BasicConstraintsExtension; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.CertificateSubjectName; -import netscape.security.x509.X500Name; +import com.netscape.cmscore.test.TestHelper; public class RequestTest extends CMSBaseTestCase { diff --git a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java b/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java index 14ed72090..7e1978e18 100644 --- a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java +++ b/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java @@ -1,5 +1,10 @@ package com.netscape.cmscore.test; +import java.security.cert.CertificateException; + +import junit.framework.TestCase; +import netscape.security.x509.X509CertImpl; + import com.netscape.certsrv.app.CMSEngineDefaultStub; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.dbs.EDBException; @@ -11,10 +16,6 @@ import com.netscape.cmscore.dbs.DBRegistryDefaultStub; import com.netscape.cmscore.dbs.DBSSessionDefaultStub; import com.netscape.cmscore.dbs.DBSubsystem; import com.netscape.cmscore.dbs.DBSubsystemDefaultStub; -import junit.framework.TestCase; -import netscape.security.x509.X509CertImpl; - -import java.security.cert.CertificateException; /** * The base class for all CMS unit tests. This sets up some basic stubs diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java b/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java index bdeaee273..78c207515 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java @@ -18,7 +18,13 @@ package com.netscape.cmstools; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java index 66a6a6cd8..aa8ffe9a4 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java @@ -18,15 +18,24 @@ package com.netscape.cmstools; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.security.PublicKey; +import java.security.Signature; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.crypto.ObjectNotFoundException; -import org.mozilla.jss.util.Base64InputStream; -import java.security.*; -import java.security.interfaces.*; -import netscape.security.x509.X509CertImpl; +import org.mozilla.jss.crypto.X509Certificate; /** * Tool for verifying signed audit logs diff --git a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java b/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java index d00fb6122..2bc96a2fd 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java @@ -18,7 +18,10 @@ package com.netscape.cmstools; -import java.io.*; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index 23c6547b4..7aa83dee9 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -18,34 +18,54 @@ package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; +import java.util.Date; + +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ANY; +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.asn1.SET; +import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; - -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.*; -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.cms.ContentInfo; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.cms.SignerInfo; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.util.Password; diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index 9c5b74c05..e7a23a85a 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -18,39 +18,72 @@ package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmmf.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; +import java.util.Date; +import java.util.StringTokenizer; + +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.ENUMERATED; +import org.mozilla.jss.asn1.GeneralizedTime; +import org.mozilla.jss.asn1.INTEGER; +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.asn1.UTF8String; +import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; - -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.*; -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; - -import com.netscape.cmsutil.util.*; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkix.cmc.CMCCertId; +import org.mozilla.jss.pkix.cmc.GetCert; +import org.mozilla.jss.pkix.cmc.LraPopWitness; +import org.mozilla.jss.pkix.cmc.OtherMsg; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.cmmf.RevRequest; +import org.mozilla.jss.pkix.cms.ContentInfo; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.cms.SignerInfo; +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.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import org.mozilla.jss.util.Password; + +import com.netscape.cmsutil.util.HMACDigest; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java index 04d3b4ddc..33fce1250 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java @@ -17,35 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; -import org.mozilla.jss.crypto.DigestAlgorithm; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +import netscape.security.util.CertPrettyPrint; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.asn1.ASN1Util; +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.asn1.SET; +import org.mozilla.jss.pkix.cert.Certificate; +import org.mozilla.jss.pkix.cmc.CMCStatusInfo; +import org.mozilla.jss.pkix.cmc.OtherInfo; +import org.mozilla.jss.pkix.cmc.PendInfo; +import org.mozilla.jss.pkix.cmc.ResponseBody; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; /** * Tool for parsing a CMC response diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java index 97d4f3551..85bdf5b1b 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java @@ -18,34 +18,48 @@ package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Date; + +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ENUMERATED; +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.asn1.SET; +import org.mozilla.jss.asn1.UTF8String; +import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; - -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.*; -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cms.ContentInfo; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.cms.SignerInfo; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.util.Password; diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index fafa40991..c2d221731 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -17,38 +17,57 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.io.*; -import java.util.Date; -import java.util.StringTokenizer; -import java.net.URL; -import java.net.URLConnection; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedReader; - +import java.net.URL; +import java.net.URLConnection; import java.net.URLEncoder; import java.security.KeyPair; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.mozilla.jss.util.Password; +import java.util.Date; + +import netscape.security.x509.X500Name; + import org.mozilla.jss.CryptoManager; +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.PrintableString; +import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; import org.mozilla.jss.crypto.KeyPairAlgorithm; -import netscape.security.provider.RSAPublicKey; -import netscape.security.pkcs.PKCS10; -//import java.security.Signature; -import netscape.security.x509.X500Name; -import netscape.security.util.BigInt; -import netscape.security.x509.X500Signer; -import java.io.ByteArrayOutputStream; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.SymmetricKey; +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.crmf.EncryptedKey; +import org.mozilla.jss.pkix.crmf.EncryptedValue; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; +import org.mozilla.jss.pkix.crmf.POPOSigningKey; +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 org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import com.netscape.cmsutil.util.*; +import com.netscape.cmsutil.util.HMACDigest; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java index 30f742c77..d92792253 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -17,24 +17,53 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.io.*; -import java.lang.*; -import java.math.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.cert.CertificateException; -import java.security.*; -import java.text.MessageFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; import java.util.regex.PatternSyntaxException; -import java.util.*; + import netscape.security.provider.RSAPublicKey; -import netscape.security.util.*; -import netscape.security.x509.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CertDatabaseException; import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.KeyDatabaseException; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InvalidKeyFormatException; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.ObjectNotFoundException; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.util.Password; -import org.mozilla.jss.*; /** * The DRMTool class is a utility program designed to operate on an LDIF file diff --git a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java index 2e61e748b..f7f90a52c 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java @@ -18,10 +18,11 @@ package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.FileInputStream; +import java.io.IOException; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java index 4f0eb55ca..af228b9bb 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java @@ -18,10 +18,12 @@ package com.netscape.cmstools; -import java.io.*; import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java index 3ce25778b..609132248 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java @@ -18,10 +18,19 @@ package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.ByteArrayOutputStream; +import java.net.InetAddress; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DNSName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.OIDName; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java b/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java index 8d28a04e0..52fefe579 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java @@ -18,10 +18,19 @@ package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.ByteArrayOutputStream; +import java.net.InetAddress; + +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DNSName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.OIDName; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java index 1cfc72456..0b9d3932d 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -17,28 +17,30 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import java.util.*; -import java.security.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -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.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.net.Socket; +import java.net.SocketException; +import java.util.StringTokenizer; -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLHandshakeCompletedEvent; +import org.mozilla.jss.ssl.SSLHandshakeCompletedListener; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.util.Password; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java index 30e033926..df18a3e52 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java @@ -17,27 +17,44 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import java.util.*; -import java.security.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.security.MessageDigest; +import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; -import netscape.security.x509.X500Name; -import com.netscape.cmsutil.ocsp.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.INTEGER; +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.SEQUENCE; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; + +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.CertID; +import com.netscape.cmsutil.ocsp.CertStatus; +import com.netscape.cmsutil.ocsp.GoodInfo; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.OCSPResponseStatus; import com.netscape.cmsutil.ocsp.Request; +import com.netscape.cmsutil.ocsp.ResponseBytes; +import com.netscape.cmsutil.ocsp.ResponseData; +import com.netscape.cmsutil.ocsp.RevokedInfo; +import com.netscape.cmsutil.ocsp.SingleResponse; +import com.netscape.cmsutil.ocsp.TBSRequest; +import com.netscape.cmsutil.ocsp.UnknownInfo; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index 150fe5105..05b0acf9d 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -17,41 +17,34 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.util.Date; -import java.util.StringTokenizer; -import java.net.URL; -import java.net.URLConnection; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.BufferedReader; import java.io.PrintStream; -import java.io.File; -import java.io.FileOutputStream; - -import java.net.URLEncoder; import java.security.KeyPair; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import org.mozilla.jss.util.Password; + +import netscape.security.x509.X500Name; + import org.mozilla.jss.CryptoManager; +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.PrintableString; +import org.mozilla.jss.asn1.SET; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.KeyPairGenerator; import org.mozilla.jss.crypto.KeyPairAlgorithm; -//import netscape.security.provider.RSAPublicKey; -import netscape.security.pkcs.PKCS10; -//import java.security.Signature; -import netscape.security.x509.X500Name; -import netscape.security.util.BigInt; -import netscape.security.x509.X500Signer; -import java.io.ByteArrayOutputStream; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs10.CertificationRequestInfo; +import org.mozilla.jss.pkix.primitive.AVA; +import org.mozilla.jss.pkix.primitive.Attribute; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; +import org.mozilla.jss.util.Password; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; -import com.netscape.cmsutil.util.*; +import com.netscape.cmsutil.util.HMACDigest; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java index 61058776f..38b3e162c 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java @@ -18,40 +18,40 @@ package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmmf.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.security.MessageDigest; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoStore; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; -import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PBEAlgorithm; +import org.mozilla.jss.crypto.SymmetricKey; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; - -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.*; -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; - -import com.netscape.cmsutil.util.*; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; +import org.mozilla.jss.util.Password; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java index 259fbf914..f914fab74 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java @@ -18,18 +18,29 @@ package com.netscape.cmstools; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.SecretDecoderRing.KeyManager; -import org.mozilla.jss.SecretDecoderRing.Encryptor; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import org.mozilla.jss.CryptoManager; import org.mozilla.jss.SecretDecoderRing.Decryptor; +import org.mozilla.jss.SecretDecoderRing.Encryptor; +import org.mozilla.jss.SecretDecoderRing.KeyManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; import org.mozilla.jss.util.Base64OutputStream; +import org.mozilla.jss.util.Password; /** * Tool for interacting with the PWcache diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java index 11acde7c7..84cc54cbe 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java @@ -18,12 +18,23 @@ package com.netscape.cmstools; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.security.cert.CertificateException; +import java.util.Enumeration; +import java.util.Locale; + +import netscape.security.util.CertPrettyPrint; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RDN; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java index 4d410f16f..b68f9fbc6 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java @@ -18,12 +18,25 @@ package com.netscape.cmstools; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.security.cert.CRLException; +import java.security.cert.CertificateException; +import java.util.Locale; + +import netscape.security.util.CrlPrettyPrint; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.OIDMap; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509ExtensionException; /** diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java b/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java index b4fdf5d04..d43b35337 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java @@ -17,38 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools; -import java.io.*; -import java.net.*; -import java.math.*; -import java.util.*; -import java.security.*; +import java.math.BigInteger; +import java.security.KeyPair; +import java.util.Date; +import java.util.Hashtable; -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.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.Base64OutputStream; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CertDatabaseException; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.pkcs11.PK11Token; - -import netscape.security.x509.*; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; -import com.netscape.cmsutil.ocsp.*; -import com.netscape.cmsutil.ocsp.Request; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.util.Password; /** * Tool used to test out signing a CRL diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java b/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java index 016839ae9..ade2b4679 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java @@ -18,35 +18,11 @@ package com.netscape.cmstools; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cert.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import java.util.Enumeration; + import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.crypto.SignatureAlgorithm; -import org.mozilla.jss.crypto.DigestAlgorithm; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkcs11.*; - -import org.mozilla.jss.*; - -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.pkcs.PKCS10; - -import java.security.*; -import java.security.cert.CertificateException; -import java.math.*; -import java.security.Principal; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.util.*; +import org.mozilla.jss.pkcs11.PK11Module; diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java index 422eb3a35..cbd3b7a3d 100644 --- a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java +++ b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java @@ -18,28 +18,35 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -//import netscape.security.provider.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -//import com.netscape.cmscore.kra.*; -import com.netscape.cmscore.cert.*; -import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; +import java.io.CharConversionException; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.crypto.BadPaddingException; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.IllegalBlockSizeException; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +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.TokenException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.IEncryptionUnit; +import com.netscape.cmscore.util.Debug; /** 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; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRANotify.java b/pki/base/kra/src/com/netscape/kra/KRANotify.java index f58201e03..33c16456d 100644 --- a/pki/base/kra/src/com/netscape/kra/KRANotify.java +++ b/pki/base/kra/src/com/netscape/kra/KRANotify.java @@ -18,9 +18,8 @@ package com.netscape.kra; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.kra.*; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.request.ARequestNotifier; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java b/pki/base/kra/src/com/netscape/kra/KRAPolicy.java index 73488e749..dee18da4c 100644 --- a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java +++ b/pki/base/kra/src/com/netscape/kra/KRAPolicy.java @@ -18,13 +18,17 @@ package com.netscape.kra; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cmscore.policy.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.cmscore.policy.GenericPolicyProcessor; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRAService.java b/pki/base/kra/src/com/netscape/kra/KRAService.java index 0913f1487..a312a655d 100644 --- a/pki/base/kra/src/com/netscape/kra/KRAService.java +++ b/pki/base/kra/src/com/netscape/kra/KRAService.java @@ -18,14 +18,15 @@ package com.netscape.kra; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 44fec8f32..f055442bc 100644 --- a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -18,34 +18,61 @@ package com.netscape.kra; -import java.lang.*; -import java.util.*; -import java.security.cert.X509Certificate; -import java.security.cert.*; -import java.math.*; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; import netscape.security.util.DerOutputStream; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.request.*; -import com.netscape.certsrv.apps.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.listeners.EListenersException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.ARequestNotifier; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestScheduler; +import com.netscape.certsrv.request.IRequestSubsystem; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.dbs.KeyRepository; +import com.netscape.cmscore.dbs.ReplicaIDRepository; +import com.netscape.cmscore.request.RequestSubsystem; /** diff --git a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index 1310fca76..31b613249 100644 --- a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -18,56 +18,51 @@ package com.netscape.kra; -import com.netscape.cmscore.util.Debug; -import java.util.StringTokenizer; -import java.util.Vector; -import java.io.IOException; import java.io.ByteArrayInputStream; - +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.math.BigInteger; -import java.security.*; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; import java.security.KeyPair; -import java.security.cert.CertificateException; -import netscape.security.util.*; -import netscape.security.util.BigInt; -import netscape.security.pkcs.*; -import netscape.security.x509.*; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; + import netscape.security.provider.RSAPublicKey; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkcs11.*; -import com.netscape.certsrv.common.*; -import com.netscape.cmscore.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.cert.*; -//import com.netscape.cmscore.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; -//for b64 encoding +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11SymKey; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; import org.mozilla.jss.util.Base64OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.io.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +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.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.util.Debug; /** * A class representing keygen/archival request procesor for requests diff --git a/pki/base/kra/src/com/netscape/kra/RecoveryService.java b/pki/base/kra/src/com/netscape/kra/RecoveryService.java index da3c3a87c..f364bf4ff 100644 --- a/pki/base/kra/src/com/netscape/kra/RecoveryService.java +++ b/pki/base/kra/src/com/netscape/kra/RecoveryService.java @@ -18,41 +18,57 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Hashtable; + +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkcs11.PK11RSAPublicKey; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +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.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.util.Debug; /** * A class represents recovery request processor. There diff --git a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java index baec75494..2c3ba716a 100644 --- a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java +++ b/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java @@ -18,32 +18,49 @@ package com.netscape.kra; -import org.mozilla.jss.util.Password; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.security.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.TokenCertificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -//import com.netscape.cmscore.kra.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; +import java.io.CharConversionException; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.BadPaddingException; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IllegalBlockSizeException; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PBEAlgorithm; +import org.mozilla.jss.crypto.PBEKeyGenParams; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.util.*; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.util.Password; -import org.mozilla.jss.crypto.*; -import com.netscape.cmscore.cert.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IJoinShares; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IShare; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; /** diff --git a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 043602a8a..f9ff8385d 100644 --- a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -18,43 +18,39 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import netscape.security.x509.X500Name; - -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkcs11.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.security.SecureRandom; +import java.util.Hashtable; + +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.pkcs11.PK11SymKey; +import org.mozilla.jss.util.Base64OutputStream; + +import com.netscape.certsrv.apps.CMS; +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.logging.ILogger; +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.cmscore.dbs.KeyRecord; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java index 385940c95..86b2dbfc7 100644 --- a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java +++ b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java @@ -17,27 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.kra; +import java.security.PublicKey; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +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.TokenException; -import java.util.*; -import com.netscape.certsrv.security.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import java.security.cert.X509Certificate; -import com.netscape.cmscore.cert.*; -import netscape.security.x509.*; -//import netscape.security.provider.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.kra.*; import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.PrivateKey; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.security.ITransportKeyUnit; import com.netscape.cmsutil.util.Cert; diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/pki/base/migrate/80/MigrateSecurityDomain.java index 33bbb72b1..7ecdcd1e6 100644 --- a/pki/base/migrate/80/MigrateSecurityDomain.java +++ b/pki/base/migrate/80/MigrateSecurityDomain.java @@ -16,14 +16,23 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -import com.netscape.cmsutil.xml.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmsutil.ldap.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; -import org.w3c.dom.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; + +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; + +import com.netscape.cmscore.base.FileConfigStore; +import com.netscape.cmscore.ldapconn.LdapJssSSLSocketFactory; +import com.netscape.cmsutil.ldap.LDAPUtil; +import com.netscape.cmsutil.xml.XMLObject; public class MigrateSecurityDomain { diff --git a/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java b/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java index 80c077daa..35d7d2f3d 100644 --- a/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java +++ b/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java @@ -18,9 +18,7 @@ package com.netscape.ocsp; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java index 2e5c16614..c8b531429 100644 --- a/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java +++ b/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java @@ -18,40 +18,54 @@ package com.netscape.ocsp; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.certsrv.ocsp.*; - -import org.mozilla.jss.pkix.primitive.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.util.Enumeration; +import java.util.Hashtable; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.ocsp.IOCSPService; +import com.netscape.certsrv.ocsp.IOCSPStore; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.security.ISigningUnit; import com.netscape.cmscore.util.Debug; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmsutil.ocsp.*; -import com.netscape.certsrv.apps.*; -import java.security.cert.*; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.KeyHashID; +import com.netscape.cmsutil.ocsp.NameID; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseData; /** diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java b/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java index 25a2b58b7..6c9032f11 100644 --- a/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java +++ b/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java @@ -18,7 +18,7 @@ package com.netscape.ocsp; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java index e0f593ac5..d1447de27 100644 --- a/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java +++ b/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java @@ -18,25 +18,36 @@ package com.netscape.ocsp; -import java.io.*; -import java.security.SignatureException; +import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; -import java.security.InvalidKeyException; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; +import java.security.SignatureException; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.CryptoToken; +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.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.util.IncorrectPasswordException; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ISigningUnit; import com.netscape.cmscore.security.JssSubsystem; - -import com.netscape.cmsutil.util.*; +import com.netscape.cmsutil.util.Cert; /** * OCSP signing unit based on JSS. 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; diff --git a/pki/base/symkey/src/com/netscape/symkey/SessionKey.java b/pki/base/symkey/src/com/netscape/symkey/SessionKey.java index a535a9fba..3a00c8351 100644 --- a/pki/base/symkey/src/com/netscape/symkey/SessionKey.java +++ b/pki/base/symkey/src/com/netscape/symkey/SessionKey.java @@ -19,9 +19,7 @@ package com.netscape.symkey; -import java.io.*; -import java.util.*; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.pkcs11.PK11SymKey; /** diff --git a/pki/base/tks/src/com/netscape/tks/TKSAuthority.java b/pki/base/tks/src/com/netscape/tks/TKSAuthority.java index cee28285e..0dd6876ea 100644 --- a/pki/base/tks/src/com/netscape/tks/TKSAuthority.java +++ b/pki/base/tks/src/com/netscape/tks/TKSAuthority.java @@ -17,39 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.tks; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.dbs.crldb.ICRLRepository; - - -import org.mozilla.jss.pkix.primitive.*; -import com.netscape.cmscore.util.Debug; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.apps.*; -import java.security.cert.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; public class TKSAuthority implements IAuthority, ISubsystem { protected ILogger mLogger = CMS.getLogger(); 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 { diff --git a/pki/base/util/src/netscape/net/NetworkClient.java b/pki/base/util/src/netscape/net/NetworkClient.java index 30ec006cd..c9d004d96 100644 --- a/pki/base/util/src/netscape/net/NetworkClient.java +++ b/pki/base/util/src/netscape/net/NetworkClient.java @@ -17,10 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.net; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; import java.net.Socket; import java.net.UnknownHostException; -import java.net.URL; /** * This is the base class for network clients. diff --git a/pki/base/util/src/netscape/net/TransferProtocolClient.java b/pki/base/util/src/netscape/net/TransferProtocolClient.java index 72a2e4e4c..23f133178 100644 --- a/pki/base/util/src/netscape/net/TransferProtocolClient.java +++ b/pki/base/util/src/netscape/net/TransferProtocolClient.java @@ -17,10 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.net; -import java.lang.StringIndexOutOfBoundsException; -import java.io.*; +import java.io.IOException; import java.util.Vector; -import netscape.net.NetworkClient; /** * This class implements that basic intefaces of transfer protocols. diff --git a/pki/base/util/src/netscape/net/smtp/SmtpClient.java b/pki/base/util/src/netscape/net/smtp/SmtpClient.java index f7aa72284..83ff6c095 100644 --- a/pki/base/util/src/netscape/net/smtp/SmtpClient.java +++ b/pki/base/util/src/netscape/net/smtp/SmtpClient.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.net.smtp; -import java.util.StringTokenizer; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.InetAddress; + import netscape.net.TransferProtocolClient; /** diff --git a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java b/pki/base/util/src/netscape/security/acl/AclEntryImpl.java index c0f6ef30b..6f1b77650 100644 --- a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java +++ b/pki/base/util/src/netscape/security/acl/AclEntryImpl.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.io.*; import java.security.Principal; -import java.security.acl.*; +import java.security.acl.AclEntry; +import java.security.acl.Group; +import java.security.acl.Permission; +import java.util.Enumeration; +import java.util.Vector; /** * This is a class that describes one entry that associates users diff --git a/pki/base/util/src/netscape/security/acl/AclImpl.java b/pki/base/util/src/netscape/security/acl/AclImpl.java index aba18b71a..5624b75f1 100644 --- a/pki/base/util/src/netscape/security/acl/AclImpl.java +++ b/pki/base/util/src/netscape/security/acl/AclImpl.java @@ -17,10 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.io.*; -import java.util.*; import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Acl; +import java.security.acl.AclEntry; +import java.security.acl.Group; +import java.security.acl.NotOwnerException; +import java.security.acl.Permission; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Vector; /** * An Access Control List (ACL) is encapsulated by this class. diff --git a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java b/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java index 635da594a..4f63712c0 100644 --- a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java +++ b/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Permission; /** * This class implements the principal interface for the set of all permissions. diff --git a/pki/base/util/src/netscape/security/acl/GroupImpl.java b/pki/base/util/src/netscape/security/acl/GroupImpl.java index 62a28c234..50c68bdb6 100644 --- a/pki/base/util/src/netscape/security/acl/GroupImpl.java +++ b/pki/base/util/src/netscape/security/acl/GroupImpl.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.security.*; -import java.security.acl.*; +import java.security.Principal; +import java.security.acl.Group; +import java.util.Enumeration; +import java.util.Vector; /** * This class implements a group of principals. diff --git a/pki/base/util/src/netscape/security/acl/OwnerImpl.java b/pki/base/util/src/netscape/security/acl/OwnerImpl.java index 41a03ff01..7ced59efd 100644 --- a/pki/base/util/src/netscape/security/acl/OwnerImpl.java +++ b/pki/base/util/src/netscape/security/acl/OwnerImpl.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.util.*; -import java.security.*; -import java.security.acl.*; +import java.security.Principal; +import java.security.acl.Group; +import java.security.acl.LastOwnerException; +import java.security.acl.NotOwnerException; +import java.security.acl.Owner; +import java.util.Enumeration; /** * Class implementing the Owner interface. The diff --git a/pki/base/util/src/netscape/security/acl/PermissionImpl.java b/pki/base/util/src/netscape/security/acl/PermissionImpl.java index f60002388..bfd8861cb 100644 --- a/pki/base/util/src/netscape/security/acl/PermissionImpl.java +++ b/pki/base/util/src/netscape/security/acl/PermissionImpl.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.Principal; -import java.security.acl.*; +import java.security.acl.Permission; /** * The PermissionImpl class implements the permission diff --git a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java b/pki/base/util/src/netscape/security/acl/PrincipalImpl.java index 9f51b3947..c2779abea 100644 --- a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java +++ b/pki/base/util/src/netscape/security/acl/PrincipalImpl.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.*; +import java.security.Principal; /** * This class implements the principal interface. diff --git a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java b/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java index dc0da6f3d..fa9c75bd3 100644 --- a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java +++ b/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.acl; -import java.security.*; +import java.security.Principal; /** * This class implements a group of principals. diff --git a/pki/base/util/src/netscape/security/extensions/AccessDescription.java b/pki/base/util/src/netscape/security/extensions/AccessDescription.java index 668d2fc89..89b4d829b 100644 --- a/pki/base/util/src/netscape/security/extensions/AccessDescription.java +++ b/pki/base/util/src/netscape/security/extensions/AccessDescription.java @@ -17,16 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.*; -import java.util.*; +import java.io.Serializable; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.GeneralName; public class AccessDescription implements Serializable { diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java index 62bd8aab8..c092d954c 100644 --- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -18,16 +18,24 @@ package netscape.security.extensions; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.URIName; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertInfo.java b/pki/base/util/src/netscape/security/extensions/CertInfo.java index 05dfb7de1..c2dcd8f7e 100644 --- a/pki/base/util/src/netscape/security/extensions/CertInfo.java +++ b/pki/base/util/src/netscape/security/extensions/CertInfo.java @@ -18,12 +18,21 @@ package netscape.security.extensions; -import netscape.security.x509.*; +import java.io.IOException; import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.Date; -import java.security.*; -import java.security.cert.*; -import java.io.*; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +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.X500Name; +import netscape.security.x509.X509CertInfo; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java index a926bf3de..bb1ad3a2f 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -18,16 +18,18 @@ package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Date; +import java.util.Enumeration; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; /** diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java index d2bd1d9c3..39c87407d 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java @@ -18,16 +18,12 @@ package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.*; -import java.util.*; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.GeneralName; /** * This represents the CertificateScopeOfUse extension diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java index de272a165..fe97a9046 100644 --- a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java +++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java @@ -17,16 +17,19 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** * This represents the CertificateScopeOfUse extension diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java index 6fedd3af9..7d6ae9d2b 100644 --- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -18,11 +18,19 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java index f756a4c0b..3e1743dd1 100644 --- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -17,21 +17,26 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.util.Hashtable; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.StringTokenizer; +import java.security.cert.CertificateException; import java.text.DateFormat; import java.text.ParseException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.security.cert.CertificateException; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AttributeNameEnumeration; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java index 0d2bf3455..46d7ae2f5 100644 --- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -18,13 +18,20 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; -import java.math.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Array; +import java.security.cert.CertificateException; +import java.util.Enumeration; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** * RFC3280: diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/pki/base/util/src/netscape/security/extensions/KerberosName.java index 4b820e0b4..c60ceb0de 100644 --- a/pki/base/util/src/netscape/security/extensions/KerberosName.java +++ b/pki/base/util/src/netscape/security/extensions/KerberosName.java @@ -19,15 +19,15 @@ package netscape.security.extensions; import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; +import java.util.Vector; -import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This represents a KerberosName as defined in diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java index 0d7248d0b..e974e92ef 100644 --- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -21,11 +21,15 @@ package netscape.security.extensions; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; /** * NSCertTypeExtension diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index 5d6f38bc8..1010ca262 100644 --- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -18,11 +18,17 @@ package netscape.security.extensions; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import java.util.*; -import java.io.*; +import java.util.Enumeration; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java index bbef2dca2..1b1808183 100644 --- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -17,12 +17,21 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.extensions; -import java.util.*; -import java.io.*; -import java.security.cert.Certificate; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; + +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.CertAttrSet; +import netscape.security.x509.Extension; public class PresenceServerExtension extends Extension implements CertAttrSet { diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index e9c1394f4..685675063 100644 --- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -18,16 +18,24 @@ package netscape.security.extensions; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.*; -import java.util.*; - import java.security.cert.CertificateException; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.URIName; /** diff --git a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java b/pki/base/util/src/netscape/security/pkcs/ContentInfo.java index 91cc413bb..f09f4b621 100644 --- a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java +++ b/pki/base/util/src/netscape/security/pkcs/ContentInfo.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * A ContentInfo type, as defined in PKCS#7. diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10.java b/pki/base/util/src/netscape/security/pkcs/PKCS10.java index c07edbc2e..dc28c7e9c 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10.java @@ -17,23 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.io.IOException; -import java.security.cert.CertificateException; -import java.security.NoSuchAlgorithmException; +import java.io.PrintStream; import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; -import java.security.PublicKey; - +import java.security.cert.CertificateException; -import netscape.security.util.*; // DER +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.x509.AlgorithmId; -import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; import netscape.security.x509.X500Signer; -import netscape.security.x509.X500Signer; +import netscape.security.x509.X509Key; /** * PKCS #10 certificate requests are created and sent to Certificate diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java index cadfa0cef..7b2dea2c9 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java @@ -17,20 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.security.cert.CertificateException; -import netscape.security.util.*; -import netscape.security.x509.CertAttrSet; -import netscape.security.x509.OIDMap; -import netscape.security.x509.Extension; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import netscape.security.x509.ACertAttrSet; +import netscape.security.x509.CertAttrSet; import netscape.security.x509.Extensions; +import netscape.security.x509.OIDMap; /** diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java index 9e7e2f7a4..38ad19620 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java @@ -19,12 +19,14 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; -import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the PKCS10 attributes for the request. diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java index 6e64b1686..c31e12456 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java @@ -17,18 +17,25 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.math.BigInteger; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; import java.security.cert.CertificateException; -import java.security.*; +import java.security.cert.X509Certificate; +import java.util.Vector; -import netscape.security.util.*; +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.X509CertImpl; import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; /** * PKCS7 as defined in RSA Laboratories PKCS7 Technical Note. Profile diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java index 29d87caff..dfa5a728d 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java @@ -17,21 +17,26 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.*; -import java.util.Properties; -import java.math.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.math.BigInteger; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PrivateKey; import java.security.KeyFactory; -import java.security.Security; -import java.security.Provider; -import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.Provider; +import java.security.Security; import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Properties; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; /** * Holds a PKCS#8 key, for example a private key diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java index 17eee2010..683514a7f 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -19,15 +19,16 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Date; import java.util.Hashtable; + import netscape.security.util.DerEncoder; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; import netscape.security.x509.CertificateExtensions; -import java.security.cert.CertificateException; /** * Class supporting any PKCS9 attribute except diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java index c979e489c..aff0ee0f7 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java @@ -20,10 +20,11 @@ package netscape.security.pkcs; import java.io.IOException; import java.io.OutputStream; import java.util.Hashtable; + import netscape.security.util.DerEncoder; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java b/pki/base/util/src/netscape/security/pkcs/SignerInfo.java index e03c32190..d02fb03dd 100644 --- a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java +++ b/pki/base/util/src/netscape/security/pkcs/SignerInfo.java @@ -17,12 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.pkcs; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; import java.security.cert.X509Certificate; -import java.security.*; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerEncoder; +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.X500Name; diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/pki/base/util/src/netscape/security/provider/CMS.java index 62f0e1392..63a776b0b 100644 --- a/pki/base/util/src/netscape/security/provider/CMS.java +++ b/pki/base/util/src/netscape/security/provider/CMS.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; -import java.security.*; +import java.security.AccessController; +import java.security.Provider; /** * The CMS Security Provider. */ diff --git a/pki/base/util/src/netscape/security/provider/DSA.java b/pki/base/util/src/netscape/security/provider/DSA.java index 507627e15..a40bd0295 100644 --- a/pki/base/util/src/netscape/security/provider/DSA.java +++ b/pki/base/util/src/netscape/security/provider/DSA.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintStream; import java.math.BigInteger; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; @@ -26,20 +26,19 @@ import java.security.InvalidKeyException; import java.security.InvalidParameterException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.security.PublicKey; import java.security.PrivateKey; +import java.security.PublicKey; import java.security.SecureRandom; import java.security.Signature; import java.security.SignatureException; -import java.security.interfaces.*; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; -import netscape.security.x509.AlgIdDSA; +import netscape.security.util.DerValue; /** * The Digital Signature Standard (using the Digital Signature diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java index e97544a49..f2292e34c 100755 --- a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java +++ b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java @@ -17,20 +17,18 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.lang.*; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PublicKey; -import java.security.PrivateKey; import java.security.KeyFactorySpi; -import java.security.InvalidKeyException; +import java.security.PrivateKey; +import java.security.PublicKey; import java.security.interfaces.DSAParams; -import java.security.spec.DSAPublicKeySpec; import java.security.spec.DSAPrivateKeySpec; -import java.security.spec.KeySpec; +import java.security.spec.DSAPublicKeySpec; import java.security.spec.InvalidKeySpecException; -import java.security.spec.X509EncodedKeySpec; +import java.security.spec.KeySpec; import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; /** * This class implements the DSA key factory of the Sun provider. diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java index be5b44286..4b781fa15 100644 --- a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java +++ b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java @@ -17,23 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.Hashtable; import java.math.BigInteger; -import java.security.AlgorithmParameters; import java.security.AlgorithmParameterGenerator; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.InvalidParameterException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; import java.security.KeyPair; import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.ProviderException; import java.security.SecureRandom; import java.security.interfaces.DSAParams; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.InvalidParameterSpecException; import java.security.spec.DSAParameterSpec; +import java.security.spec.InvalidParameterSpecException; +import java.util.Hashtable; import netscape.security.x509.AlgIdDSA; diff --git a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java index 949e9ea62..cec2b97bb 100755 --- a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java +++ b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java @@ -21,13 +21,13 @@ import java.math.BigInteger; import java.security.AlgorithmParameterGeneratorSpi; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidParameterException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.security.InvalidParameterException; import java.security.SecureRandom; import java.security.spec.AlgorithmParameterSpec; -import java.security.spec.InvalidParameterSpecException; import java.security.spec.DSAParameterSpec; +import java.security.spec.InvalidParameterSpecException; /* * This class generates parameters for the DSA algorithm. It uses a default diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/pki/base/util/src/netscape/security/provider/DSAParameters.java index 4edf88490..70b7fa088 100755 --- a/pki/base/util/src/netscape/security/provider/DSAParameters.java +++ b/pki/base/util/src/netscape/security/provider/DSAParameters.java @@ -17,17 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; import java.math.BigInteger; import java.security.AlgorithmParametersSpi; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; -import netscape.security.util.DerValue; -import netscape.security.util.DerOutputStream; import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the parameter set used by the diff --git a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java index ab60554e6..f480ea08e 100644 --- a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java +++ b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java @@ -17,22 +17,19 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.math.BigInteger; -import java.security.InvalidKeyException; -import java.security.ProviderException; import java.security.AlgorithmParameters; +import java.security.InvalidKeyException; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; -import java.security.interfaces.DSAParams; -import netscape.security.x509.AlgIdDSA; import netscape.security.pkcs.PKCS8Key; -import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; -import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgIdDSA; /** * A PKCS#8 private key for the Digital Signature Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java index 9ebdc0dc0..c3a6896ce 100644 --- a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java +++ b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java @@ -17,22 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.math.BigInteger; -import java.security.InvalidKeyException; -import java.security.ProviderException; import java.security.AlgorithmParameters; +import java.security.InvalidKeyException; +import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; import java.security.spec.InvalidParameterSpecException; -import java.security.interfaces.DSAParams; -import netscape.security.x509.X509Key; -import netscape.security.x509.AlgIdDSA; import netscape.security.util.BigInt; -import netscape.security.util.DerValue; import netscape.security.util.DerInputStream; -import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.X509Key; /** * An X.509 public key for the Digital Signature Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/MD5.java b/pki/base/util/src/netscape/security/provider/MD5.java index 97bbac204..a3c12490d 100644 --- a/pki/base/util/src/netscape/security/provider/MD5.java +++ b/pki/base/util/src/netscape/security/provider/MD5.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.lang.*; -import java.security.*; +import java.security.DigestException; +import java.security.MessageDigestSpi; /** * The MD5 class is used to compute an MD5 message digest over a given diff --git a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java index 83dbc7f3d..6206b699c 100644 --- a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java +++ b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java @@ -17,18 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.security.InvalidKeyException; -import java.security.ProviderException; -import netscape.security.x509.AlgorithmId; -import netscape.security.util.BigInt; -import netscape.security.x509.X509Key; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerValue; +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.X509Key; /** * An X.509 public key for the RSA Algorithm. diff --git a/pki/base/util/src/netscape/security/provider/SHA.java b/pki/base/util/src/netscape/security/provider/SHA.java index 09fdf2dfa..2e5ac328e 100644 --- a/pki/base/util/src/netscape/security/provider/SHA.java +++ b/pki/base/util/src/netscape/security/provider/SHA.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.security.*; +import java.security.DigestException; +import java.security.MessageDigestSpi; /** * This class implements the Secure Hash Algorithm (SHA) developed by diff --git a/pki/base/util/src/netscape/security/provider/Sun.java b/pki/base/util/src/netscape/security/provider/Sun.java index 20e295caa..2ba6be90f 100644 --- a/pki/base/util/src/netscape/security/provider/Sun.java +++ b/pki/base/util/src/netscape/security/provider/Sun.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.io.*; -import java.util.*; -import java.security.*; +import java.security.Provider; /** * The SUN Security Provider. diff --git a/pki/base/util/src/netscape/security/provider/SystemIdentity.java b/pki/base/util/src/netscape/security/provider/SystemIdentity.java index ec06810ff..e9fadf26a 100644 --- a/pki/base/util/src/netscape/security/provider/SystemIdentity.java +++ b/pki/base/util/src/netscape/security/provider/SystemIdentity.java @@ -18,8 +18,12 @@ package netscape.security.provider; import java.io.Serializable; -import java.util.Enumeration; -import java.security.*; +import java.security.Certificate; +import java.security.Identity; +import java.security.IdentityScope; +import java.security.InvalidParameterException; +import java.security.KeyManagementException; +import java.security.PublicKey; /** * An identity. diff --git a/pki/base/util/src/netscape/security/provider/SystemSigner.java b/pki/base/util/src/netscape/security/provider/SystemSigner.java index ffce24019..3b5be37e8 100644 --- a/pki/base/util/src/netscape/security/provider/SystemSigner.java +++ b/pki/base/util/src/netscape/security/provider/SystemSigner.java @@ -17,8 +17,14 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.util.*; -import java.security.*; +import java.security.Certificate; +import java.security.IdentityScope; +import java.security.InvalidParameterException; +import java.security.KeyException; +import java.security.KeyManagementException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.Signer; /** * SunSecurity signer. diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java index 6fa19fa5b..22d253297 100644 --- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java +++ b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java @@ -17,14 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.provider; -import java.security.cert.*; import java.io.InputStream; +import java.security.cert.CRL; +import java.security.cert.CRLException; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactorySpi; import java.util.Collection; -import java.security.Provider; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import netscape.security.x509.X509CertImpl; + import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509ExtensionException; public class X509CertificateFactory extends CertificateFactorySpi { diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java index cacde77c8..5df6baef8 100644 --- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java +++ b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java @@ -17,8 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; -import sun.io.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUTF8; +import sun.io.CharToByteConverter; +import sun.io.CharToByteUTF8; /** * Maps a ASN.1 character string type to a CharToByte and ByteToChar converter. diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/pki/base/util/src/netscape/security/util/ArraySet.java index f6f43efd4..822b752ff 100644 --- a/pki/base/util/src/netscape/security/util/ArraySet.java +++ b/pki/base/util/src/netscape/security/util/ArraySet.java @@ -17,7 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * This class implements the Set interface, backed by an ArrayList. It is diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java index c42b457d0..0607ad2e8 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.ByteToCharConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 Printable String character set to unicode diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java index 717081be7..312b8a22b 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java @@ -16,11 +16,9 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; - -import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUnicodeBig; +import sun.io.ByteToCharUnicodeLittle; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; /** diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java index 57b678dd8..77165b7fe 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java @@ -17,7 +17,9 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import sun.io.*; +import sun.io.ByteToCharConverter; +import sun.io.ConversionBufferFullException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 UniversalString character set to unicode diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java index 1f2c78c6c..caf7e6481 100644 --- a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -18,16 +18,25 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; +import java.security.MessageDigest; import java.security.PublicKey; import java.security.cert.Certificate; -import java.security.MessageDigest; -import netscape.security.util.*; -import netscape.security.x509.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import java.text.DateFormat; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.TimeZone; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; /** diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java index 09b3afefe..970f7782f 100644 --- a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java +++ b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.CharToByteConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts a string of ASN.1 PrintableString characters to PrintableString diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java index 7bb851d4d..ba74a0d73 100644 --- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -18,12 +18,17 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CRLImpl; /** diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/pki/base/util/src/netscape/security/util/DerInputStream.java index 38564bf71..fb73b761e 100644 --- a/pki/base/util/src/netscape/security/util/DerInputStream.java +++ b/pki/base/util/src/netscape/security/util/DerInputStream.java @@ -17,12 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.InputStream; import java.io.IOException; -import java.io.EOFException; +import java.io.InputStream; import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.Vector; diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/pki/base/util/src/netscape/security/util/DerOutputStream.java index 618afc095..be42322fa 100644 --- a/pki/base/util/src/netscape/security/util/DerOutputStream.java +++ b/pki/base/util/src/netscape/security/util/DerOutputStream.java @@ -17,15 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.FilterOutputStream; import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.*; - -import java.util.Comparator; import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; import sun.io.CharToByteConverter; diff --git a/pki/base/util/src/netscape/security/util/DerValue.java b/pki/base/util/src/netscape/security/util/DerValue.java index bc2bf45e3..58ef8eccc 100644 --- a/pki/base/util/src/netscape/security/util/DerValue.java +++ b/pki/base/util/src/netscape/security/util/DerValue.java @@ -17,13 +17,14 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; - -import sun.io.ByteToCharConverter; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; import netscape.security.x509.AVAValueConverter; import netscape.security.x509.GenericValueConverter; +import sun.io.ByteToCharConverter; /** * Represents a single DER-encoded value. DER encoding rules are a subset diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java index 40e4b65df..2e57eac17 100644 --- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -18,15 +18,65 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Enumeration; +import java.util.ResourceBundle; +import java.util.Vector; + +import netscape.security.extensions.AccessDescription; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.CertificateScopeEntry; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.InhibitAnyPolicyExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.extensions.PresenceServerExtension; +import netscape.security.extensions.SubjectInfoAccessExtension; +import netscape.security.x509.Attribute; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CPSuri; +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.CRLDistributionPointsExtension; import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateIssuerExtension; +import netscape.security.x509.CertificatePoliciesExtension; +import netscape.security.x509.CertificatePolicyInfo; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.DisplayText; +import netscape.security.x509.Extension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.IssuingDistributionPoint; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.NoticeReference; +import netscape.security.x509.OIDMap; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.PolicyQualifierInfo; +import netscape.security.x509.PolicyQualifiers; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.Qualifier; +import netscape.security.x509.RDN; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.UserNotice; /** diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java index fed9637af..505db7a9b 100644 --- a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.util.StringTokenizer; diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java index 3522d2355..94a5d18c7 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; /** * This class will display the certificate content in predefined diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java index 8f24edd68..45b08206f 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java @@ -18,9 +18,10 @@ package netscape.security.util; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java index 880355fb5..669e4c222 100644 --- a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java @@ -18,14 +18,12 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; +import java.security.PublicKey; +import java.util.Locale; +import java.util.ResourceBundle; + import netscape.security.provider.RSAPublicKey; -import java.security.*; +import netscape.security.x509.X509Key; /** diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java index 5c1f25cec..b5ce1773c 100755 --- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/pki/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -22,8 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.cert.CertificateException; import java.util.Enumeration; -import netscape.security.util.DerValue; + import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * A plain certattr set used by pkcs10 to parse an unknown attribute. diff --git a/pki/base/util/src/netscape/security/x509/AVA.java b/pki/base/util/src/netscape/security/x509/AVA.java index 9609d790b..0614f41ca 100644 --- a/pki/base/util/src/netscape/security/x509/AVA.java +++ b/pki/base/util/src/netscape/security/x509/AVA.java @@ -20,12 +20,13 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.StringReader; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import sun.io.ByteToCharConverter; -import netscape.security.util.*; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import sun.io.ByteToCharConverter; /** diff --git a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java b/pki/base/util/src/netscape/security/x509/AVAValueConverter.java index 18de32c2a..87c386f11 100644 --- a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java +++ b/pki/base/util/src/netscape/security/x509/AVAValueConverter.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; import netscape.security.util.DerValue; diff --git a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java b/pki/base/util/src/netscape/security/x509/AlgIdDSA.java index a3e638ebc..ca0e858fb 100644 --- a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java +++ b/pki/base/util/src/netscape/security/x509/AlgIdDSA.java @@ -19,10 +19,12 @@ package netscape.security.x509; import java.io.IOException; import java.math.BigInteger; -import java.security.*; +import java.security.ProviderException; import java.security.interfaces.DSAParams; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/pki/base/util/src/netscape/security/x509/AlgorithmId.java index f3e72656d..289262615 100644 --- a/pki/base/util/src/netscape/security/x509/AlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/AlgorithmId.java @@ -17,11 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.security.*; -import java.util.Properties; - -import netscape.security.util.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.AlgorithmParameters; +import java.security.NoSuchAlgorithmException; + +import netscape.security.util.DerEncoder; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class identifies algorithms, such as cryptographic transforms, each diff --git a/pki/base/util/src/netscape/security/x509/Attribute.java b/pki/base/util/src/netscape/security/x509/Attribute.java index a5fa02245..9e39e4ead 100644 --- a/pki/base/util/src/netscape/security/x509/Attribute.java +++ b/pki/base/util/src/netscape/security/x509/Attribute.java @@ -17,17 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.*; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.StringReader; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import sun.io.ByteToCharConverter; - -import java.io.*; -import netscape.security.util.*; +import java.io.Serializable; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerEncoder; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * An attribute, as identified by some attribute ID, has some particular values. diff --git a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java index f8546d526..977977a89 100644 --- a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java +++ b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java @@ -18,7 +18,6 @@ package netscape.security.x509; import java.util.Vector; -import java.util.Enumeration; /** * <p>This class provides the Enumeration implementation used diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index 9b92c45c0..0da29e8ef 100644 --- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Authority Key Identifier Extension. diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 925e12faa..ed48d2d4d 100644 --- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Basic Constraints Extension. diff --git a/pki/base/util/src/netscape/security/x509/CPSuri.java b/pki/base/util/src/netscape/security/x509/CPSuri.java index e7094eaba..e802a8998 100644 --- a/pki/base/util/src/netscape/security/x509/CPSuri.java +++ b/pki/base/util/src/netscape/security/x509/CPSuri.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java index 6cbca4ad0..532e313a5 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java @@ -17,10 +17,25 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import org.mozilla.jss.asn1.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Template; +import org.mozilla.jss.asn1.ASN1Util; +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; /** * <pre> diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 0832c3dd9..6da6d586c 100644 --- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -17,14 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; /** * An extension that tells applications where to find the CRL for diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/pki/base/util/src/netscape/security/x509/CRLExtensions.java index 822361364..dc3c82d13 100755 --- a/pki/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CRLExtensions.java @@ -29,7 +29,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the CRL Extensions. diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java index 67cd98e55..44292ed1a 100755 --- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -24,7 +24,9 @@ import java.lang.reflect.Array; import java.math.BigInteger; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRL Number Extension. diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java index fff1d91cd..563c547c0 100644 --- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -20,10 +20,10 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRLReason Extension of CRL entry. diff --git a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java b/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java index 75d8d4a37..644bfe7e5 100644 --- a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java +++ b/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java @@ -18,13 +18,21 @@ package netscape.security.x509; import java.io.IOException; -import java.security.cert.X509Certificate; -import java.security.cert.CertificateException; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; import java.security.cert.CertificateEncodingException; -import java.security.*; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.util.Date; -import netscape.security.util.BigInt; import netscape.security.pkcs.PKCS10; diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 3759a2eaa..c7aae98d1 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the AlgorithmId for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateChain.java b/pki/base/util/src/netscape/security/x509/CertificateChain.java index c86b6dbc0..df9f01406 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateChain.java +++ b/pki/base/util/src/netscape/security/x509/CertificateChain.java @@ -16,9 +16,15 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.security.cert.*; -import netscape.security.pkcs.*; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.cert.X509Certificate; + +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; public class CertificateChain implements Serializable { diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java index 617fc93c0..37751c67f 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -29,7 +31,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index b8b8a3ec8..8d3c64f50 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -21,10 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.util.Enumeration; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java index 3c3afe3e2..f964a220d 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index 591032279..10cb45131 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index 8ed8cdc4d..9bca9f63e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -21,12 +21,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.util.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class defines the Certificate Policies Extension. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java index 0eb48dc45..c7dddb594 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java index f657d2f87..9556e2acf 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CertificatePolicyInformation ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java b/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java index 7ed76931e..7ae6ce102 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CertificatePolicyMap ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java b/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java index 9c1994e06..eaf215141 100644 --- a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java +++ b/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java @@ -20,7 +20,9 @@ package netscape.security.x509; import java.io.IOException; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the certificate policy set ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java index f14dd49bd..a802a4366 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.math.BigInteger; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the SerialNumber attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java index a45d35609..b79e2001e 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index 2162eb33c..fa44e2522 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -22,7 +22,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java index ad2865eb1..4c0ca8e8b 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java @@ -17,15 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.security.cert.*; +import java.io.Serializable; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the interval for which the certificate is valid. diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/pki/base/util/src/netscape/security/x509/CertificateVersion.java index fee1af65a..36daef86c 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java @@ -20,10 +20,12 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the version of the X509 Certificate. diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java index b83dd4f62..d311a4352 100644 --- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -17,13 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the X509Key attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/DNSName.java b/pki/base/util/src/netscape/security/x509/DNSName.java index 7e503b4af..d6d9b1f07 100644 --- a/pki/base/util/src/netscape/security/x509/DNSName.java +++ b/pki/base/util/src/netscape/security/x509/DNSName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the DNSName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index 39664e238..3ef2f1ae7 100755 --- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -22,10 +22,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.math.BigInteger; -import java.util.Enumeration; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Delta CRL Indicator Extension. diff --git a/pki/base/util/src/netscape/security/x509/DirStrConverter.java b/pki/base/util/src/netscape/security/x509/DirStrConverter.java index 23dea47b2..261a909d1 100644 --- a/pki/base/util/src/netscape/security/x509/DirStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/DirStrConverter.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; + +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; import sun.io.CharToByteConverter; -import netscape.security.util.*; /** * A DirStrConverter converts a string to a DerValue of ASN.1 Directory String, diff --git a/pki/base/util/src/netscape/security/x509/DisplayText.java b/pki/base/util/src/netscape/security/x509/DisplayText.java index 45bcc5061..44bb4b76b 100644 --- a/pki/base/util/src/netscape/security/x509/DisplayText.java +++ b/pki/base/util/src/netscape/security/x509/DisplayText.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/EDIPartyName.java b/pki/base/util/src/netscape/security/x509/EDIPartyName.java index 45510e28a..475206c0a 100644 --- a/pki/base/util/src/netscape/security/x509/EDIPartyName.java +++ b/pki/base/util/src/netscape/security/x509/EDIPartyName.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the EDIPartyName of the GeneralName choice. diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java index 7a4f6d124..39be6eb86 100644 --- a/pki/base/util/src/netscape/security/x509/Extension.java +++ b/pki/base/util/src/netscape/security/x509/Extension.java @@ -19,8 +19,11 @@ package netscape.security.x509; import java.io.IOException; import java.io.Serializable; -import java.security.cert.CertificateException; -import netscape.security.util.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java index 75bb6c97f..5d4705d2e 100644 --- a/pki/base/util/src/netscape/security/x509/Extensions.java +++ b/pki/base/util/src/netscape/security/x509/Extensions.java @@ -28,7 +28,9 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java index cfc75bfdf..23aa8dc0c 100644 --- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -17,14 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; /** * An extension that tells applications where to find diff --git a/pki/base/util/src/netscape/security/x509/GeneralName.java b/pki/base/util/src/netscape/security/x509/GeneralName.java index 9c84e9e4e..84088147e 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralName.java +++ b/pki/base/util/src/netscape/security/x509/GeneralName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the ASN.1 GeneralName object class. diff --git a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java b/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java index 1cf6ff6cf..962206e00 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java +++ b/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java @@ -19,7 +19,7 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; /** * This interface specifies the abstract methods which have to be diff --git a/pki/base/util/src/netscape/security/x509/GeneralNames.java b/pki/base/util/src/netscape/security/x509/GeneralNames.java index d08eeb1a5..eb8cb2299 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralNames.java +++ b/pki/base/util/src/netscape/security/x509/GeneralNames.java @@ -21,7 +21,8 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This object class represents the GeneralNames type required in diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java b/pki/base/util/src/netscape/security/x509/GeneralSubtree.java index 248e58c96..84ceca96d 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java +++ b/pki/base/util/src/netscape/security/x509/GeneralSubtree.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtree ASN.1 object, whose syntax is: diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java b/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java index 96537e887..332f61cdd 100644 --- a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -17,10 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtrees ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java index ba80bfc2e..5c906d09f 100644 --- a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java +++ b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java @@ -17,12 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; -import sun.io.ByteToCharConverter; +import java.io.IOException; -import netscape.security.util.DerValue; import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A GenericValueConverter converts a string that is not associated with diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java index b36f30186..6cc7cb22b 100644 --- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.Date; import java.security.cert.CertificateException; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java b/pki/base/util/src/netscape/security/x509/IA5StringConverter.java index 80572a686..f3fa50da0 100644 --- a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java +++ b/pki/base/util/src/netscape/security/x509/IA5StringConverter.java @@ -17,10 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A AVAValueConverter that converts a IA5String attribute to a DerValue diff --git a/pki/base/util/src/netscape/security/x509/IPAddressName.java b/pki/base/util/src/netscape/security/x509/IPAddressName.java index 4fe58145c..c79147eb2 100644 --- a/pki/base/util/src/netscape/security/x509/IPAddressName.java +++ b/pki/base/util/src/netscape/security/x509/IPAddressName.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; import java.util.StringTokenizer; -import java.lang.Integer; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the IPAddressName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java index 47a5d910d..a90b2b791 100755 --- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.math.BigInteger; -import java.util.Enumeration; -import java.util.Date; import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index d0dc7a5c9..aa18026e3 100644 --- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This represents the Issuer Alternative Name Extension. diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java index 50432240e..090b0cb3b 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java @@ -17,9 +17,22 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import org.mozilla.jss.asn1.*; -import netscape.security.util.*; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BOOLEAN; +import org.mozilla.jss.asn1.EXPLICIT; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; /** * <pre> diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 6ee8dffbe..22569f454 100644 --- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -17,14 +17,20 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.io.*; -import org.mozilla.jss.asn1.*; -import java.security.cert.*; -import java.util.Vector; +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.CertificateException; import java.util.Enumeration; +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.asn1.ASN1Util; + /** * A critical CRL extension that identifies the CRL distribution point * for a particular CRL diff --git a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java b/pki/base/util/src/netscape/security/x509/KeyIdentifier.java index 1aa39fc4a..496b9ed99 100644 --- a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java +++ b/pki/base/util/src/netscape/security/x509/KeyIdentifier.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Key Identifier ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java index 1d6605aed..f13528c9f 100644 --- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -23,7 +23,9 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Key Usage Extension. diff --git a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java b/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java index ee93581c8..caf9ad01b 100644 --- a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java @@ -19,8 +19,6 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; - /** * Abstract class that converts a Ldap DN String to an X500Name, RDN or AVA * and vice versa, except the string is a java string in unicode. diff --git a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index e75947a8d..8203d9b08 100644 --- a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -17,10 +17,17 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.util.Vector; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; import sun.io.ByteToCharConverter; -import netscape.security.util.*; /** * A converter that converts Ldap v3 DN strings as specified in diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index ea4d25202..406469868 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.util.*; -import netscape.security.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.util.PrettyPrintFormat; /** * This class defines the NSCCommentExtension diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 037ff824d..f69e2fe5f 100644 --- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -21,10 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.PrettyPrintFormat; /** diff --git a/pki/base/util/src/netscape/security/x509/NoticeReference.java b/pki/base/util/src/netscape/security/x509/NoticeReference.java index 8e4711e24..9098d8163 100644 --- a/pki/base/util/src/netscape/security/x509/NoticeReference.java +++ b/pki/base/util/src/netscape/security/x509/NoticeReference.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.Vector; import java.io.IOException; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java index 7d9a032d5..0b0fd5a36 100644 --- a/pki/base/util/src/netscape/security/x509/OIDMap.java +++ b/pki/base/util/src/netscape/security/x509/OIDMap.java @@ -22,12 +22,11 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Properties; -import netscape.security.util.*; +import netscape.security.util.ObjectIdentifier; /** * This class defines the mapping from OID & name to classes and vice diff --git a/pki/base/util/src/netscape/security/x509/OIDName.java b/pki/base/util/src/netscape/security/x509/OIDName.java index a0e12ccaf..44e67867e 100644 --- a/pki/base/util/src/netscape/security/x509/OIDName.java +++ b/pki/base/util/src/netscape/security/x509/OIDName.java @@ -19,7 +19,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class implements the OIDName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/OtherName.java b/pki/base/util/src/netscape/security/x509/OtherName.java index 263d00096..c7d8841cb 100644 --- a/pki/base/util/src/netscape/security/x509/OtherName.java +++ b/pki/base/util/src/netscape/security/x509/OtherName.java @@ -17,11 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.StringTokenizer; -import java.lang.Integer; +import java.io.IOException; +import java.io.InputStream; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * This class implements the OtherName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java b/pki/base/util/src/netscape/security/x509/PKIXExtensions.java index 8c6742c54..8593d9238 100644 --- a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java +++ b/pki/base/util/src/netscape/security/x509/PKIXExtensions.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; - -import netscape.security.util.*; +import netscape.security.util.ObjectIdentifier; /** * Lists all the object identifiers of the X509 extensions of the PKIX profile. diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java b/pki/base/util/src/netscape/security/x509/PolicyConstraint.java index 9a0b48784..83bfa1a62 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraint.java @@ -18,9 +18,11 @@ package netscape.security.x509; import java.io.IOException; -import java.security.cert.CertificateException; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the PolicyConstraint ASN.1 object. diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 4a468ba49..faa5d43dd 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; import java.util.Enumeration; -import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the certificate extension which specifies the diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index f2d769686..f95f2dbe3 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; -import java.security.cert.CertificateException; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Policy Mappings Extension. diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java b/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java index 1c4984bee..c2f750987 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java +++ b/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java @@ -18,7 +18,10 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java b/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java index 69d0d015d..e066aefea 100644 --- a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java +++ b/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java @@ -17,9 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.util.Vector; import java.io.IOException; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/PrintableConverter.java b/pki/base/util/src/netscape/security/x509/PrintableConverter.java index 38457efd5..b4c58739d 100644 --- a/pki/base/util/src/netscape/security/x509/PrintableConverter.java +++ b/pki/base/util/src/netscape/security/x509/PrintableConverter.java @@ -17,10 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import sun.io.CharToByteConverter; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.ASN1CharStrConvMap; +import netscape.security.util.DerValue; +import sun.io.CharToByteConverter; /** * A AVAValueConverter that converts a Printable String attribute to a DerValue diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index 70848994c..fb37e76bb 100644 --- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -22,13 +22,15 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Array; import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateParsingException; import java.util.Date; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the Private Key Usage Extension. diff --git a/pki/base/util/src/netscape/security/x509/Qualifier.java b/pki/base/util/src/netscape/security/x509/Qualifier.java index ef13fc103..8f85333d7 100644 --- a/pki/base/util/src/netscape/security/x509/Qualifier.java +++ b/pki/base/util/src/netscape/security/x509/Qualifier.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/RDN.java b/pki/base/util/src/netscape/security/x509/RDN.java index 43ce490d7..347fc4e1d 100644 --- a/pki/base/util/src/netscape/security/x509/RDN.java +++ b/pki/base/util/src/netscape/security/x509/RDN.java @@ -18,11 +18,13 @@ package netscape.security.x509; import java.io.IOException; -import java.io.StringReader; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java index d7c19482e..89383231a 100644 --- a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java +++ b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; +import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * Converts a RFC 1779 string to a X500Name, RDN or AVA object and vice versa. diff --git a/pki/base/util/src/netscape/security/x509/RFC822Name.java b/pki/base/util/src/netscape/security/x509/RFC822Name.java index 19a73a302..c29db6436 100644 --- a/pki/base/util/src/netscape/security/x509/RFC822Name.java +++ b/pki/base/util/src/netscape/security/x509/RFC822Name.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the RFC822Name as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/pki/base/util/src/netscape/security/x509/ReasonFlags.java index e10b2f38a..64c8ff904 100755 --- a/pki/base/util/src/netscape/security/x509/ReasonFlags.java +++ b/pki/base/util/src/netscape/security/x509/ReasonFlags.java @@ -18,12 +18,12 @@ package netscape.security.x509; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the CRL Reason Flags. diff --git a/pki/base/util/src/netscape/security/x509/RevocationReason.java b/pki/base/util/src/netscape/security/x509/RevocationReason.java index 0c6133fbe..fc8c9634b 100644 --- a/pki/base/util/src/netscape/security/x509/RevocationReason.java +++ b/pki/base/util/src/netscape/security/x509/RevocationReason.java @@ -17,13 +17,6 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Array; -import java.util.Enumeration; - -import netscape.security.util.*; /** * Represent the enumerated type used in CRLReason Extension of CRL entry. diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java index 785a5d79b..7d3808bd5 100755 --- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -17,21 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.Serializable; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.security.cert.CRLException; -import java.security.cert.CertificateException; +import java.io.Serializable; import java.math.BigInteger; -import java.util.Collections; +import java.security.cert.CRLException; import java.util.Date; import java.util.Enumeration; import java.util.Set; -import netscape.security.util.*; -import java.io.ByteArrayOutputStream; +import netscape.security.util.ArraySet; +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; /** * <p>Abstract class for a revoked certificate in a CRL. diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java index b3002736f..41f18d9b4 100644 --- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/pki/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -18,10 +18,9 @@ package netscape.security.x509; import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.security.cert.X509CRLEntry; import java.util.Date; -import java.util.Set; - -import java.security.cert.*; /** * <p>Abstract class for a revoked certificate in a CRL (Certificate diff --git a/pki/base/util/src/netscape/security/x509/SerialNumber.java b/pki/base/util/src/netscape/security/x509/SerialNumber.java index 344ecb7b0..c59b03e0f 100644 --- a/pki/base/util/src/netscape/security/x509/SerialNumber.java +++ b/pki/base/util/src/netscape/security/x509/SerialNumber.java @@ -21,7 +21,10 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; -import netscape.security.util.*; +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the SerialNumber class used by certificates. diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index c57bfcc96..834355582 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This represents the Subject Alternative Name Extension. diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index 65f6fef49..007437bb3 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -24,7 +24,8 @@ import java.lang.reflect.Array; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class represents the Subject Directory Attributes Extension. diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index dd3a61e28..37b943898 100644 --- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -23,7 +23,8 @@ import java.io.OutputStream; import java.lang.reflect.Array; import java.util.Enumeration; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Represent the Subject Key Identifier Extension. diff --git a/pki/base/util/src/netscape/security/x509/URIName.java b/pki/base/util/src/netscape/security/x509/URIName.java index 3dc804893..b0cb2d084 100644 --- a/pki/base/util/src/netscape/security/x509/URIName.java +++ b/pki/base/util/src/netscape/security/x509/URIName.java @@ -19,7 +19,8 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class implements the URIName as required by the GeneralNames diff --git a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java b/pki/base/util/src/netscape/security/x509/UniqueIdentity.java index 4b33ad776..b59f7d7f7 100644 --- a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java +++ b/pki/base/util/src/netscape/security/x509/UniqueIdentity.java @@ -18,9 +18,11 @@ package netscape.security.x509; import java.io.IOException; -import java.math.BigInteger; -import netscape.security.util.*; +import netscape.security.util.BitArray; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * This class defines the UniqueIdentity class used by certificates. diff --git a/pki/base/util/src/netscape/security/x509/UserNotice.java b/pki/base/util/src/netscape/security/x509/UserNotice.java index 01bef6dd7..3f9db6838 100644 --- a/pki/base/util/src/netscape/security/x509/UserNotice.java +++ b/pki/base/util/src/netscape/security/x509/UserNotice.java @@ -18,7 +18,9 @@ package netscape.security.x509; import java.io.IOException; -import netscape.security.util.*; + +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java index c8bd8ed6a..27e722641 100644 --- a/pki/base/util/src/netscape/security/x509/X500Name.java +++ b/pki/base/util/src/netscape/security/x509/X500Name.java @@ -17,14 +17,15 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.StringReader; import java.io.IOException; -import java.io.StringBufferInputStream; import java.security.Principal; import java.util.Enumeration; import java.util.Vector; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java index 8edbae358..60722924a 100644 --- a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/util/src/netscape/security/x509/X500Signer.java b/pki/base/util/src/netscape/security/x509/X500Signer.java index cd13c3359..6568e1a97 100644 --- a/pki/base/util/src/netscape/security/x509/X500Signer.java +++ b/pki/base/util/src/netscape/security/x509/X500Signer.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; +import java.security.NoSuchAlgorithmException; import java.security.Signature; import java.security.SignatureException; import java.security.Signer; -import java.security.NoSuchAlgorithmException; /** * This class provides a binding between a Signature object and an diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java index cc21f626f..82ec78410 100755 --- a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -17,33 +17,35 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.Principal; -import java.security.PublicKey; import java.security.PrivateKey; -import java.security.Security; +import java.security.PublicKey; import java.security.Signature; -import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; -import java.security.NoSuchProviderException; import java.security.SignatureException; +import java.security.cert.CRLException; import java.security.cert.Certificate; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; import java.security.cert.X509CRLEntry; -import java.security.cert.CRLException; -import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Set; -import netscape.security.util.*; +import netscape.security.util.ArraySet; +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; /** * <p> diff --git a/pki/base/util/src/netscape/security/x509/X509Cert.java b/pki/base/util/src/netscape/security/x509/X509Cert.java index 1f546bc31..eb46b15b7 100644 --- a/pki/base/util/src/netscape/security/x509/X509Cert.java +++ b/pki/base/util/src/netscape/security/x509/X509Cert.java @@ -19,15 +19,24 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.OutputStream; import java.io.Serializable; -import java.security.*; +import java.security.Certificate; +import java.security.InvalidKeyException; +import java.security.Key; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; import java.util.Date; -import java.util.Enumeration; -import netscape.security.util.*; // DER +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * @author David Brownell diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java index 4c5c6eb53..c9f7c3cd7 100755 --- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java @@ -18,25 +18,37 @@ package netscape.security.x509; import java.io.IOException; -import java.io.Serializable; import java.io.InputStream; import java.io.ObjectInputStream; -import java.io.OutputStream; import java.io.ObjectOutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; +import java.io.OutputStream; +import java.io.Serializable; import java.math.BigInteger; -import java.security.cert.*; -import java.security.*; -import java.security.PublicKey; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; import java.security.PrivateKey; -import java.util.Collections; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateFactory; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; import java.util.Date; import java.util.Enumeration; import java.util.Set; -import netscape.security.util.*; +import netscape.security.util.ArraySet; import netscape.security.util.BigInt; +import netscape.security.util.DerEncoder; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; /** * The X509CertImpl class represents an X.509 certificate. These certificates diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java index 94019d8b0..7738284e6 100644 --- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java @@ -18,17 +18,20 @@ package netscape.security.x509; import java.io.IOException; -import java.io.Serializable; -import java.io.OutputStream; import java.io.InputStream; -import java.io.ObjectOutputStream; import java.io.ObjectInputStream; - -import java.security.cert.*; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; import java.util.Enumeration; import java.util.Hashtable; -import netscape.security.util.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** diff --git a/pki/base/util/src/netscape/security/x509/X509Key.java b/pki/base/util/src/netscape/security/x509/X509Key.java index 3bdeed4df..9d5f86a90 100644 --- a/pki/base/util/src/netscape/security/x509/X509Key.java +++ b/pki/base/util/src/netscape/security/x509/X509Key.java @@ -17,19 +17,23 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; -import java.io.*; -import java.util.Properties; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.security.InvalidKeyException; import java.security.Key; -import java.security.PublicKey; import java.security.KeyFactory; -import java.security.Security; -import java.security.Provider; -import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.Provider; +import java.security.PublicKey; +import java.security.Security; import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; +import java.util.Properties; -import netscape.security.util.*; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; /** * Holds an X.509 key, for example a public key found in an X.509 |