/hg/icedtea7-forest/jdk: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 3b70d96af7bd in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=3b70d96af7bd
author: asmotrak
date: Wed Jun 24 14:38:15 2015 +0300

	8078823, PR2809: javax/net/ssl/ciphersuites/DisabledAlgorithms.java fails intermittently
	Reviewed-by: xuelei


changeset d6392d3c3e8d in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d6392d3c3e8d
author: coffeys
date: Mon Sep 19 11:44:50 2016 +0100

	8148516, PR2809: Improve the default strength of EC in JDK [test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java update]
	Reviewed-by: xuelei


diffstat:

 test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java |  23 ++++++++++++++--
 1 files changed, 20 insertions(+), 3 deletions(-)

diffs (73 lines):

diff -r 437d6130ad8d -r d6392d3c3e8d test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
--- a/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java	Tue Apr 04 02:43:53 2017 +0100
+++ b/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java	Mon Sep 19 11:44:50 2016 +0100
@@ -41,7 +41,8 @@
  * @bug 8076221
  * @summary Check if weak cipher suites are disabled
  * @run main/othervm DisabledAlgorithms default
- * @run main/othervm DisabledAlgorithms empty
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1,secp192r1"
+ *     DisabledAlgorithms empty
  */
 public class DisabledAlgorithms {
 
@@ -97,6 +98,11 @@
                 System.out.println("jdk.tls.disabledAlgorithms = "
                         + Security.getProperty("jdk.tls.disabledAlgorithms"));
 
+                // some of the certs in our test are weak; disable
+                Security.setProperty("jdk.certpath.disabledAlgorithms", "");
+                System.out.println("jdk.certpath.disabledAlgorithms = "
+                        + Security.getProperty("jdk.cerpath.disabledAlgorithms"));
+
                 // check if RC4 cipher suites can be used
                 // if jdk.tls.disabledAlgorithms is empty
                 checkSuccess(rc4_ciphersuites);
@@ -104,6 +110,8 @@
             default:
                 throw new RuntimeException("Wrong parameter: " + args[0]);
         }
+
+        System.out.println("Test passed");
     }
 
     /*
@@ -128,7 +136,6 @@
                 }
             }
 
-            server.stop();
             while (server.isRunning()) {
                 sleep();
             }
@@ -223,12 +230,21 @@
                     socket.getSession().invalidate();
                 } catch (SSLHandshakeException e) {
                     System.out.println("Server: run: " + e);
+                    e.printStackTrace();
                     sslError = true;
+                    stopped = true;
                 } catch (IOException e) {
                     if (!stopped) {
-                        System.out.println("Server: run: " + e);
+                        System.out.println("Server: run: unexpected exception: "
+                                + e);
                         e.printStackTrace();
                         otherError = true;
+                        stopped = true;
+                    } else {
+                        System.out.println("Server: run: " + e);
+                        System.out.println("The exception above occurred "
+                                    + "because socket was closed, "
+                                    + "please ignore it");
                     }
                 }
             }
@@ -261,6 +277,7 @@
             stopped = true;
             if (!ssocket.isClosed()) {
                 try {
+                    System.out.println("Server: close socket");
                     ssocket.close();
                 } catch (IOException e) {
                     System.out.println("Server: close: " + e);