This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 7af5cfac19 Better check for CRL support
7af5cfac19 is described below
commit 7af5cfac19ada7c01952d4324e979ba45ec9bba1
Author: Mark Thomas <[email protected]>
AuthorDate: Sat Sep 5 11:00:38 2026 +0100
Better check for CRL support
---
test/org/apache/tomcat/util/net/TestCrlSupport.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestCrlSupport.java
b/test/org/apache/tomcat/util/net/TestCrlSupport.java
index fd3f9533d2..6922c03ede 100644
--- a/test/org/apache/tomcat/util/net/TestCrlSupport.java
+++ b/test/org/apache/tomcat/util/net/TestCrlSupport.java
@@ -31,11 +31,11 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.catalina.core.OpenSSLLifecycleListener;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.openssl.openssl_h_Compatibility;
+import org.apache.tomcat.util.compat.JrePlatform;
@RunWith(Parameterized.class)
public class TestCrlSupport extends TomcatBaseTest {
@@ -99,7 +99,14 @@ public class TestCrlSupport extends TomcatBaseTest {
@Test
public void testCrlClient() throws Exception {
- Assume.assumeFalse(openssl_h_Compatibility.BORINGSSL ||
openssl_h_Compatibility.isLibreSSLPre35());
+ /*
+ * On MacOS, these tests will only pass with FFM if OpenSSL is used.
The version of LibreSSL provided does not
+ * support CRLs.
+ */
+ if (JrePlatform.IS_MAC_OS && "OpenSSL-FFM".equals(connectorName)) {
+
Assume.assumeFalse(OpenSSLLifecycleListener.getInstalledOpenSslVersion().contains("LibreSSL"));
+ }
+
System.out.println(OpenSSLLifecycleListener.getInstalledOpenSslVersion());
if (clientCertificateIsRevoked) {
TesterSupport.configureClientSsl(false,
TesterSupport.CLIENT_CRL_JKS);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
