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 61f8c08253 Remove MacOS workaround
61f8c08253 is described below
commit 61f8c08253746733f73209522f37182a9d672bd1
Author: remm <[email protected]>
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 | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index efcf26d715..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,14 +49,7 @@ 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);
- String libName = "ssl";
- // Note: Some system libraries such as libcrypto must use a versioned
name on MacOS
- // See https://github.com/sergot/openssl/issues/81
- if (os.indexOf("mac") >= 0) {
- libName = "ssl.46";
- }
- SYMBOL_LOOKUP =
SymbolLookup.libraryLookup(System.mapLibraryName(libName), LIBRARY_ARENA)
+ SYMBOL_LOOKUP =
SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
.or(SymbolLookup.loaderLookup())
.or(Linker.nativeLinker().defaultLookup());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
