1 files changed, 33 insertions, 1 deletions
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
index 4a2ffae..d19dbcf 100644
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
+++ b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
@@ -1,6 +1,8 @@
 package org.bouncycastle.operator.jcajce;
 
+import java.security.AlgorithmParameters;
 import java.security.GeneralSecurityException;
+import java.security.InvalidKeyException;
 import java.security.Provider;
 import java.security.ProviderException;
 import java.security.PublicKey;
@@ -12,6 +14,7 @@ import java.util.Map;
 import javax.crypto.Cipher;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.jcajce.DefaultJcaJceHelper;
 import org.bouncycastle.jcajce.NamedJcaJceHelper;
@@ -40,6 +43,19 @@ public class JceAsymmetricKeyWrapper
         this(certificate.getPublicKey());
     }
 
+    /**
+     * Create a wrapper, overriding the algorithm type that is stored in the public key.
+     *
+     * @param algorithmIdentifier identifier for encryption algorithm to be used.
+     * @param publicKey the public key to be used.
+     */
+    public JceAsymmetricKeyWrapper(AlgorithmIdentifier algorithmIdentifier, PublicKey publicKey)
+    {
+        super(algorithmIdentifier);
+
+        this.publicKey = publicKey;
+    }
+
     public JceAsymmetricKeyWrapper setProvider(Provider provider)
     {
         this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
@@ -86,13 +102,25 @@ public class JceAsymmetricKeyWrapper
         throws OperatorException
     {
         Cipher keyEncryptionCipher = helper.createAsymmetricWrapper(getAlgorithmIdentifier().getAlgorithm(), extraMappings);
+        AlgorithmParameters algParams = helper.createAlgorithmParameters(this.getAlgorithmIdentifier());
+
         byte[] encryptedKeyBytes = null;
 
         try
         {
-            keyEncryptionCipher.init(Cipher.WRAP_MODE, publicKey, random);
+            if (algParams != null)
+            {
+                keyEncryptionCipher.init(Cipher.WRAP_MODE, publicKey, algParams, random);
+            }
+            else
+            {
+                keyEncryptionCipher.init(Cipher.WRAP_MODE, publicKey, random);
+            }
             encryptedKeyBytes = keyEncryptionCipher.wrap(OperatorUtils.getJceKey(encryptionKey));
         }
+        catch (InvalidKeyException e)
+        {
+        }
         catch (GeneralSecurityException e)
         {
         }
@@ -114,6 +142,10 @@ public class JceAsymmetricKeyWrapper
                 keyEncryptionCipher.init(Cipher.ENCRYPT_MODE, publicKey, random);
                 encryptedKeyBytes = keyEncryptionCipher.doFinal(OperatorUtils.getJceKey(encryptionKey).getEncoded());
             }
+            catch (InvalidKeyException e)
+            {
+                throw new OperatorException("unable to encrypt contents key", e);
+            }
             catch (GeneralSecurityException e)
             {
                 throw new OperatorException("unable to encrypt contents key", e);