[tomcat] 02/02: Fix TLS 1.3 tests after removing deprecated Connector setters

[markt]

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

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

commit 6732d6aca2c9d84480e7a9d2a2a1f1a1d08430e6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 14 15:32:44 2020 +0000

    Fix TLS 1.3 tests after removing deprecated Connector setters
---
 test/org/apache/tomcat/util/net/TestClientCertTls13.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java 
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 19f2e5e..7444ae2 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -75,9 +75,16 @@ public class TestClientCertTls13 extends TomcatBaseTest {
 
         TesterSupport.configureClientCertContext(tomcat);
         // Need to override some of the previous settings
-        
Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", 
Constants.SSL_PROTO_TLSv1_3));
+        SSLHostConfig[] sslHostConfigs = connector.findSslHostConfigs();
+        Assert.assertNotNull(sslHostConfigs);
+        Assert.assertEquals(1, sslHostConfigs.length);
+
+        SSLHostConfig sslHostConfig = sslHostConfigs[0];
+
+        // TLS 1.3 support
+        sslHostConfig.setProtocols(Constants.SSL_PROTO_TLSv1_3);
         // And add force authentication to occur on the initial handshake
-        Assert.assertTrue(tomcat.getConnector().setProperty("clientAuth", 
"required"));
+        sslHostConfig.setCertificateVerification("required");
 
         TesterSupport.configureClientSsl();
     }


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