compatibility updates.

2 files changed, 13 insertions, 0 deletions

diff --git a/pkix/src/main/java/org/bouncycastle/cert/path/CertPath.java b/pkix/src/main/java/org/bouncycastle/cert/path/CertPath.java
index 91f26546..f91b3a81 100644
--- a/pkix/src/main/java/org/bouncycastle/cert/path/CertPath.java
+++ b/pkix/src/main/java/org/bouncycastle/cert/path/CertPath.java
@@ -72,4 +72,9 @@ public class CertPath
 
         return rv;
     }
+
+    public int length()
+    {
+        return certificates.length;
+    }
 }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
index 949ecd6c..d19dbcf9 100644
--- a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
+++ b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
@@ -2,6 +2,7 @@ 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;
@@ -117,6 +118,9 @@ public class JceAsymmetricKeyWrapper
             }
             encryptedKeyBytes = keyEncryptionCipher.wrap(OperatorUtils.getJceKey(encryptionKey));
         }
+        catch (InvalidKeyException e)
+        {
+        }
         catch (GeneralSecurityException e)
         {
         }
@@ -138,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);