tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1845249 - /tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Date Tue, 30 Oct 2018 16:07:07 GMT
Author: markt
Date: Tue Oct 30 16:07:06 2018
New Revision: 1845249

URL: http://svn.apache.org/viewvc?rev=1845249&view=rev
Log:
Latest Java 12 client with OpenSSL 1.1.1 APR/Native and TLSv1.3 needs the CA cert configured
on the server

Modified:
    tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1845249&r1=1845248&r2=1845249&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Tue Oct 30 16:07:06 2018
@@ -68,6 +68,7 @@ public final class TesterSupport {
     public static final String LOCALHOST_KEYPASS_JKS = SSL_DIR + "localhost-copy1.jks";
     public static final String JKS_PASS = "changeit";
     public static final String JKS_KEY_PASS = "tomcatpass";
+    public static final String CA_CERT_PEM = SSL_DIR + CA_ALIAS + "-cert.pem";
     public static final String LOCALHOST_CERT_PEM = SSL_DIR + "localhost-cert.pem";
     public static final String LOCALHOST_KEY_PEM = SSL_DIR + "localhost-key.pem";
     public static final boolean OPENSSL_AVAILABLE;
@@ -146,6 +147,10 @@ public final class TesterSupport {
                     LOCALHOST_KEY_PEM);
             tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
                     keystoreFile.getAbsolutePath());
+            keystoreFile = new File(
+                    CA_CERT_PEM);
+            tomcat.getConnector().setAttribute("SSLCACertificateFile",
+                    keystoreFile.getAbsolutePath());
         }
         tomcat.getConnector().setSecure(true);
         tomcat.getConnector().setProperty("SSLEnabled", "true");



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


Mime
View raw message