8234725: sun/security/ssl/SSLContextImpl tests support TLSv1.3
Summary: Missing TLSv1.3 test cases
Reviewed-by: xuelei
--- a/test/jdk/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java Thu Nov 28 07:05:13 2019 +0100
+++ b/test/jdk/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java Wed Nov 27 22:11:08 2019 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 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 8234725
* @summary Enable TLS 1.1 and TLS 1.2 by default in client side of SunJSSE
* @run main/othervm -Djdk.tls.client.protocols="XSLv3,TLSv1"
* IllegalProtocolProperty
@@ -43,7 +43,8 @@
TLS_CV_04("TLSv1", "TLSv1", "TLSv1.2", false),
TLS_CV_05("TLSv1.1", "TLSv1.1", "TLSv1.2", false),
TLS_CV_06("TLSv1.2", "TLSv1.2", "TLSv1.2", false),
- TLS_CV_07("Default", "TLSv1", "TLSv1.2", true);
+ TLS_CV_07("Default", "TLSv1", "TLSv1.2", true),
+ TLS_CV_08("TLSv1.3", "TLSv1.3", "TLSv1.3", false);
final String contextVersion;
final String defaultProtocolVersion;
--- a/test/jdk/sun/security/ssl/SSLContextImpl/SSLContextVersion.java Thu Nov 28 07:05:13 2019 +0100
+++ b/test/jdk/sun/security/ssl/SSLContextImpl/SSLContextVersion.java Wed Nov 27 22:11:08 2019 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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 6976117
+ * @bug 6976117 8234725
* @summary SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets
* without TLSv1.1 enabled
* @run main/othervm SSLContextVersion
@@ -42,7 +42,10 @@
TLS_CV_04("TLSv1", "TLSv1", "TLSv1.2"),
TLS_CV_05("TLSv1.1", "TLSv1.1", "TLSv1.2"),
TLS_CV_06("TLSv1.2", "TLSv1.2", "TLSv1.2"),
- TLS_CV_07("Default", "TLSv1.2", "TLSv1.2");
+ TLS_CV_07("Default", "TLSv1.2", "TLSv1.2"),
+ TLS_CV_08("Default", "TLSv1.3", "TLSv1.3"),
+ TLS_CV_09("TLS", "TLSv1.3", "TLSv1.3"),
+ TLS_CV_10("TLSv1.3", "TLSv1.3", "TLSv1.3");
final String contextVersion;
final String defaultProtocolVersion;