This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a90474348b Skip CRL tests if unsupported
a90474348b is described below
commit a90474348b0ff4ea390109eb9b50df13ea8c0613
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 4 17:21:49 2026 +0100
Skip CRL tests if unsupported
---
test/org/apache/tomcat/util/net/TestCrlSupport.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/TestCrlSupport.java
b/test/org/apache/tomcat/util/net/TestCrlSupport.java
index aee75538af..3507246016 100644
--- a/test/org/apache/tomcat/util/net/TestCrlSupport.java
+++ b/test/org/apache/tomcat/util/net/TestCrlSupport.java
@@ -25,15 +25,18 @@ import java.util.List;
import javax.net.ssl.SSLHandshakeException;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
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.compat.JrePlatform;
@RunWith(Parameterized.class)
public class TestCrlSupport extends TomcatBaseTest {
@@ -97,6 +100,14 @@ public class TestCrlSupport extends TomcatBaseTest {
@Test
public void testCrlClient() throws Exception {
+ /*
+ * 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]
