java/security/Makefile.am: removed Engine.java

java/security/AlgorithmParameterGenerator.java
java/security/AlgorithmParameters.java
java/security/KeyFactory.java
java/security/KeyPairGenerator.java
java/security/KeyStore.java
java/security/MessageDigest.java
java/security/SecureRandom.java
java/security/Signature.java
  accomodate changes to Engine class.

java/security/cert/Certificate.java: Added writeReplace()
  method.
java/security/cert/CertificateFactory.java: (JDK 1.4 compatibility)
  (getInstance(String)) and modified to use generic getInstance
  method.
  (getInstance(String, String)) likewise.
  getInstance(String, Provider) method added.
  getInstance(String, String, Provider) method removed.
  generateCertPath(InputStream) method added.
  generateCertPath(InputStream, String) method added.
  generateCertPath(List) method added.
  getCertPathEncodings() method added.
java/security/cert/CertificateFactorySpi.java: (1.4 compatibility)
  engineGenerateCertPath(InputStream) method added.
  engineGenerateCertPath(InputStream, String) method added.
  engineGenerateCertPath(List) method added.
  engineGetCertPathEncodings() method added.

1 files changed, 6 insertions, 0 deletions

diff --git a/java/security/KeyFactory.java b/java/security/KeyFactory.java
index 918bf3d6d..223d0d84a 100644
--- a/java/security/KeyFactory.java
+++ b/java/security/KeyFactory.java
@@ -41,6 +41,8 @@ import java.security.spec.KeySpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.NoSuchAlgorithmException;
 
+import gnu.java.security.Engine;
+
 /**
  * <p>Key factories are used to convert keys (opaque cryptographic keys of type
  * {@link Key}) into key specifications (transparent representations of the
@@ -192,6 +194,10 @@ public class KeyFactory
 	  Engine.getInstance(KEY_FACTORY, algorithm, provider),
           provider, algorithm);
       }
+    catch (java.lang.reflect.InvocationTargetException ite)
+      {
+	throw new NoSuchAlgorithmException(algorithm);
+      }
     catch (ClassCastException cce)
       {
 	throw new NoSuchAlgorithmException(algorithm);