--- old/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java 2019-12-04 13:00:28.000000000 -0800 +++ new/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java 2019-12-04 13:00:28.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ /* * @test - * @bug 7093640 + * @bug 7093640 8190492 * @summary Enable TLS 1.1 and TLS 1.2 by default in client side of SunJSSE * @run main/othervm -Djdk.tls.client.protocols="SSLv3,TLSv1,TLSv1.1" * CustomizedDefaultProtocols @@ -54,15 +54,15 @@ TLS_CV_02("TLS", new String[] {"SSLv3", "TLSv1", "TLSv1.1"}), TLS_CV_03("SSLv3", - new String[] {"SSLv3", "TLSv1"}), + new String[] {"TLSv1"}), TLS_CV_04("TLSv1", - new String[] {"SSLv3", "TLSv1"}), + new String[] {"TLSv1"}), TLS_CV_05("TLSv1.1", - new String[] {"SSLv3", "TLSv1", "TLSv1.1"}), + new String[] {"TLSv1", "TLSv1.1"}), TLS_CV_06("TLSv1.2", - new String[] {"SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"}), + new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"}), TLS_CV_07("TLSv1.3", - new String[] {"SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"}), + new String[] {"TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"}), TLS_CV_08("Default", new String[] {"SSLv3", "TLSv1", "TLSv1.1"}); @@ -70,6 +70,8 @@ final String[] enabledProtocols; final static String[] supportedProtocols = new String[] { "SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"}; + final static String[] serverDefaultProtocols = new String[] { + "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"}; ContextVersion(String contextVersion, String[] enabledProtocols) { this.contextVersion = contextVersion; @@ -80,16 +82,17 @@ private static boolean checkProtocols(String[] target, String[] expected) { boolean success = true; if (target.length == 0) { - System.out.println("\tError: No protocols"); + System.out.println("\t\t\t*** Error: No protocols"); success = false; } if (!protocolEquals(target, expected)) { - System.out.println("\tError: Expected to get protocols " + + System.out.println("\t\t\t*** Error: Expected to get protocols " + Arrays.toString(expected)); success = false; } - System.out.println("\t Protocols found " + Arrays.toString(target)); + System.out.println("\t\t\t Protocols found " + Arrays.toString(target)); + System.out.println("\t\t\t--> Protocol check passed!!"); return success; } @@ -114,10 +117,11 @@ private static boolean checkCipherSuites(String[] target) { boolean success = true; if (target.length == 0) { - System.out.println("\tError: No cipher suites"); + System.out.println("\t\t\t*** Error: No cipher suites"); success = false; } + System.out.println("\t\t\t--> Cipher check passed!!"); return success; } @@ -128,7 +132,8 @@ boolean failed = false; for (ContextVersion cv : ContextVersion.values()) { - System.out.println("Checking SSLContext of " + cv.contextVersion); + System.out.println("\n\nChecking SSLContext of " + cv.contextVersion); + System.out.println("============================"); SSLContext context = SSLContext.getInstance(cv.contextVersion); // Default SSLContext is initialized automatically. @@ -142,6 +147,7 @@ // // Check default SSLParameters of SSLContext System.out.println("\tChecking default SSLParameters"); + System.out.println("\t\tChecking SSLContext.getDefaultSSLParameters().getProtocols"); SSLParameters parameters = context.getDefaultSSLParameters(); String[] protocols = parameters.getProtocols(); @@ -151,7 +157,7 @@ failed |= !checkCipherSuites(ciphers); // Check supported SSLParameters of SSLContext - System.out.println("\tChecking supported SSLParameters"); + System.out.println("\t\tChecking supported SSLParameters"); parameters = context.getSupportedSSLParameters(); protocols = parameters.getProtocols(); @@ -166,7 +172,7 @@ // Check SSLParameters of SSLEngine System.out.println(); System.out.println("\tChecking SSLEngine of this SSLContext"); - System.out.println("\tChecking SSLEngine.getSSLParameters()"); + System.out.println("\t\tChecking SSLEngine.getSSLParameters()"); SSLEngine engine = context.createSSLEngine(); engine.setUseClientMode(true); parameters = engine.getSSLParameters(); @@ -177,20 +183,20 @@ ciphers = parameters.getCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getEnabledProtocols()"); + System.out.println("\t\tChecking SSLEngine.getEnabledProtocols()"); protocols = engine.getEnabledProtocols(); failed |= !checkProtocols(protocols, cv.enabledProtocols); - System.out.println("\tChecking SSLEngine.getEnabledCipherSuites()"); + System.out.println("\t\tChecking SSLEngine.getEnabledCipherSuites()"); ciphers = engine.getEnabledCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getSupportedProtocols()"); + System.out.println("\t\tChecking SSLEngine.getSupportedProtocols()"); protocols = engine.getSupportedProtocols(); failed |= !checkProtocols(protocols, cv.supportedProtocols); System.out.println( - "\tChecking SSLEngine.getSupportedCipherSuites()"); + "\t\tChecking SSLEngine.getSupportedCipherSuites()"); ciphers = engine.getSupportedCipherSuites(); failed |= !checkCipherSuites(ciphers); @@ -200,7 +206,7 @@ // Check SSLParameters of SSLSocket System.out.println(); System.out.println("\tChecking SSLSocket of this SSLContext"); - System.out.println("\tChecking SSLSocket.getSSLParameters()"); + System.out.println("\t\tChecking SSLSocket.getSSLParameters()"); SocketFactory fac = context.getSocketFactory(); SSLSocket socket = (SSLSocket)fac.createSocket(); parameters = socket.getSSLParameters(); @@ -211,20 +217,20 @@ ciphers = parameters.getCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getEnabledProtocols()"); + System.out.println("\t\tChecking SSLEngine.getEnabledProtocols()"); protocols = socket.getEnabledProtocols(); failed |= !checkProtocols(protocols, cv.enabledProtocols); - System.out.println("\tChecking SSLEngine.getEnabledCipherSuites()"); + System.out.println("\t\tChecking SSLEngine.getEnabledCipherSuites()"); ciphers = socket.getEnabledCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getSupportedProtocols()"); + System.out.println("\t\tChecking SSLEngine.getSupportedProtocols()"); protocols = socket.getSupportedProtocols(); failed |= !checkProtocols(protocols, cv.supportedProtocols); System.out.println( - "\tChecking SSLEngine.getSupportedCipherSuites()"); + "\t\tChecking SSLEngine.getSupportedCipherSuites()"); ciphers = socket.getSupportedCipherSuites(); failed |= !checkCipherSuites(ciphers); @@ -234,39 +240,37 @@ // Check SSLParameters of SSLServerSocket System.out.println(); System.out.println("\tChecking SSLServerSocket of this SSLContext"); - System.out.println("\tChecking SSLServerSocket.getSSLParameters()"); + System.out.println("\t\tChecking SSLServerSocket.getSSLParameters()"); SSLServerSocketFactory sf = context.getServerSocketFactory(); SSLServerSocket ssocket = (SSLServerSocket)sf.createServerSocket(); parameters = ssocket.getSSLParameters(); protocols = parameters.getProtocols(); - failed |= !checkProtocols(protocols, cv.supportedProtocols); + failed |= !checkProtocols(protocols, cv.serverDefaultProtocols); ciphers = parameters.getCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getEnabledProtocols()"); + System.out.println("\t\tChecking SSLEngine.getEnabledProtocols()"); protocols = ssocket.getEnabledProtocols(); - failed |= !checkProtocols(protocols, cv.supportedProtocols); + failed |= !checkProtocols(protocols, cv.serverDefaultProtocols); - System.out.println("\tChecking SSLEngine.getEnabledCipherSuites()"); + System.out.println("\t\tChecking SSLEngine.getEnabledCipherSuites()"); ciphers = ssocket.getEnabledCipherSuites(); failed |= !checkCipherSuites(ciphers); - System.out.println("\tChecking SSLEngine.getSupportedProtocols()"); + System.out.println("\t\tChecking SSLEngine.getSupportedProtocols()"); protocols = ssocket.getSupportedProtocols(); failed |= !checkProtocols(protocols, cv.supportedProtocols); System.out.println( - "\tChecking SSLEngine.getSupportedCipherSuites()"); + "\t\tChecking SSLEngine.getSupportedCipherSuites()"); ciphers = ssocket.getSupportedCipherSuites(); failed |= !checkCipherSuites(ciphers); } if (failed) { throw new Exception("Run into problems, see log for more details"); - } else { - System.out.println("\t... Success"); } } }