diff options
| -rw-r--r-- | nix/boringsslshim.nix | 2 | ||||
| -rw-r--r-- | nix/botanshim.nix | 2 | ||||
| -rw-r--r-- | nix/cryptoppshim.nix | 2 | ||||
| -rw-r--r-- | nix/gcryptshim.nix | 2 | ||||
| -rw-r--r-- | nix/ippcpshim.nix | 2 | ||||
| -rw-r--r-- | nix/libresslshim.nix | 2 | ||||
| -rw-r--r-- | nix/mbedtlsshim.nix | 2 | ||||
| -rw-r--r-- | nix/nettleshim.nix | 2 | ||||
| -rw-r--r-- | nix/opensslshim.nix | 2 | ||||
| -rw-r--r-- | standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile | 14 |
10 files changed, 23 insertions, 9 deletions
diff --git a/nix/boringsslshim.nix b/nix/boringsslshim.nix index 715e721..a32a5bc 100644 --- a/nix/boringsslshim.nix +++ b/nix/boringsslshim.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { make boringssl ''; - BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include"; + BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include -DECTESTER_BORINGSSL_${boringssl.version}=1"; installPhase = '' mkdir --parents $out/lib diff --git a/nix/botanshim.nix b/nix/botanshim.nix index 8688b20..ce16b1b 100644 --- a/nix/botanshim.nix +++ b/nix/botanshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { make botan ''; + BOTAN_CXXFLAGS = "-DECTESTER_BOTAN_${builtins.replaceStrings ["."] ["_"] botan2.version}=1"; + installPhase = '' mkdir --parents $out/lib cp botan_provider.so $out/lib/ diff --git a/nix/cryptoppshim.nix b/nix/cryptoppshim.nix index 8c735d7..f526275 100644 --- a/nix/cryptoppshim.nix +++ b/nix/cryptoppshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { make cryptopp ''; + CRYPTOPP_CXXFLAGS = "-DECTESTER_CRYPTOPP_${cryptopp.version}=1"; + installPhase = '' mkdir --parents $out/lib cp cryptopp_provider.so $out/lib/ diff --git a/nix/gcryptshim.nix b/nix/gcryptshim.nix index 764b03c..869bcd9 100644 --- a/nix/gcryptshim.nix +++ b/nix/gcryptshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { make gcrypt ''; + LIBGCRYPT_CFLAGS = "-DECTESTER_LIBGCRYPT_${builtins.replaceStrings ["."] ["_"] libgcrypt.version}=1"; + installPhase = '' mkdir --parents $out/lib cp gcrypt_provider.so $out/lib/ diff --git a/nix/ippcpshim.nix b/nix/ippcpshim.nix index 349817b..a059d5b 100644 --- a/nix/ippcpshim.nix +++ b/nix/ippcpshim.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { jdk11_headless ]; - IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include"; + IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include -DECTESTER_IPPCP_VERSION=${ipp-crypto.version}"; IPP_CRYPTO_LFLAGS = "-L${ipp-crypto}/lib/"; buildPhase = '' diff --git a/nix/libresslshim.nix b/nix/libresslshim.nix index 9d23f4b..862701f 100644 --- a/nix/libresslshim.nix +++ b/nix/libresslshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { make libressl ''; + LIBRESSL_CFLAGS = "-DECTESTER_LIBRESSL_${builtins.replaceStrings ["."] ["_"] libressl.version}=1"; + installPhase = '' mkdir --parents $out/lib cp libressl_provider.so $out/lib diff --git a/nix/mbedtlsshim.nix b/nix/mbedtlsshim.nix index d1f5434..06abb0b 100644 --- a/nix/mbedtlsshim.nix +++ b/nix/mbedtlsshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { make mbedtls ''; + MBEDTLS_CFLAGS = "-DECTESTER_MBEDTLS_${builtins.replaceStrings ["."] ["_"] mbedtls.version}=1"; + installPhase = '' mkdir --parents $out/lib cp mbedtls_provider.so $out/lib diff --git a/nix/nettleshim.nix b/nix/nettleshim.nix index f968357..7488398 100644 --- a/nix/nettleshim.nix +++ b/nix/nettleshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { make nettle ''; + NETTLE_CFLAGS = "-DECTESTER_NETTLE_${builtins.replaceStrings ["."] ["_"] nettle.version}=1"; + installPhase = '' mkdir --parents $out/lib cp nettle_provider.so $out/lib diff --git a/nix/opensslshim.nix b/nix/opensslshim.nix index 1c79e94..be0263b 100644 --- a/nix/opensslshim.nix +++ b/nix/opensslshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { make openssl ''; + OPENSSL_CFLAGS = "-DECTESTER_OPENSSL_${builtins.replaceStrings ["."] ["_"] openssl.version}=1"; + installPhase = '' mkdir --parents $out/lib cp openssl_provider.so $out/lib/ 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 7c02a1f..74d1a93 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 @@ -107,7 +107,7 @@ openssl_provider.so: openssl.o c_utils.o | clibs $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -Wl,-Bstatic $(shell pkg-config --libs libcrypto) -lcrypto -L. -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so openssl.o: openssl.c - $(CC) $(shell pkg-config --cflags openssl) $(CFLAGS) -c $< + $(CC) $(shell pkg-config --cflags openssl) $(OPENSSL_CFLAGS) $(CFLAGS) -c $< # BoringSSL shim @@ -127,7 +127,7 @@ gcrypt_provider.so: gcrypt.o c_utils.o | clibs $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -pthread -lpthread -Wl,-Bstatic $(shell libgcrypt-config --libs) -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so gcrypt.o: gcrypt.c - $(CC) $(shell libgcrypt-config --cflags) $(CFLAGS) -c $< + $(CC) $(shell libgcrypt-config --cflags) $(LIBGCRYPT_CFLAGS) $(CFLAGS) -c $< # Libtomcrypt shim @@ -147,7 +147,7 @@ botan_provider.so: botan.o cpp_utils.o | cpplibs $(CXX) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic $(shell pkg-config --libs botan-2) -Wl,-Bdynamic -l:lib_timing.so -l:lib_cppsignals.so botan.o: botan.cpp - $(CXX) $(shell pkg-config --cflags botan-2) $(CXXFLAGS) -c $< + $(CXX) $(shell pkg-config --cflags botan-2) $(BOTAN_CXXFLAGS) $(CXXFLAGS) -c $< # Crypto++ shim @@ -161,7 +161,7 @@ cryptopp_provider.so: cryptopp.o cpp_utils.o | cpplibs $(CXX) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic $(shell pkg-config --libs $(CRYPTOPP_NAME)) -Wl,-Bdynamic -l:lib_timing.so -l:lib_cppsignals.so cryptopp.o: cryptopp.cpp - $(CXX) $(shell pkg-config --cflags $(CRYPTOPP_NAME)) $(CXXFLAGS) -c $< + $(CXX) $(shell pkg-config --cflags $(CRYPTOPP_NAME)) $(CRYPTOPP_CXXFLAGS) $(CXXFLAGS) -c $< # mbedTLS shim @@ -171,7 +171,7 @@ mbedtls_provider.so: mbedtls.o c_utils.o | clibs $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic -lmbedcrypto -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so mbedtls.o: mbedtls.c - $(CC) $(CFLAGS) -c $< + $(CC) $(MBEDTLS_CFLAGS) $(CFLAGS) -c $< # Intel Performance Primitives crypto shim @@ -192,7 +192,7 @@ nettle_provider.so: nettle.o c_utils.o | clibs -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so nettle.o: nettle.c - $(CC) -Wl,-static $(shell pkg-config --cflags nettle hogweed gmp) $(CFLAGS) -c $< + $(CC) -Wl,-static $(shell pkg-config --cflags nettle hogweed gmp) $(NETTLE_CFLAGS) $(CFLAGS) -c $< # LibreSSL shim @@ -202,7 +202,7 @@ libressl_provider.so: libressl.o c_utils.o | clibs $(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 - $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $< + $(CC) $(shell pkg-config --cflags libresslcrypto) $(LIBRESSL_CFLAGS) $(CFLAGS) -c $< help: @echo "# This makefile builds the JNI shims necessary to test native libraries." |