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, 11 insertions, 1 deletions

diff --git a/java/security/MessageDigest.java b/java/security/MessageDigest.java
index cbf0e0753..47b082a19 100644
--- a/java/security/MessageDigest.java
+++ b/java/security/MessageDigest.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.security;
 
+import gnu.java.security.Engine;
+
 /**
  * <p>This <code>MessageDigest</code> class provides applications the
  * functionality of a message digest algorithm, such as <i>MD5</i> or <i>SHA</i>.
@@ -197,7 +199,15 @@ public abstract class MessageDigest extends MessageDigestSpi
       throw new IllegalArgumentException("Illegal provider");
 
     MessageDigest result = null;
-    Object o = Engine.getInstance(MESSAGE_DIGEST, algorithm, provider);
+    Object o = null;
+    try
+      {
+        o = Engine.getInstance(MESSAGE_DIGEST, algorithm, provider);
+      }
+    catch (java.lang.reflect.InvocationTargetException ite)
+      {
+	throw new NoSuchAlgorithmException(algorithm);
+      }
      
     if (o instanceof MessageDigestSpi)
       {