diff options
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -70,7 +70,7 @@ configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; }); cryptopp = pkgs.cryptopp.override { enableStatic = true; }; - libressl = pkgs.libressl.overrideAttrs (_old: rec { + libressl = (pkgs.libressl.override { buildShared = false; } ).overrideAttrs (_old: rec { # devLibPath = pkgs.lib.makeLibraryPath [ pkgs.libressl.dev ]; # pname = "libressl"; # version = "3.9.2"; @@ -101,6 +101,7 @@ cp $dev/lib/pkgconfig/libcrypto.pc $dev/lib/pkgconfig/libresslcrypto.pc sed --in-place --expression 's/-lcrypto/-lresslcrypto/' $dev/lib/pkgconfig/libresslcrypto.pc ln -s $out/lib/libcrypto.so $out/lib/libresslcrypto.so + ln -s $out/lib/libcrypto.a $out/lib/libresslcrypto.a '' ]; @@ -155,10 +156,8 @@ makeWrapper # libraries to test - # openssl_3013 - # boringssl - libressl patched_boringssl + # libressl libtomcrypt libtommath botan2 @@ -209,6 +208,7 @@ libgcrypt libgpg-error opensslx + # libressl patched_boringssl ninja nettle 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 3d3eecd..8ea1f8d 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 @@ -182,7 +182,7 @@ nettle.o: nettle.c libressl: libressl_provider.so libressl_provider.so: libressl.o c_utils.o | lib_timing.so 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 + NIX_CFLAGS_COMPILE= $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic $(shell pkg-config --libs libresslcrypto) -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so libressl.o: libressl.c NIX_CFLAGS_COMPILE= $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $< |