From 272a2b40619bb07d05c6ae5df9e6db839cb0404c Mon Sep 17 00:00:00 2001
From: quapka
Date: Mon, 22 Jul 2024 16:17:05 +0200
Subject: Link BoringSSL statically

In order to prevent problems with dynamic linking of OpenSSL, LibreSSL
and BoringSSL -- that all have libcrypto.so -- we link statically into
the providers.
---
 .../src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java    | 2 +-
 .../src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'standalone/src')

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
index af4d969..ddc25c6 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class BoringsslLib extends NativeECLibrary {
     public BoringsslLib() {
-        super("BoringSSL", "boringssl_provider", "lib_boringssl.so");
+        super("BoringSSL", "boringssl_provider");
     }
 
     @Override
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
index 5c71f87..32df65f 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
@@ -100,7 +100,7 @@ boringssl: boringssl_provider.so
 # 	cp $(PROJECT_ROOT_PATH)/ext/boringssl/build/crypto/libcrypto.so lib_boringssl.so
 
 boringssl_provider.so: boringssl.o c_utils.o | lib_timing.so lib_csignals.so
-	NIX_CFLAGS_COMPILE= $(CC) $(CFLAGS) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -l:lib_boringssl.so -l:lib_timing.so -l:lib_csignals.so
+	NIX_CFLAGS_COMPILE= $(CC) $(CFLAGS) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic -l:lib_boringssl.a -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so
 
 boringssl.o: boringssl.c
 	NIX_CFLAGS_COMPILE= $(CC) -I$(BORINGSSL_CFLAGS) $(CFLAGS) -c $<
-- 
cgit v1.3.1