diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/profile')
89 files changed, 1566 insertions, 1151 deletions
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 |