< prev index next >

test/javax/net/ssl/TLS/TLSClientPropertyTest.java

Print this page
rev 14340 : 8202343: Disable TLS 1.0 and 1.1
Reviewed-by: xuelei, dfuchs, coffeys

*** 1,7 **** /* ! * Copyright (c) 2014, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 2014, 2020, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 21,31 **** * questions. */ /* * @test ! * @bug 8049432 8069038 8234723 * @summary New tests for TLS property jdk.tls.client.protocols * @summary javax/net/ssl/TLS/TLSClientPropertyTest.java needs to be * updated for JDK-8061210 * @run main/othervm TLSClientPropertyTest NoProperty * @run main/othervm TLSClientPropertyTest SSLv3 --- 21,31 ---- * questions. */ /* * @test ! * @bug 8049432 8069038 8234723 8202343 * @summary New tests for TLS property jdk.tls.client.protocols * @summary javax/net/ssl/TLS/TLSClientPropertyTest.java needs to be * updated for JDK-8061210 * @run main/othervm TLSClientPropertyTest NoProperty * @run main/othervm TLSClientPropertyTest SSLv3
*** 69,109 **** if (System.getProperty("jdk.tls.client.protocols") != null) { System.getProperties().remove("jdk.tls.client.protocols"); } contextProtocol = null; expectedDefaultProtos = new String[] { ! "TLSv1", "TLSv1.1", "TLSv1.2" }; break; case "SSLv3": contextProtocol = "SSLv3"; expectedDefaultProtos = new String[] { }; break; case "TLSv1": contextProtocol = "TLSv1"; expectedDefaultProtos = new String[] { - "TLSv1" }; break; case "TLSv11": contextProtocol = "TLSv1.1"; expectedDefaultProtos = new String[] { - "TLSv1", "TLSv1.1" }; break; case "TLSv12": case "TLS": contextProtocol = "TLSv1.2"; expectedDefaultProtos = new String[] { ! "TLSv1", "TLSv1.1", "TLSv1.2" }; break; case "TLSv13": contextProtocol = "TLSv1.3"; expectedDefaultProtos = new String[] { ! "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" }; break; case "WrongProperty": expectedDefaultProtos = new String[] {}; contextProtocol = "TLSV"; --- 69,107 ---- if (System.getProperty("jdk.tls.client.protocols") != null) { System.getProperties().remove("jdk.tls.client.protocols"); } contextProtocol = null; expectedDefaultProtos = new String[] { ! "TLSv1.2" }; break; case "SSLv3": contextProtocol = "SSLv3"; expectedDefaultProtos = new String[] { }; break; case "TLSv1": contextProtocol = "TLSv1"; expectedDefaultProtos = new String[] { }; break; case "TLSv11": contextProtocol = "TLSv1.1"; expectedDefaultProtos = new String[] { }; break; case "TLSv12": case "TLS": contextProtocol = "TLSv1.2"; expectedDefaultProtos = new String[] { ! "TLSv1.2" }; break; case "TLSv13": contextProtocol = "TLSv1.3"; expectedDefaultProtos = new String[] { ! "TLSv1.2", "TLSv1.3" }; break; case "WrongProperty": expectedDefaultProtos = new String[] {}; contextProtocol = "TLSV";
< prev index next >