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 f57681c6ef Revert following failed testing
f57681c6ef is described below
commit f57681c6ef0f0ebfc1f1c179732448f31433a6c8
Author: remm <[email protected]>
AuthorDate: Thu Jun 27 23:03:32 2024 +0200
Revert following failed testing
---
.github/workflows/ci.yml | 4 +---
java/org/apache/tomcat/util/openssl/openssl_h.java | 14 +++++++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89a3f1eb4c..5ee36e337c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,14 +33,12 @@ jobs:
isMain:
- ${{ contains(github.ref, 'main') }}
java: [ 17, 21, 22 ]
- os: [ ubuntu-latest, windows-latest, macos-latest ]
+ os: [ ubuntu-latest, windows-latest ]
exclude:
- isMain: true
java: 17
- os: windows-latest
java: 21
- - os: macos-latest
- java: 21
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index a8f5777bdb..3c0dcd2046 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,9 +50,16 @@ 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)
- .or(SymbolLookup.loaderLookup())
- .or(Linker.nativeLinker().defaultLookup());
+ 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());
+ }
}
static void traceDowncall(String name, Object... args) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
