Bug 737122 - DRM: during archiving and recovering, wrapping unwrapping keys should be done in the token

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2273 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 369 insertions, 43 deletions

diff --git a/pki/base/ca/shared/conf/CS.cfg.in b/pki/base/ca/shared/conf/CS.cfg.in
index f08fc2ce..dfb64ea0 100644
--- a/pki/base/ca/shared/conf/CS.cfg.in
+++ b/pki/base/ca/shared/conf/CS.cfg.in
@@ -951,7 +951,7 @@ oidmap.pse.oid=2.16.840.1.113730.1.18
 oidmap.subject_info_access.class=netscape.security.extensions.SubjectInfoAccessExtension
 oidmap.subject_info_access.oid=1.3.6.1.5.5.7.1.11
 os.userid=nobody
-profile.list=caUserCert,caUserSMIMEcapCert,caDualCert,caSignedLogCert,caTPSCert,caRARouterCert,caRouterCert,caServerCert,caOtherCert,caCACert,caInstallCACert,caRACert,caOCSPCert,caTransportCert,caDirUserCert,caAgentServerCert,caAgentFileSigning,caCMCUserCert,caFullCMCUserCert,caSimpleCMCUserCert,caTokenDeviceKeyEnrollment,caTokenUserEncryptionKeyEnrollment,caTokenUserSigningKeyEnrollment,caTempTokenDeviceKeyEnrollment,caTempTokenUserEncryptionKeyEnrollment,caTempTokenUserSigningKeyEnrollment,caAdminCert,caInternalAuthServerCert,caInternalAuthTransportCert,caInternalAuthDRMstorageCert,caInternalAuthSubsystemCert,caInternalAuthOCSPCert,caInternalAuthAuditSigningCert,DomainController,caDualRAuserCert,caRAagentCert,caRAserverCert,caUUIDdeviceCert,caSSLClientSelfRenewal,caDirUserRenewal,caManualRenewal,caTokenMSLoginEnrollment,caTokenUserSigningKeyRenewal,caTokenUserEncryptionKeyRenewal,caJarSigningCert,caIPAserviceCert,caEncUserCert
+profile.list=caUserCert,caUserSMIMEcapCert,caDualCert,caSignedLogCert,caTPSCert,caRARouterCert,caRouterCert,caServerCert,caOtherCert,caCACert,caInstallCACert,caRACert,caOCSPCert,caTransportCert,caDirUserCert,caAgentServerCert,caAgentFileSigning,caCMCUserCert,caFullCMCUserCert,caSimpleCMCUserCert,caTokenDeviceKeyEnrollment,caTokenUserEncryptionKeyEnrollment,caTokenUserSigningKeyEnrollment,caTempTokenDeviceKeyEnrollment,caTempTokenUserEncryptionKeyEnrollment,caTempTokenUserSigningKeyEnrollment,caAdminCert,caInternalAuthServerCert,caInternalAuthTransportCert,caInternalAuthDRMstorageCert,caInternalAuthSubsystemCert,caInternalAuthOCSPCert,caInternalAuthAuditSigningCert,DomainController,caDualRAuserCert,caRAagentCert,caRAserverCert,caUUIDdeviceCert,caSSLClientSelfRenewal,caDirUserRenewal,caManualRenewal,caTokenMSLoginEnrollment,caTokenUserSigningKeyRenewal,caTokenUserEncryptionKeyRenewal,caJarSigningCert,caIPAserviceCert,caEncUserCert,caEncECUserCert
 profile.caUUIDdeviceCert.class_id=caEnrollImpl
 profile.caUUIDdeviceCert.config=[PKI_INSTANCE_PATH]/profiles/ca/caUUIDdeviceCert.cfg
 profile.caManualRenewal.class_id=caEnrollImpl
@@ -1046,6 +1046,8 @@ profile.caIPAserviceCert.class_id=caEnrollImpl
 profile.caIPAserviceCert.config=[PKI_INSTANCE_PATH]/profiles/ca/caIPAserviceCert.cfg
 profile.caEncUserCert.class_id=caEnrollImpl
 profile.caEncUserCert.config=[PKI_INSTANCE_PATH]/profiles/ca/caEncUserCert.cfg
+profile.caEncECUserCert.class_id=caEnrollImpl
+profile.caEncECUserCert.config=[PKI_INSTANCE_PATH]/profiles/ca/caEncECUserCert.cfg
 registry.file=[PKI_INSTANCE_PATH]/conf/registry.cfg
 request.assignee.enable=true
 selftests._000=##
diff --git a/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg b/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg
new file mode 100644
index 00000000..43ad77c5
--- /dev/null
+++ b/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg
@@ -0,0 +1,93 @@
+desc=This certificate profile is for enrolling user ECC encryption certificates. It works only with latest Firefox.
+visible=false
+enable=true
+enableBy=admin
+name=Manual User Encryption ECC Certificates Enrollment
+auth.class_id=
+input.list=i1
+input.i1.class_id=keyGenInputImpl
+output.list=o1
+output.o1.class_id=certOutputImpl
+policyset.list=encryptionCertSet
+policyset.encryptionCertSet.list=1,2,3,4,5,6,7,8,9
+policyset.encryptionCertSet.1.constraint.class_id=subjectNameConstraintImpl
+policyset.encryptionCertSet.1.constraint.name=Subject Name Constraint
+policyset.encryptionCertSet.1.constraint.params.pattern=CN=.*
+policyset.encryptionCertSet.1.constraint.params.accept=true
+policyset.encryptionCertSet.1.default.class_id=userSubjectNameDefaultImpl
+policyset.encryptionCertSet.1.default.name=Subject Name Default
+policyset.encryptionCertSet.1.default.params.name=
+policyset.encryptionCertSet.2.constraint.class_id=validityConstraintImpl
+policyset.encryptionCertSet.2.constraint.name=Validity Constraint
+policyset.encryptionCertSet.2.constraint.params.range=365
+policyset.encryptionCertSet.2.constraint.params.notBeforeCheck=false
+policyset.encryptionCertSet.2.constraint.params.notAfterCheck=false
+policyset.encryptionCertSet.2.default.class_id=validityDefaultImpl
+policyset.encryptionCertSet.2.default.name=Validity Default
+policyset.encryptionCertSet.2.default.params.range=180
+policyset.encryptionCertSet.2.default.params.startTime=0
+policyset.encryptionCertSet.3.constraint.class_id=keyConstraintImpl
+policyset.encryptionCertSet.3.constraint.name=Key Constraint
+policyset.encryptionCertSet.3.constraint.params.keyType=EC
+policyset.encryptionCertSet.3.constraint.params.keyParameters=nistp256,nistp521
+policyset.encryptionCertSet.3.default.class_id=userKeyDefaultImpl
+policyset.encryptionCertSet.3.default.name=Key Default
+policyset.encryptionCertSet.4.constraint.class_id=noConstraintImpl
+policyset.encryptionCertSet.4.constraint.name=No Constraint
+policyset.encryptionCertSet.4.default.class_id=authorityKeyIdentifierExtDefaultImpl
+policyset.encryptionCertSet.4.default.name=Authority Key Identifier Default
+policyset.encryptionCertSet.5.constraint.class_id=noConstraintImpl
+policyset.encryptionCertSet.5.constraint.name=No Constraint
+policyset.encryptionCertSet.5.default.class_id=authInfoAccessExtDefaultImpl
+policyset.encryptionCertSet.5.default.name=AIA Extension Default
+policyset.encryptionCertSet.5.default.params.authInfoAccessADEnable_0=true
+policyset.encryptionCertSet.5.default.params.authInfoAccessADLocationType_0=URIName
+policyset.encryptionCertSet.5.default.params.authInfoAccessADLocation_0=
+policyset.encryptionCertSet.5.default.params.authInfoAccessADMethod_0=1.3.6.1.5.5.7.48.1
+policyset.encryptionCertSet.5.default.params.authInfoAccessCritical=false
+policyset.encryptionCertSet.5.default.params.authInfoAccessNumADs=1
+policyset.encryptionCertSet.6.constraint.class_id=keyUsageExtConstraintImpl
+policyset.encryptionCertSet.6.constraint.name=Key Usage Extension Constraint
+policyset.encryptionCertSet.6.constraint.params.keyUsageCritical=true
+policyset.encryptionCertSet.6.constraint.params.keyUsageDigitalSignature=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageNonRepudiation=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageDataEncipherment=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageKeyEncipherment=true
+policyset.encryptionCertSet.6.constraint.params.keyUsageKeyAgreement=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageKeyCertSign=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageCrlSign=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageEncipherOnly=false
+policyset.encryptionCertSet.6.constraint.params.keyUsageDecipherOnly=false
+policyset.encryptionCertSet.6.default.class_id=keyUsageExtDefaultImpl
+policyset.encryptionCertSet.6.default.name=Key Usage Default
+policyset.encryptionCertSet.6.default.params.keyUsageCritical=true
+policyset.encryptionCertSet.6.default.params.keyUsageDigitalSignature=false
+policyset.encryptionCertSet.6.default.params.keyUsageNonRepudiation=false
+policyset.encryptionCertSet.6.default.params.keyUsageDataEncipherment=false
+policyset.encryptionCertSet.6.default.params.keyUsageKeyEncipherment=true
+policyset.encryptionCertSet.6.default.params.keyUsageKeyAgreement=false
+policyset.encryptionCertSet.6.default.params.keyUsageKeyCertSign=false
+policyset.encryptionCertSet.6.default.params.keyUsageCrlSign=false
+policyset.encryptionCertSet.6.default.params.keyUsageEncipherOnly=false
+policyset.encryptionCertSet.6.default.params.keyUsageDecipherOnly=false
+policyset.encryptionCertSet.7.constraint.class_id=noConstraintImpl
+policyset.encryptionCertSet.7.constraint.name=No Constraint
+policyset.encryptionCertSet.7.default.class_id=extendedKeyUsageExtDefaultImpl
+policyset.encryptionCertSet.7.default.name=Extended Key Usage Extension Default
+policyset.encryptionCertSet.7.default.params.exKeyUsageCritical=false
+policyset.encryptionCertSet.7.default.params.exKeyUsageOIDs=1.3.6.1.5.5.7.3.2,1.3.6.1.5.5.7.3.4
+policyset.encryptionCertSet.8.constraint.class_id=noConstraintImpl
+policyset.encryptionCertSet.8.constraint.name=No Constraint
+policyset.encryptionCertSet.8.default.class_id=subjectAltNameExtDefaultImpl
+policyset.encryptionCertSet.8.default.name=Subject Alt Name Constraint
+policyset.encryptionCertSet.8.default.params.subjAltNameExtCritical=false
+policyset.encryptionCertSet.8.default.params.subjAltExtType_0=RFC822Name
+policyset.encryptionCertSet.8.default.params.subjAltExtPattern_0=$request.requestor_email$
+policyset.encryptionCertSet.8.default.params.subjAltExtGNEnable_0=true
+policyset.encryptionCertSet.8.default.params.subjAltNameNumGNs=1
+policyset.encryptionCertSet.9.constraint.class_id=signingAlgConstraintImpl
+policyset.encryptionCertSet.9.constraint.name=No Constraint
+policyset.encryptionCertSet.9.constraint.params.signingAlgsAllowed=SHA1withRSA,SHA256withRSA,SHA512withRSA,MD5withRSA,MD2withRSA,SHA1withDSA,SHA1withEC,SHA256withEC,SHA384withEC,SHA512withEC
+policyset.encryptionCertSet.9.default.class_id=signingAlgDefaultImpl
+policyset.encryptionCertSet.9.default.name=Signing Alg
+policyset.encryptionCertSet.9.default.params.signingAlg=-
diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java
index 0fc5ff61..422eb3a3 100644
--- a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java
+++ b/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java
@@ -147,6 +147,10 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_INTERNAL", e.toString()));
             Debug.trace("EncryptionUnit::encryptInternalPrivate " + e.toString());
             return null;
+        } catch (Exception e) {
+            CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_INTERNAL", e.toString()));
+            Debug.trace("EncryptionUnit::encryptInternalPrivate " + e.toString());
+            return null;
         }
     }
 
@@ -158,31 +162,27 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
 
             CMS.debug("EncryptionUnit.wrap");
             CryptoToken token = getToken();
-            CryptoToken internalToken = getInternalToken();
 
             // (1) generate session key
             org.mozilla.jss.crypto.KeyGenerator kg = 
 		                token.getKeyGenerator(KeyGenAlgorithm.DES3);
                // internalToken.getKeyGenerator(KeyGenAlgorithm.DES3);
-            SymmetricKey.Usage usages[] = new SymmetricKey.Usage[3];
-            usages[0] = SymmetricKey.Usage.ENCRYPT;
-            usages[1] = SymmetricKey.Usage.WRAP;
-            usages[2] = SymmetricKey.Usage.UNWRAP;
+            SymmetricKey.Usage usages[] = new SymmetricKey.Usage[2];
+            usages[0] = SymmetricKey.Usage.WRAP;
+            usages[1] = SymmetricKey.Usage.UNWRAP;
             kg.setKeyUsages(usages);
             kg.temporaryKeys(true);
             SymmetricKey sk = kg.generate();
-	    CMS.debug("EncryptionUnit:wrap() session key generated on slot: "+token.getName());
+	        CMS.debug("EncryptionUnit:wrap() session key generated on slot: "+token.getName());
 
             // (2) wrap private key with session key
             // KeyWrapper wrapper = internalToken.getKeyWrapper(
             KeyWrapper wrapper = token.getKeyWrapper(
                     KeyWrapAlgorithm.DES3_CBC_PAD);
-	    CMS.debug("EncryptionUnit:wrap() got key wrapper");
 
             wrapper.initWrap(sk, IV);
-	    CMS.debug("EncryptionUnit:wrap() key wrapper initialized");
             byte pri[] = wrapper.wrap(priKey);
-	    CMS.debug("EncryptionUnit:wrap() privKey wrapped");
+	        CMS.debug("EncryptionUnit:wrap() privKey wrapped");
 
             // (3) wrap session with transport public
             KeyWrapper rsaWrap = token.getKeyWrapper(
@@ -190,7 +190,7 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
 
             rsaWrap.initWrap(getPublicKey(), null);
             byte session[] = rsaWrap.wrap(sk);
-	    CMS.debug("EncryptionUnit:wrap() sessin key wrapped");
+	        CMS.debug("EncryptionUnit:wrap() sessin key wrapped");
 
             // use MY own structure for now:
             // SEQUENCE {
@@ -230,6 +230,10 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_WRAP", e.toString()));
             Debug.trace("EncryptionUnit::wrap " + e.toString());
             return null;
+        } catch (Exception e) {
+            CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_WRAP", e.toString()));
+            Debug.trace("EncryptionUnit::wrap " + e.toString());
+            return null;
         }
     }
 
@@ -241,13 +245,11 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
     {
         try {
             CryptoToken token = getToken();
-            CryptoToken internalToken = getInternalToken();
 
             // (1) unwrap the session
-	    CMS.debug("EncryptionUnit::unwrap_sym() on slot: "+token.getName());
             PrivateKey priKey = getPrivateKey();
             String priKeyAlgo = priKey.getAlgorithm();
-	    CMS.debug("EncryptionUnit::unwrap_sym() private key algo: " + priKeyAlgo);
+	        CMS.debug("EncryptionUnit::unwrap_sym() private key algo: " + priKeyAlgo);
             KeyWrapper keyWrapper = null;
             if (priKeyAlgo.equals("EC")) {
                 keyWrapper = token.getKeyWrapper(KeyWrapAlgorithm.AES_ECB);
@@ -259,6 +261,8 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             SymmetricKey sk = keyWrapper.unwrapSymmetric(encSymmKey,
                     SymmetricKey.DES3, usage,
                     0);
+	        CMS.debug("EncryptionUnit::unwrap_sym() unwrapped on slot: "
+                +token.getName());
             return sk;
         } catch (Exception e) {
             CMS.debug("EncryptionUnit::unwrap_sym() error:" +
@@ -288,7 +292,6 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
 
             CMS.debug("EncryptionUnit.decryptExternalPrivate");
             CryptoToken token = getToken();
-            CryptoToken internalToken = getInternalToken();
 
             // (1) unwrap the session
             KeyWrapper rsaWrap = token.getKeyWrapper(
@@ -331,6 +334,10 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_EXTERNAL", e.toString()));
             Debug.trace("EncryptionUnit::decryptExternalPrivate " + e.toString());
             return null;
+        } catch (Exception e) {
+            CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_EXTERNAL", e.toString()));
+            Debug.trace("EncryptionUnit::decryptExternalPrivate " + e.toString());
+            return null;
         }
     }
 
@@ -340,13 +347,11 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
      */
     public PrivateKey unwrap(byte encSymmKey[], 
         String symmAlgOID, byte symmAlgParams[],
-        byte encValue[], PublicKey pubKey) 
+        byte encValue[], PublicKey pubKey)
         throws EBaseException {
         try {
             CryptoToken token = getToken();
-            CryptoToken internalToken = getInternalToken();
 
-            CMS.debug("EncryptionUnit.unwrap symAlgParams: " + new String(symmAlgParams));
             // (1) unwrap the session
             KeyWrapper rsaWrap = token.getKeyWrapper(
                     KeyWrapAlgorithm.RSA);
@@ -363,8 +368,18 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
 
             wrapper.initUnwrap(sk, new IVParameterSpec(
                     symmAlgParams));
-            PrivateKey pk = wrapper.unwrapPrivate(encValue,     
-                    PrivateKey.RSA, pubKey);
+
+           PrivateKey.Type keytype = null;
+            String alg = pubKey.getAlgorithm();
+            if (alg.equals("DSA")) {
+                keytype = PrivateKey.DSA;
+            } else if (alg.equals("EC")) {
+                keytype = PrivateKey.EC;
+            } else {
+                keytype = PrivateKey.RSA;
+            }
+            PrivateKey pk = wrapper.unwrapTemporaryPrivate(encValue,
+                    keytype , pubKey);
 
             return pk;
         } catch (TokenException e) {
@@ -383,6 +398,9 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_UNWRAP", e.toString()));
             Debug.trace("EncryptionUnit::unwrap " + e.toString());
             return null;
+        } catch (Exception e) {
+            CMS.debug("EncryptionUnit.unwrap : Exception:"+e.toString());
+            return null;
         }
     }
 
@@ -399,10 +417,9 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             byte pri[] = dPri.getOctetString();
 
             CryptoToken token = getToken();
-            CryptoToken internalToken = getInternalToken();
 
             // (1) unwrap the session
-	    CMS.debug("decryptInternalPrivate(): getting key wrapper on slot:"+ token.getName());
+	        CMS.debug("decryptInternalPrivate(): getting key wrapper on slot:"+ token.getName());
             KeyWrapper rsaWrap = token.getKeyWrapper(
                     KeyWrapAlgorithm.RSA);
 
@@ -444,6 +461,10 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_DECRYPT", e.toString()));
             Debug.trace("EncryptionUnit::decryptInternalPrivate " + e.toString());
             return null;
+        } catch (Exception e) {
+            CMS.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_KRA, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_ENCRYPTION_DECRYPT", e.toString()));
+            Debug.trace("EncryptionUnit::decryptInternalPrivate " + e.toString());
+            return null;
         }
     }
 
diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
index 239cfef0..2dfc188d 100644
--- a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -20,6 +20,7 @@ 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.math.BigInteger;
@@ -31,6 +32,7 @@ import java.security.cert.CertificateException;
 import netscape.security.util.*;
 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 org.mozilla.jss.pkix.cms.EnvelopedData;
@@ -69,7 +71,8 @@ import com.netscape.certsrv.apps.CMS;
  * in the internal database for long term storage.
  * <P>
  *
- * @author thomask
+ * @author thomask (original)
+ * @author cfu (non-RSA keys; private keys secure handling);
  * @version $Revision$, $Date$
  */
 public class EnrollmentService implements IService {
diff --git a/pki/base/kra/src/com/netscape/kra/RecoveryService.java b/pki/base/kra/src/com/netscape/kra/RecoveryService.java
index 7f6137ff..5e0c77e2 100644
--- a/pki/base/kra/src/com/netscape/kra/RecoveryService.java
+++ b/pki/base/kra/src/com/netscape/kra/RecoveryService.java
@@ -50,7 +50,9 @@ import org.mozilla.jss.asn1.*;
 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;
 
 /**
  * A class represents recovery request processor. There
@@ -63,7 +65,8 @@ import org.mozilla.jss.pkix.primitive.*;
  * End Entity recovery will send RA or CA a response where
  * stores the recovered key.
  *
- * @author thomask
+ * @author thomask (original)
+ * @author cfu (non-RSA keys; private keys secure handling);
  * @version $Revision$, $Date$
  */
 public class RecoveryService implements IService {
@@ -113,6 +116,23 @@ public class RecoveryService implements IService {
      */
     public boolean serviceRequest(IRequest request) throws EBaseException {
 
+        CryptoManager cm = null;
+        IConfigStore config = null;
+        String tokName = "";
+        CryptoToken ct = null;
+        Boolean allowEncDecrypt_recovery = false;
+
+        try {
+            cm = CryptoManager.getInstance();
+            config = CMS.getConfigStore();
+            tokName = config.getString("kra.storageUnit.hardware", "internal");
+        CMS.debug("RecoveryService: tokenName="+tokName);
+            ct = cm.getTokenByName(tokName);
+            allowEncDecrypt_recovery = config.getBoolean("kra.allowEncDecrypt.recovery", false);
+        } catch (Exception e) {
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_CERT_ERROR", e.toString()));
+        }
+
         IStatsSubsystem statsSub = (IStatsSubsystem)CMS.getSubsystem("stats");
         if (statsSub != null) {
           statsSub.startTiming("recovery", true /* main action */);
@@ -164,6 +184,13 @@ public class RecoveryService implements IService {
             }
         }
 
+        boolean isRSA = true;
+        String keyAlg = x509cert.getPublicKey().getAlgorithm();
+            if (keyAlg != null) {
+            CMS.debug("RecoveryService: publicKey alg ="+keyAlg);
+            if (!keyAlg.equals("RSA")) isRSA = false;
+        }
+
         // Unwrap the archived private key
         byte privateKeyData[] = null;
         X509Certificate transportCert =
@@ -173,28 +200,41 @@ public class RecoveryService implements IService {
             if (statsSub != null) {
               statsSub.startTiming("recover_key");
             }
-            privateKeyData = recoverKey(params, keyRecord);
+
+            PrivateKey privKey = null;
+            if (allowEncDecrypt_recovery == true) {
+                privateKeyData = recoverKey(params, keyRecord);
+            } else {
+                privKey= recoverKey(params, keyRecord, isRSA);
+            }
             if (statsSub != null) {
               statsSub.endTiming("recover_key");
             }
 
-            if (statsSub != null) {
-              statsSub.startTiming("verify_key");
-            }
-            if (verifyKeyPair(pubData, privateKeyData) == false) {
-                mKRA.log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("CMSCORE_KRA_PUBLIC_NOT_FOUND"));
-                throw new EKRAException(
-                        CMS.getUserMessage("CMS_KRA_INVALID_PUBLIC_KEY"));
-            }
-            if (statsSub != null) {
-              statsSub.endTiming("verify_key");
+            if ((isRSA == true) && (allowEncDecrypt_recovery == true)) {
+                if (statsSub != null) {
+                  statsSub.startTiming("verify_key");
+                }
+                // verifyKeyPair() is RSA-centric
+                if (verifyKeyPair(pubData, privateKeyData) == false) {
+                    mKRA.log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("CMSCORE_KRA_PUBLIC_NOT_FOUND"));
+                    throw new EKRAException(
+                            CMS.getUserMessage("CMS_KRA_INVALID_PUBLIC_KEY"));
+                }
+                if (statsSub != null) {
+                  statsSub.endTiming("verify_key");
+                }
             }
 
             if (statsSub != null) {
               statsSub.startTiming("create_p12");
             }
-            createPFX(request, params, privateKeyData);
+            if (allowEncDecrypt_recovery == true) {
+                createPFX(request, params, privateKeyData);
+            } else {
+                createPFX(request, params, privKey, ct);
+            }
             if (statsSub != null) {
               statsSub.endTiming("create_p12");
             }
@@ -260,6 +300,9 @@ public class RecoveryService implements IService {
         return true;
     }
 
+    /*
+     * verifyKeyPair()- RSA-centric key verification
+     */
     public boolean verifyKeyPair(byte publicKeyData[],  byte privateKeyData[])
     {
       try {
@@ -299,9 +342,166 @@ public class RecoveryService implements IService {
           return false;
        }
     }
+
+    /**
+     * Recovers key. (using unwrapping/wrapping on token)
+     *         - used when allowEncDecrypt_recovery is false
+     */
+   public synchronized PrivateKey recoverKey(Hashtable request, KeyRecord keyRecord, boolean isRSA)
+        throws EBaseException {
+
+       if (!isRSA) {
+            CMS.debug("RecoverService: recoverKey: currently, non-RSA keys are not supported when allowEncDecrypt_ is false");
+            throw new EKRAException(CMS.getUserMessage("CMS_KRA_RECOVERY_FAILED_1", "key type not supported"));
+       }
+       try {
+            if (CMS.getConfigStore().getBoolean("kra.keySplitting")) {
+              Credential creds[] = (Credential[])
+                request.get(ATTR_AGENT_CREDENTIALS);
+
+              mStorageUnit.login(creds);
+            }
+
+            /* wrapped retrieve session key and private key */
+            DerValue val = new DerValue(keyRecord.getPrivateKeyData());
+            DerInputStream in = val.data;
+            DerValue dSession = in.getDerValue();
+            byte session[] = dSession.getOctetString();
+            DerValue dPri = in.getDerValue();
+            byte pri[] = dPri.getOctetString();
+
+            /* debug */
+            byte publicKeyData[] = keyRecord.getPublicKeyData();
+            PublicKey pubkey = null;
+            try {
+                pubkey = X509Key.parsePublicKey (new DerValue(publicKeyData));
+            } catch (Exception e) {
+                CMS.debug("RecoverService: after parsePublicKey:"+e.toString());
+                throw new EKRAException(CMS.getUserMessage("CMS_KRA_RECOVERY_FAILED_1", "pubic key parsing failure"));
+            }
+            byte iv[] = {0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1};
+            PrivateKey privKey =
+            mStorageUnit.unwrap(
+                session,
+                keyRecord.getAlgorithm(),
+                iv,
+                pri,
+                (PublicKey) pubkey);
+
+            if (privKey == null) {
+                mKRA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_PRIVATE_KEY_NOT_FOUND"));
+                throw new EKRAException(CMS.getUserMessage("CMS_KRA_RECOVERY_FAILED_1", "private key unwrapping failure"));
+            }
+            if (CMS.getConfigStore().getBoolean("kra.keySplitting")) {
+              mStorageUnit.logout();
+            }
+            return privKey;
+        } catch (Exception e) {
+            CMS.debug("RecoverService: recoverKey() failed with allowEncDecrypt_recovery=false:"+e.toString());
+            throw new EKRAException(CMS.getUserMessage("CMS_KRA_RECOVERY_FAILED_1", "recoverKey() failed with allowEncDecrypt_recovery=false:"+e.toString()));
+        }
+    }
+
+
+    /**
+     * Creates a PFX (PKCS12) file. (the unwrapping/wrapping way)
+     *         - used when allowEncDecrypt_recovery is false
+     *
+     * @param request CRMF recovery request
+     * @param priKey private key handle
+     * @exception EBaseException failed to create P12 file
+     */
+    public void createPFX(IRequest request, Hashtable params, 
+        PrivateKey priKey, CryptoToken ct) throws EBaseException {
+        try {
+            // create p12
+            X509Certificate x509cert =
+                request.getExtDataInCert(ATTR_USER_CERT);
+            String pwd = (String) params.get(ATTR_TRANSPORT_PWD);
+
+            // add certificate
+            mKRA.log(ILogger.LL_INFO, "KRA adds certificate to P12");
+            SEQUENCE encSafeContents = new SEQUENCE();
+            ASN1Value cert = new OCTET_STRING(x509cert.getEncoded());
+            String nickname = request.getExtDataInString(ATTR_NICKNAME);
+
+            if (nickname == null) {
+                nickname = x509cert.getSubjectDN().toString();
+            }
+            byte localKeyId[] = createLocalKeyId(x509cert);
+            SET certAttrs = createBagAttrs(
+                    nickname, localKeyId);
+            // attributes: user friendly name, Local Key ID
+            SafeBag certBag = new SafeBag(SafeBag.CERT_BAG,
+                    new CertBag(CertBag.X509_CERT_TYPE, cert), 
+                    certAttrs);
+
+            encSafeContents.addElement(certBag);
+
+            // add key
+            mKRA.log(ILogger.LL_INFO, "KRA adds key to P12");
+            org.mozilla.jss.util.Password pass = new 	
+                org.mozilla.jss.util.Password(
+                    pwd.toCharArray());
+
+            SEQUENCE safeContents = new SEQUENCE();
+            PasswordConverter passConverter = new 
+                PasswordConverter();
+            byte salt[] = {0x01, 0x01, 0x01, 0x01};
+
+            ASN1Value key = EncryptedPrivateKeyInfo.createPBE(
+                    PBEAlgorithm.PBE_SHA1_DES3_CBC, 	
+                    pass, salt, 1, passConverter, priKey, ct);
+
+            SET keyAttrs = createBagAttrs(
+                    x509cert.getSubjectDN().toString(), 
+                    localKeyId);
+
+            SafeBag keyBag = new SafeBag(
+                    SafeBag.PKCS8_SHROUDED_KEY_BAG, key,
+                    keyAttrs); // ??
+
+            safeContents.addElement(keyBag);
+
+            // build contents
+            AuthenticatedSafes authSafes = new 
+                AuthenticatedSafes();
+
+            authSafes.addSafeContents(
+                safeContents
+            );
+            authSafes.addSafeContents(
+                encSafeContents
+            );
+
+            //			authSafes.addEncryptedSafeContents(
+            //				authSafes.DEFAULT_KEY_GEN_ALG,
+            //				pass, null, 1,
+            //				encSafeContents);
+            PFX pfx = new PFX(authSafes);
+
+            pfx.computeMacData(pass, null, 5); // ??
+            ByteArrayOutputStream fos = new 
+                ByteArrayOutputStream();
+
+            pfx.encode(fos);
+            pass.clear();
+
+            // put final PKCS12 into volatile request
+            params.put(ATTR_PKCS12, fos.toByteArray());
+        } catch (Exception e) {
+            mKRA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_CONSTRUCT_P12", e.toString()));
+            throw new EKRAException(CMS.getUserMessage("CMS_KRA_PKCS12_FAILED_1", e.toString()));
+        }
+
+        // update request
+        mKRA.getRequestQueue().updateRequest(request);
+    }
+
 	
     /**
      * Recovers key.
+     *         - used when allowEncDecrypt_recovery is true
      */
     public synchronized byte[] recoverKey(Hashtable request, KeyRecord keyRecord) 
         throws EBaseException {
@@ -328,6 +528,7 @@ public class RecoveryService implements IService {
 
     /**
      * Creates a PFX (PKCS12) file.
+     *         - used when allowEncDecrypt_recovery is true
      *
      * @param request CRMF recovery request
      * @param priData decrypted private key (PrivateKeyInfo)
@@ -335,12 +536,11 @@ public class RecoveryService implements IService {
      */
     public void createPFX(IRequest request, Hashtable params, 
         byte priData[]) throws EBaseException {
-        // create p12
-        X509Certificate x509cert =
-            request.getExtDataInCert(ATTR_USER_CERT);
-        String pwd = (String) params.get(ATTR_TRANSPORT_PWD);
-
         try {
+            // create p12
+            X509Certificate x509cert =
+                request.getExtDataInCert(ATTR_USER_CERT);
+            String pwd = (String) params.get(ATTR_TRANSPORT_PWD);
 
             // add certificate
             mKRA.log(ILogger.LL_INFO, "KRA adds certificate to P12");
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
index b55306e7..f72c34ba 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
+++ b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
@@ -106,6 +106,13 @@ public class JssSSLSocketFactory implements ISocketFactory {
         try {
             s = new SSLSocket(host, port, null, 0, certApprovalCallback,
               clientCertCallback);
+            for (int i = 0; cipherSuites[i] != 0; ++i) {
+                try {
+                    SSLSocket.setCipherPreferenceDefault(cipherSuites[i], true);
+                } catch( SocketException e) {
+                }
+            }
+
             s.setUseClientMode(true);
             s.enableSSL2(false);
             s.enableSSL2Default(false);