diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/security')
12 files changed, 305 insertions, 220 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java index 22d0b8c17..04f442a35 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index f702f2e87..c492feac0 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -18,24 +18,46 @@ package com.netscape.cmscore.security; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateException; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.Signature; +import java.util.Date; + +import netscape.security.util.DerInputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java index f9d8114cd..d0df7d1a9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java @@ -18,42 +18,88 @@ package com.netscape.cmscore.security; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.KeyPairGenerator; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.math.BigInteger; +import java.net.SocketException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.util.DN; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.CryptoManager.UserCertConflictException; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11SecureRandom; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import org.mozilla.jss.ssl.SSLServerSocket; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.util.IncorrectPasswordException; import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.ConsolePasswordCallback; -import org.mozilla.jss.util.IncorrectPasswordException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePair; +import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.security.*; -import java.util.*; -import java.net.*; -import java.io.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateEncodingException; -import netscape.security.x509.*; -import java.security.cert.CertificateException; -import org.mozilla.jss.CryptoManager.NotInitializedException; -import org.mozilla.jss.CryptoManager.NicknameConflictException; -import org.mozilla.jss.CryptoManager.UserCertConflictException; -import org.mozilla.jss.pkcs11.PK11SecureRandom; -import com.netscape.cmscore.cert.*; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; import com.netscape.cmscore.util.Debug; -import netscape.ldap.util.*; -import com.netscape.cmsutil.crypto.*; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java index 4f551cd26..753c6cc46 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java @@ -18,48 +18,103 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.asn1.*; - -import java.security.PrivateKey; -import java.security.*; -import java.util.*; -import java.security.interfaces.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; import java.io.IOException; -import java.io.*; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.crypto.*; -import java.math.*; -//import java.security.cert.*; -import org.mozilla.jss.crypto.X509Certificate; -//import netscape.security.provider.DSAPublicKey; -// ADDED next line by MLH on 1/9/99 -// REMOVED the line added by MLH on 1/10/99 -//import netscape.security.provider.RSAPublicKey; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.CryptoManager.NotInitializedException; +import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.Extensions; +import netscape.security.x509.GeneralName; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500Signer; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; import org.mozilla.jss.CryptoManager.UserCertConflictException; -import java.security.cert.CertificateEncodingException; -import netscape.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmsutil.crypto.*; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Header; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11ECPublicKey; +import org.mozilla.jss.util.Base64OutputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.dbs.BigIntegerMapper; +import com.netscape.cmscore.dbs.DateMapper; +import com.netscape.cmscore.dbs.X509CertImplMapper; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java index 279a62347..efeade921 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java index 299b9f6e6..48b19f62b 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java @@ -18,20 +18,17 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.SecretDecoderRing; -import org.mozilla.jss.crypto.TokenException; -import java.io.*; -import java.lang.*; -import java.util.Hashtable; -import java.util.StringTokenizer; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; import org.mozilla.jss.util.PasswordCallbackInfo; -import com.netscape.cmscore.base.*; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.JDialogPasswordCallback; /* diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java index afba0a4db..3be636912 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.security; -import java.lang.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; public class diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index 309978f28..12412f59c 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -18,22 +18,31 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.SecretDecoderRing.KeyManager; -import org.mozilla.jss.SecretDecoderRing.Encryptor; -import org.mozilla.jss.SecretDecoderRing.Decryptor; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.Base64OutputStream; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.EBaseException; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.SecretDecoderRing.Decryptor; +import org.mozilla.jss.SecretDecoderRing.Encryptor; +import org.mozilla.jss.SecretDecoderRing.KeyManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.util.Base64OutputStream; +import org.mozilla.jss.util.Password; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java index c6f2f7cbc..1ac8f0ea7 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java index 0967b0930..eab48bdf5 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java index d38b35b44..ac7eb2ad9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java index 4244d0212..bd630de84 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** |