1 files changed, 11 insertions, 4 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
index 5769bacc..a749f114 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
@@ -141,13 +141,20 @@ public class KeyFactorySpi
         KeySpec keySpec)
         throws InvalidKeySpecException
     {
-        if (keySpec instanceof ECPublicKeySpec)
+        try
         {
-            return new BCECPublicKey(algorithm, (ECPublicKeySpec)keySpec, configuration);
+            if (keySpec instanceof ECPublicKeySpec)
+            {
+                return new BCECPublicKey(algorithm, (ECPublicKeySpec)keySpec, configuration);
+            }
+            else if (keySpec instanceof java.security.spec.ECPublicKeySpec)
+            {
+                return new BCECPublicKey(algorithm, (java.security.spec.ECPublicKeySpec)keySpec, configuration);
+            }
         }
-        else if (keySpec instanceof java.security.spec.ECPublicKeySpec)
+        catch (Exception e)
         {
-            return new BCECPublicKey(algorithm, (java.security.spec.ECPublicKeySpec)keySpec, configuration);
+            throw new InvalidKeySpecException("invalid KeySpec: " + e.getMessage(), e);
         }
 
         return super.engineGeneratePublic(keySpec);