PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 640a7e3..6b1e679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,12 @@
 	* netx/net/sourceforge/jnlp/Node.java:
 	  Removed getAttributeNames() method from the commented section
 
+2011-08-03  Deepak Bhole <[email protected]>
+
+	PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
+	* netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJar): Put entry in
+	cert hashtable only if the entry is expected to be signed.
+
 2011-08-02 Jiri Vanek <[email protected]>
 
 	*Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp):
diff --git a/NEWS b/NEWS
index b468f4a..34a7906 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ New in release 1.2 (2011-XX-XX):
 	- RH718170, CVE-2011-2514: Java Web Start security warning dialog manipulation
 * Plugin
   - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
+Common
+  - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
 
 New in release 1.1 (2011-XX-XX):
 * Security updates
diff --git a/netx/net/sourceforge/jnlp/tools/JarSigner.java b/netx/net/sourceforge/jnlp/tools/JarSigner.java
index 11bbbb5..b452dbc 100644
--- a/netx/net/sourceforge/jnlp/tools/JarSigner.java
+++ b/netx/net/sourceforge/jnlp/tools/JarSigner.java
@@ -284,7 +284,7 @@ public class JarSigner implements CertVerifier {
                     if (shouldHaveSignature)
                         totalSignableEntries++;
 
-                    if (isSigned) {
+                    if (shouldHaveSignature && isSigned) {
                         for (int i = 0; i < signers.length; i++) {
                             CertPath certPath = signers[i].getSignerCertPath();
                             if (!certs.containsKey(certPath))