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 2018/10/30 10:03:49 UTC
svn commit: r1845210 -
/tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
Author: markt
Date: Tue Oct 30 10:03:49 2018
New Revision: 1845210
URL: http://svn.apache.org/viewvc?rev=1845210&view=rev
Log:
Skip test when APR/native connector version is built with an OpenSSl version that does not support TLS 1.3
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java?rev=1845210&r1=1845209&r2=1845210&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java Tue Oct 30 10:03:49 2018
@@ -22,8 +22,10 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.compat.TLS;
@@ -41,7 +43,13 @@ public class TestClientCertTls13 extends
@Test
public void testClientCertGet() throws Exception {
Assume.assumeTrue(TLS.isTlsv13Available());
- getTomcatInstance().start();
+ Tomcat tomcat = getTomcatInstance();
+ Connector connector = tomcat.getConnector();
+ if (connector.getProtocolHandlerClassName().contains("Apr")) {
+ Assume.assumeTrue(SSL.version() >= 0x1010100f);
+ }
+
+ tomcat.start();
ByteChunk res = getUrl("https://localhost:" + getPort() + "/protected");
Assert.assertEquals("OK-" + TesterSupport.ROLE, res.toString());
}
@@ -49,7 +57,13 @@ public class TestClientCertTls13 extends
@Test
public void testClientCertPost() throws Exception {
Assume.assumeTrue(TLS.isTlsv13Available());
- getTomcatInstance().start();
+ Tomcat tomcat = getTomcatInstance();
+ Connector connector = tomcat.getConnector();
+ if (connector.getProtocolHandlerClassName().contains("Apr")) {
+ Assume.assumeTrue(SSL.version() >= 0x1010100f);
+ }
+
+ tomcat.start();
int size = 32 * 1024;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org