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 9de70887ed Hack special support for FFM
9de70887ed is described below
commit 9de70887ed7cedbfa31e5d1183123b488aa543b7
Author: remm <[email protected]>
AuthorDate: Wed Oct 25 00:31:43 2023 +0200
Hack special support for FFM
---
test/org/apache/tomcat/util/net/TesterSupport.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 716f1798d6..008b9537ec 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -66,6 +66,7 @@ import
org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.apache.tomcat.util.net.jsse.JSSEImplementation;
+import org.apache.tomcat.util.net.openssl.OpenSSLStatus;
public final class TesterSupport {
@@ -240,8 +241,16 @@ public final class TesterSupport {
public static void configureSSLImplementation(Tomcat tomcat, String
sslImplementationName) {
try {
Class.forName(sslImplementationName);
+ if
("org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation".equals(sslImplementationName))
{
+ Class<?> openSSLLibraryClass =
Class.forName("org.apache.tomcat.util.net.openssl.panama.OpenSSLLibrary");
+ openSSLLibraryClass.getMethod("init").invoke(null);
+ Assume.assumeTrue(OpenSSLStatus.isAvailable());
+ }
} catch (Throwable t) {
- Assume.assumeNoException(t);
+ while (t.getCause() != null) {
+ t = t.getCause();
+ }
+ Assume.assumeFalse(t.getMessage(), Boolean.TRUE);
}
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName",
sslImplementationName));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
