diff options
Diffstat (limited to 'pki/base/kra/src/com/netscape')
11 files changed, 321 insertions, 245 deletions
diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java index 422eb3a35..cbd3b7a3d 100644 --- a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java +++ b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java @@ -18,28 +18,35 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -//import netscape.security.provider.*; -import netscape.security.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -//import com.netscape.cmscore.kra.*; -import com.netscape.cmscore.cert.*; -import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; +import java.io.CharConversionException; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.crypto.BadPaddingException; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.IllegalBlockSizeException; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.IEncryptionUnit; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java index 2dfc188d2..713e276d7 100644 --- a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -18,43 +18,63 @@ package com.netscape.kra; -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.Arrays; -import java.io.IOException; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.math.BigInteger; -import java.security.*; -// ADDED next line and COMMENTED out following line by MLH on 1/9/99 -import netscape.security.provider.RSAPublicKey; -// import java.security.interfaces.RSAPublicKey; +import java.security.InvalidKeyException; import java.security.cert.CertificateException; -import netscape.security.util.*; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.security.provider.RSAPublicKey; import netscape.security.util.BigInt; -import netscape.security.x509.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.cms.*; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.pkix.cms.EncryptedContentInfo; import org.mozilla.jss.pkix.cms.EnvelopedData; -//import org.mozilla.jss.pkcs7.*; -import org.mozilla.jss.pkix.crmf.*; +import org.mozilla.jss.pkix.cms.RecipientInfo; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; import org.mozilla.jss.pkix.crmf.EncryptedKey; -import org.mozilla.jss.pkix.crmf.EncryptedKey.Type; -import org.mozilla.jss.pkix.primitive.*; +import org.mozilla.jss.pkix.crmf.EncryptedValue; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; import org.mozilla.jss.pkix.primitive.AVA; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.crmf.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.base.*; -//import com.netscape.cmscore.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.ProofOfArchival; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmscore.crmf.CRMFParser; +import com.netscape.cmscore.crmf.PKIArchiveOptionsContainer; +import com.netscape.cmscore.dbs.KeyRecord; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRANotify.java b/pki/base/kra/src/com/netscape/kra/KRANotify.java index f58201e03..33c16456d 100644 --- a/pki/base/kra/src/com/netscape/kra/KRANotify.java +++ b/pki/base/kra/src/com/netscape/kra/KRANotify.java @@ -18,9 +18,8 @@ package com.netscape.kra; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.kra.*; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.request.ARequestNotifier; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java b/pki/base/kra/src/com/netscape/kra/KRAPolicy.java index 73488e749..dee18da4c 100644 --- a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java +++ b/pki/base/kra/src/com/netscape/kra/KRAPolicy.java @@ -18,13 +18,17 @@ package com.netscape.kra; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cmscore.policy.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.cmscore.policy.GenericPolicyProcessor; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/kra/src/com/netscape/kra/KRAService.java b/pki/base/kra/src/com/netscape/kra/KRAService.java index 0913f1487..a312a655d 100644 --- a/pki/base/kra/src/com/netscape/kra/KRAService.java +++ b/pki/base/kra/src/com/netscape/kra/KRAService.java @@ -18,14 +18,15 @@ package com.netscape.kra; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 44fec8f32..f055442bc 100644 --- a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -18,34 +18,61 @@ package com.netscape.kra; -import java.lang.*; -import java.util.*; -import java.security.cert.X509Certificate; -import java.security.cert.*; -import java.math.*; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.math.BigInteger; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; import netscape.security.util.DerOutputStream; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.listeners.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.request.*; -import com.netscape.certsrv.apps.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.listeners.EListenersException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.ARequestNotifier; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestScheduler; +import com.netscape.certsrv.request.IRequestSubsystem; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.dbs.KeyRepository; +import com.netscape.cmscore.dbs.ReplicaIDRepository; +import com.netscape.cmscore.request.RequestSubsystem; /** diff --git a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index 1310fca76..31b613249 100644 --- a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -18,56 +18,51 @@ package com.netscape.kra; -import com.netscape.cmscore.util.Debug; -import java.util.StringTokenizer; -import java.util.Vector; -import java.io.IOException; import java.io.ByteArrayInputStream; - +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.math.BigInteger; -import java.security.*; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; import java.security.KeyPair; -import java.security.cert.CertificateException; -import netscape.security.util.*; -import netscape.security.util.BigInt; -import netscape.security.pkcs.*; -import netscape.security.x509.*; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; + import netscape.security.provider.RSAPublicKey; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkcs11.*; -import com.netscape.certsrv.common.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.crmf.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.cert.*; -//import com.netscape.cmscore.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.apps.CMS; -//for b64 encoding +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11SymKey; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; import org.mozilla.jss.util.Base64OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.io.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.util.Debug; /** * A class representing keygen/archival request procesor for requests diff --git a/pki/base/kra/src/com/netscape/kra/RecoveryService.java b/pki/base/kra/src/com/netscape/kra/RecoveryService.java index da3c3a87c..f364bf4ff 100644 --- a/pki/base/kra/src/com/netscape/kra/RecoveryService.java +++ b/pki/base/kra/src/com/netscape/kra/RecoveryService.java @@ -18,41 +18,57 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Hashtable; + +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkcs11.PK11RSAPublicKey; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmscore.util.Debug; /** * A class represents recovery request processor. There diff --git a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java index baec75494..2c3ba716a 100644 --- a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java +++ b/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java @@ -18,32 +18,49 @@ package com.netscape.kra; -import org.mozilla.jss.util.Password; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.security.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.TokenCertificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -//import com.netscape.cmscore.kra.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; +import java.io.CharConversionException; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.BadPaddingException; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IllegalBlockSizeException; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PBEAlgorithm; +import org.mozilla.jss.crypto.PBEKeyGenParams; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.util.*; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; import org.mozilla.jss.util.Password; -import org.mozilla.jss.crypto.*; -import com.netscape.cmscore.cert.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IJoinShares; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IShare; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; /** diff --git a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 043602a8a..f9ff8385d 100644 --- a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -18,43 +18,39 @@ package com.netscape.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import netscape.security.x509.X500Name; - -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; - -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkcs11.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.security.SecureRandom; +import java.util.Hashtable; + +import netscape.security.util.BigInt; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; + +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.pkcs11.PK11SymKey; +import org.mozilla.jss.util.Base64OutputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.EKRAException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cmscore.dbs.KeyRecord; +import com.netscape.cmsutil.util.Cert; /** diff --git a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java index 385940c95..86b2dbfc7 100644 --- a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java +++ b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java @@ -17,27 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.kra; +import java.security.PublicKey; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PrivateKey; import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; -import java.util.*; -import com.netscape.certsrv.security.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import java.security.cert.X509Certificate; -import com.netscape.cmscore.cert.*; -import netscape.security.x509.*; -//import netscape.security.provider.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.kra.*; import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.PrivateKey; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.security.ITransportKeyUnit; import com.netscape.cmsutil.util.Cert; |