This is an automated email from the ASF dual-hosted git repository.
remm 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 cc766c8a0c Remove MacOS workaround
cc766c8a0c is described below
commit cc766c8a0cea4b74f052dab39c93cbf4fadadea2
Author: remm <r...@apache.org>
AuthorDate: Fri Jun 28 14:24:47 2024 +0200
Remove MacOS workaround
ssl.XX as the library name works, however after examining the logs and
the sources, the library is not compatible enough with OpenSSL to be
able to be used using FFM (supposed compatibilty is achieved using
macros).
As a result, it is more reasonable to revert completely. A user should
then be able to install the regular OpenSSL on the libpath where it
would be loaded from by Tomcat.
---
java/org/apache/tomcat/util/openssl/openssl_h.java | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index 3c0dcd2046..a8f5777bdb 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -22,7 +22,6 @@ package org.apache.tomcat.util.openssl;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
-import java.util.Locale;
import java.util.stream.Collectors;
import java.lang.foreign.*;
import static java.lang.foreign.ValueLayout.*;
@@ -50,16 +49,9 @@ public class openssl_h {
static final boolean TRACE_DOWNCALLS =
Boolean.getBoolean("jextract.trace.downcalls");
static final SymbolLookup SYMBOL_LOOKUP;
static {
- String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
- // Note: Library loading is not portable for MacOS
https://github.com/sergot/openssl/issues/81
- if (os.indexOf("mac") >= 0) {
- System.loadLibrary("ssl");
- SYMBOL_LOOKUP =
SymbolLookup.loaderLookup().or(Linker.nativeLinker().defaultLookup());
- } else {
- SYMBOL_LOOKUP =
SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
- .or(SymbolLookup.loaderLookup())
- .or(Linker.nativeLinker().defaultLookup());
- }
+ SYMBOL_LOOKUP =
SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
+ .or(SymbolLookup.loaderLookup())
+ .or(Linker.nativeLinker().defaultLookup());
}
static void traceDowncall(String name, Object... args) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
