/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset dc5771ad1a85 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dc5771ad1a85
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jul 18 17:27:23 2017 +0200

	launcher/launchers.in: added exports for javax.jnlp to hook jdk9 one more times


changeset ebb1725ebfd7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ebb1725ebfd7
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jul 18 17:28:21 2017 +0200

	netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: HexEncoder loaded by reflection to allow smooth jdk8 x 9 transition.


diffstat:

 ChangeLog                                                     |   9 ++
 launcher/launchers.in                                         |   4 +
 netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java |  36 ++++++++--
 3 files changed, 42 insertions(+), 7 deletions(-)

diffs (104 lines):

diff -r 289d66e891ce -r ebb1725ebfd7 ChangeLog
--- a/ChangeLog	Fri Jul 14 12:34:53 2017 +0200
+++ b/ChangeLog	Tue Jul 18 17:28:21 2017 +0200
@@ -1,3 +1,12 @@
+2017-07-18  Jiri Vanek <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: HexEncoder loaded by reflection
+	to allow smooth jdk8 x 9 transition.
+
+2017-07-18  Jiri Vanek <jvanek at redhat.com>
+
+	* launcher/launchers.in: added exports for javax.jnlp to hook jdk9 one more times
+
 2017-07-13  Jiri Vanek <jvanek at redhat.com>
 
 	Fixed issue, when some resources were not used, because of OS was reporting full name. Eg. "Windows 7" where just "windows" was expected
diff -r 289d66e891ce -r ebb1725ebfd7 launcher/launchers.in
--- a/launcher/launchers.in	Fri Jul 14 12:34:53 2017 +0200
+++ b/launcher/launchers.in	Tue Jul 18 17:28:21 2017 +0200
@@ -113,6 +113,10 @@
 k=$((k+1))
 COMMAND[k]="--add-exports"
 k=$((k+1))
+COMMAND[k]="java.desktop/javax.jnlp=ALL-UNNAMED,java.desktop"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
 COMMAND[k]="java.base/sun.security.provider=ALL-UNNAMED,java.desktop"
 k=$((k+1))
 COMMAND[k]="--add-exports"
diff -r 289d66e891ce -r ebb1725ebfd7 netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java	Fri Jul 14 12:34:53 2017 +0200
+++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java	Tue Jul 18 17:28:21 2017 +0200
@@ -48,10 +48,6 @@
  * It is workaround to allow itw to run on jdk8 and older and also on jdk9 and newer
  */
 
-// jdk8 is using sun.misc.HexDumpEncoder, 
-import sun.misc.*;
-// jdk9 is using sun.security.util.HexDumpEncoder
-import sun.security.util.*;
 import sun.security.x509.*;
 import javax.swing.*;
 import javax.swing.event.*;
@@ -60,6 +56,7 @@
 import java.awt.event.*;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
+import java.lang.reflect.Method;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeSelectionModel;
 import net.sourceforge.jnlp.security.CertVerifier;
@@ -68,6 +65,7 @@
 import net.sourceforge.jnlp.security.dialogresults.DialogResult;
 import net.sourceforge.jnlp.security.dialogresults.SetValueHandler;
 import net.sourceforge.jnlp.security.dialogresults.Yes;
+import net.sourceforge.jnlp.util.logging.OutputController;
 
 /**
  * Provides the panel for the Certificate Info dialog. This dialog displays data from
@@ -153,9 +151,7 @@
                             c.getNotAfter()).toString();
         String subject = c.getSubjectX500Principal().toString();
 
-        //convert our signature into a nice human-readable form.
-        HexDumpEncoder encoder = new HexDumpEncoder();
-        String signature = encoder.encodeBuffer(c.getSignature());
+        String signature = jdkIndependentHexEncoder(c.getSignature());
 
         String md5Hash = "";
         String sha1Hash = "";
@@ -183,6 +179,32 @@
                                                         };
         return cert;
     }
+    
+     private String jdkIndependentHexEncoder(byte[] signature) {
+        try {
+            return jdkIndependentHexEncoderImpl(signature);
+        } catch (Exception ex) {
+            String s = "Failed to encode signature: " + ex.toString();
+            OutputController.getLogger().log(s);
+            return s;
+        }
+    }
+
+    private String jdkIndependentHexEncoderImpl(byte[] signature) throws Exception {
+        // jdk8 is using sun.misc.HexDumpEncoder, 
+        // jdk9 is using sun.security.util.HexDumpEncoder
+        Class clazz;
+        try {
+            clazz = Class.forName("sun.security.util.HexDumpEncoder");
+        } catch (ClassNotFoundException ex) {
+            OutputController.getLogger().log("Using jdk8's HexDumpEncoder");
+            clazz = Class.forName("sun.misc.HexDumpEncoder");
+        }
+        Object encoder  = clazz.newInstance();
+        Method m = clazz.getDeclaredMethod("encodeBuffer", byte[].class);
+        //convert our signature into a nice human-readable form.
+        return (String) m.invoke(encoder, signature);
+    }
 
     /**
      * Constructs the GUI components of this panel