[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small JarFile fix

Kaffe CVS cvs-commits at kaffe.org
Wed Nov 10 19:11:43 PST 2004


PatchSet 5444 
Date: 2004/11/11 02:58:07
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small JarFile fix

2004-11-11  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/util/jar/JarFile.java:
        Resynced with GNU Classpath.

        2004-11-08  Casey Marshall  <csm at gnu.org>

        * java/util/jar/JarFile.java (verify): return if the jar is signed
        with an unsupported algorithm.

Members: 
	ChangeLog:1.2991->1.2992 
	libraries/javalib/java/util/jar/JarFile.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2991 kaffe/ChangeLog:1.2992
--- kaffe/ChangeLog:1.2991	Thu Nov 11 02:41:53 2004
+++ kaffe/ChangeLog	Thu Nov 11 02:58:07 2004
@@ -1,5 +1,15 @@
 2004-11-11  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/util/jar/JarFile.java:
+        Resynced with GNU Classpath.
+
+	2004-11-08  Casey Marshall  <csm at gnu.org>
+
+        * java/util/jar/JarFile.java (verify): return if the jar is signed
+        with an unsupported algorithm.
+
+2004-11-11  Dalibor Topic  <robilad at kaffe.org>
+
 	*  libraries/javalib/java/util/GregorianCalendar.java,
 	libraries/javalib/java/util/Vector.java,
 	libraries/javalib/java/io/PrintStream.java:
Index: kaffe/libraries/javalib/java/util/jar/JarFile.java
diff -u kaffe/libraries/javalib/java/util/jar/JarFile.java:1.6 kaffe/libraries/javalib/java/util/jar/JarFile.java:1.7
--- kaffe/libraries/javalib/java/util/jar/JarFile.java:1.6	Thu Nov 11 01:04:39 2004
+++ kaffe/libraries/javalib/java/util/jar/JarFile.java	Thu Nov 11 02:58:10 2004
@@ -643,6 +643,12 @@
             else
               return;
           }
+        else
+          {
+            if (DEBUG)
+              debug("unsupported signature algorithm: " + alg);
+            return;
+          }
       }
     catch (NoSuchAlgorithmException nsae)
       {




More information about the kaffe mailing list