jakartaee#625 Fix 4 webservices12/sec failures due to TLS protocol

Use client.cert.test.jdk.tls.client.protocols to set https.protocols property Signed-off-by: hussainnm <hussain.nm@cognizant.com>
scottmarlow · Mar 22, 2021 · 30931ee · 30931ee
1 parent 5d6811d
commit 30931ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/com/sun/ts/tests/webservices12/sec/annotations/ejb/clientcert/Client.java b/src/com/sun/ts/tests/webservices12/sec/annotations/ejb/clientcert/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -68,6 +68,11 @@ public void setup(String[] args, Properties p) throws Fault {
     try {
       hostname = props.getProperty("webServerHost");
       portnum = Integer.parseInt(props.getProperty("securedWebServicePort"));
+      String tlsVersion = p.getProperty("client.cert.test.jdk.tls.client.protocols");
+      if (tlsVersion != null) {
+        TestUtil.logMsg("client.cert.test.jdk.tls.client.protocols=" + tlsVersion);
+        System.setProperty("https.protocols", tlsVersion);		  
+      }
       urlString = ctsurl.getURLString(PROTOCOL, hostname, portnum,
           "/WSEjbClientCert/HelloService/Hello");
       HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {

diff --git a/src/com/sun/ts/tests/webservices12/sec/descriptors/ejb/certificate/Client.java b/src/com/sun/ts/tests/webservices12/sec/descriptors/ejb/certificate/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -78,6 +78,11 @@ public void setup(String[] args, Properties p) throws Fault {
     try {
       hostname = p.getProperty("webServerHost");
       portnum = Integer.parseInt(p.getProperty("securedWebServicePort"));
+      String tlsVersion = p.getProperty("client.cert.test.jdk.tls.client.protocols");
+      if (tlsVersion != null) {
+        TestUtil.logMsg("client.cert.test.jdk.tls.client.protocols=" + tlsVersion);
+        System.setProperty("https.protocols", tlsVersion);		  
+      }
       urlString = ctsurl.getURLString(PROTOCOL, hostname, portnum,
           "/WSSecEjbCertificate/ejb");
       HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {