You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/11/12 14:39:18 UTC

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

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

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


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

commit dbe0ce7d7c4830edc53ea36235decd2c4119ee98
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 5cda3aa..7e9accc 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -199,7 +199,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org