[tomcat] branch 8.5.x updated: Attempt to get JDK 8 smoke tests working on Github

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 8046dde  Attempt to get JDK 8 smoke tests working on Github
8046dde is described below

commit 8046dde1fe9cc33cca4979120e5a5be755f53145
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 12 19:52:35 2020 +0100

    Attempt to get JDK 8 smoke tests working on Github
    
    Github uses Zulu which supports TLS 1.3 but does not enable it by
    default.
---
 test/org/apache/tomcat/util/net/TesterSupport.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index bc7aca9..9d7773e 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -197,7 +197,12 @@ public final class TesterSupport {
     public static ClientSSLSocketFactory configureClientSsl() {
         ClientSSLSocketFactory clientSSLSocketFactory = null;
         try {
-            SSLContext sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+            SSLContext sc;
+            if (TesterSupport.TLSV13_AVAILABLE) {
+                 sc = SSLContext.getInstance("TLSv1.3");
+            } else {
+                sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+            }
             sc.init(TesterSupport.getUser1KeyManagers(),
                     TesterSupport.getTrustManagers(),
                     null);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org