(tomcat) branch main updated: Try versioned path for libssl on MacOS

[remm]

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 89ecd60641 Try versioned path for libssl on MacOS
89ecd60641 is described below

commit 89ecd60641a8712baa35a82f019af1c9aadc13ef
Author: remm <r...@apache.org>
AuthorDate: Fri Jun 28 11:07:18 2024 +0200

    Try versioned path for libssl on MacOS
---
 java/org/apache/tomcat/util/openssl/openssl_h.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java 
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index a8f5777bdb..a6a797c06d 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -22,6 +22,7 @@ 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.*;
@@ -49,7 +50,14 @@ public class openssl_h {
     static final boolean TRACE_DOWNCALLS = 
Boolean.getBoolean("jextract.trace.downcalls");
     static final SymbolLookup SYMBOL_LOOKUP;
     static {
-        SYMBOL_LOOKUP = 
SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
+        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 = "/usr/lib/libssl.46.dylib";
+        }
+        SYMBOL_LOOKUP = 
SymbolLookup.libraryLookup(System.mapLibraryName(libName), LIBRARY_ARENA)
                 .or(SymbolLookup.loaderLookup())
                 .or(Linker.nativeLinker().defaultLookup());
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org