This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 47c2b93444 OpenSSL version cleanup
47c2b93444 is described below
commit 47c2b93444eb5bd14e82a4805a58924520c287db
Author: remm <r...@apache.org>
AuthorDate: Thu Jun 20 09:56:11 2024 +0200
OpenSSL version cleanup
---
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 786d42283f..dea79f1935 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -31,9 +31,7 @@ import org.junit.runners.Parameterized.Parameter;
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.net.openssl.OpenSSLImplementation;
/**
* The keys and certificates used in this file are all available in svn and
were
@@ -110,10 +108,7 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
if (useOpenSSL) {
- if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
- // Need at least OpenSSL 1.1.1 for TLSv1.3 support
- Assume.assumeTrue(SSL.version() >= 0x1010100f);
- }
+ Assume.assumeTrue(TesterSupport.getOpensslVersion() >= 0x1010100f);
}
// Tests default to TLSv1.2 when client cert auth is used
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
