(tomcat) branch main updated: Try to use the old code for 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 c67308ea65 Try to use the old code for MacOS
c67308ea65 is described below

commit c67308ea65dbf8c51a96531feac4eceec461cd49
Author: remm <r...@apache.org>
AuthorDate: Tue Feb 13 20:56:06 2024 +0100

    Try to use the old code for MacOS
---
 java/org/apache/tomcat/util/openssl/openssl_h.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java 
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index 25ba1ae96f..4067d037cc 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.*;
@@ -47,9 +48,18 @@ public class openssl_h {
 
     static final Arena LIBRARY_ARENA = Arena.ofAuto();
     static final boolean TRACE_DOWNCALLS = 
Boolean.getBoolean("jextract.trace.downcalls");
-    static final SymbolLookup SYMBOL_LOOKUP = 
SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
-            .or(SymbolLookup.loaderLookup())
-            .or(Linker.nativeLinker().defaultLookup());
+    static final SymbolLookup SYMBOL_LOOKUP;
+    static {
+        String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+        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());
+        }
+    }
 
     static void traceDowncall(String name, Object... args) {
          String traceArgs = Arrays.stream(args)


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