aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquapka2024-07-18 14:00:11 +0200
committerquapka2024-07-18 14:00:11 +0200
commit556c45f5bd203ef79ae81687d4986fbbf4bd5f19 (patch)
tree80023f17b121fc69d83f0a8f3e5382893b3c3b37
parent134ff1082d11bad6fb95692a999e8b9dbd19f827 (diff)
downloadECTester-556c45f5bd203ef79ae81687d4986fbbf4bd5f19.tar.gz
ECTester-556c45f5bd203ef79ae81687d4986fbbf4bd5f19.tar.zst
ECTester-556c45f5bd203ef79ae81687d4986fbbf4bd5f19.zip
Build LibreSSL alongside OpenSSL
-rw-r--r--flake.nix4
-rw-r--r--standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/flake.nix b/flake.nix
index d768111..e4b92f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -338,7 +338,7 @@
global-platform-pro
gradle
# libraries to test
- # openssl
+ openssl
libressl
# glibc
boringssl
@@ -380,7 +380,7 @@
libtomcrypt
botan2
cryptopp
- # openssl
+ openssl
libgcrypt
nettle
gmp
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 0fc0ca6..1e67beb 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
@@ -193,10 +193,10 @@ libressl: libressl_provider.so
# cp $(PROJECT_ROOT_PATH)/ext/libressl/build/crypto/libcrypto.so lib_libressl.so
libressl_provider.so: libressl.o c_utils.o | lib_timing.so lib_csignals.so
- $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. $(shell pkg-config --libs libresslcrypto) -l:lib_timing.so -l:lib_csignals.so
+ NIX_CFLAGS_COMPILE= $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. $(shell pkg-config --libs libresslcrypto) -l:lib_timing.so -l:lib_csignals.so
libressl.o: libressl.c
- $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $<
+ NIX_CFLAGS_COMPILE= $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $<
help:
@echo "# This makefile builds the JNI shims necessary to test native libraries."