Allow for no-preload option and correctly handle PRNG support.

Author: J08nY

nix/commonlibs.nix

@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     pkg-config
     cmake
     which
-    jdk17_headless
+    jdk
   ];
 
   dontUseCmakeConfigure = true;
 
-  libs = "lib_cppsignals.so lib_csignals.so lib_timing.so lib_preload.so lib_prng.so";
+  libs = "lib_cppsignals.so lib_csignals.so lib_timing.so lib_preload.so lib_prng.so lib_prng_dummy.so";
 
   buildPhase = ''
     make ${libs}

standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java

@@ -107,6 +107,7 @@ private void run(String[] args) {
                 FileUtil.write(LIB_RESOURCE_DIR + "lib_timing.so", reqs.resolve("lib_timing.so"));
                 FileUtil.write(LIB_RESOURCE_DIR + "lib_preload.so", reqs.resolve("lib_preload.so"));
                 FileUtil.write(LIB_RESOURCE_DIR + "lib_prng.so", reqs.resolve("lib_prng.so"));
+                FileUtil.write(LIB_RESOURCE_DIR + "lib_prng_dummy.so", reqs.resolve("lib_prng_dummy.so"));
                 FileUtil.write(LIB_RESOURCE_DIR + "lib_csignals.so", reqs.resolve("lib_csignals.so"));
                 FileUtil.write(LIB_RESOURCE_DIR + "lib_cppsignals.so", reqs.resolve("lib_cppsignals.so"));
 
@@ -146,7 +147,13 @@ private void run(String[] args) {
                     System.exit(result);
                 } else {
                     // Load the utility libs.
-                    System.load(reqs.resolve("lib_prng.so").toString());
+                    if (cli.hasOption("no-preload")) {
+                        System.err.println("Loading dummy");
+                        System.load(reqs.resolve("lib_prng_dummy.so").toString());
+                    } else {
+                        System.err.println("Loading right");
+                        System.load(reqs.resolve("lib_prng.so").toString());
+                    }
                     System.load(reqs.resolve("lib_timing.so").toString());
                     System.load(reqs.resolve("lib_csignals.so").toString());
                     System.load(reqs.resolve("lib_cppsignals.so").toString());

standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java

@@ -17,9 +17,4 @@ public BoringsslLib() {
     @Override
     public native Set<String> getCurves();
 
-    @Override
-    public boolean supportsDeterministicPRNG() {
-        // This is provided by the native preload that hooks all randomness sources.
-        return true;
-    }
 }

standalone/src/main/java/cz/crcs/ectester/standalone/libs/GcryptLib.java

@@ -9,18 +9,12 @@
 public class GcryptLib extends NativeECLibrary {
 
     public GcryptLib() {
-        super("libgcrypt","gcrypt_provider");
+        super("libgcrypt", "gcrypt_provider");
     }
 
     @Override
     native Provider createProvider();
 
     @Override
     public native Set<String> getCurves();
-
-    @Override
-    public boolean supportsDeterministicPRNG() {
-        // This is provided by the native preload that hooks all randomness sources.
-        return true;
-    }
 }

standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java

@@ -17,9 +17,4 @@ public LibresslLib() {
     @Override
     public native Set<String> getCurves();
 
-    @Override
-    public boolean supportsDeterministicPRNG() {
-        // This is provided by the native preload that hooks all randomness sources.
-        return true;
-    }
 }

standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java

@@ -74,6 +74,9 @@ public boolean initialize() {
     @Override
     public native long getLastNativeTiming();
 
+    @Override
+    public native boolean supportsDeterministicPRNG();
+
     @Override
     public native boolean setupDeterministicPRNG(byte[] seed);
 

standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile

@@ -77,7 +77,10 @@ prng.o: prng/prng.c
 	$(CC) $(CFLAGS) -c $<
 
 lib_prng.so: c_prng.c
-	$(CC) -o $@ -shared -Wl,-soname,lib_prng.so $(CFLAGS) $<
+	$(CC) -o $@ -shared $(CFLAGS) -Wl,-soname,lib_prng.so $<
+
+lib_prng_dummy.so: c_prng.c
+	$(CC) -DDUMMY_PRELOAD=1 $(CFLAGS) -o $@ -shared -Wl,-soname,lib_prng_dummy.so  $<
 
 c_preload.o: c_preload.c
 	$(CC) $(CFLAGS) -c $<
@@ -95,9 +98,9 @@ cpp_utils.o: cpp_utils.cpp
 	$(CXX) $(CXXFLAGS) -c $<
 
 
-clibs: lib_timing.so lib_csignals.so lib_preload.so lib_prng.so
+clibs: lib_timing.so lib_csignals.so lib_preload.so lib_prng.so lib_prng_dummy.so
 
-cpplibs: lib_timing.so lib_cppsignals.so lib_preload.so lib_prng.so
+cpplibs: lib_timing.so lib_cppsignals.so lib_preload.so lib_prng.so lib_prng_dummy.so
 
 
 # OpenSSL shim

standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile.ext

@@ -77,7 +77,10 @@ prng.o: prng/prng.c
 	$(CC) $(CFLAGS) -c $<
 
 lib_prng.so: c_prng.c
-	$(CC) -o $@ -shared -Wl,-soname,lib_prng.so $(CFLAGS) $<
+	$(CC) -o $@ -shared $(CFLAGS) -Wl,-soname,lib_prng.so $<
+
+lib_prng_dummy.so: c_prng.c
+	$(CC) -DDUMMY_PRELOAD=1 $(CFLAGS) -o $@ -shared -Wl,-soname,lib_prng_dummy.so  $<
 
 c_preload.o: c_preload.c
 	$(CC) $(CFLAGS) -c $<
@@ -95,9 +98,9 @@ cpp_utils.o: cpp_utils.cpp
 	$(CXX) $(CXXFLAGS) -c $<
 
 
-clibs: lib_timing.so lib_csignals.so lib_preload.so lib_prng.so
+clibs: lib_timing.so lib_csignals.so lib_preload.so lib_prng.so lib_prng_dummy.so
 
-cpplibs: lib_timing.so lib_cppsignals.so lib_preload.so lib_prng.so
+cpplibs: lib_timing.so lib_cppsignals.so lib_preload.so lib_prng.so lib_prng_dummy.so
 
 # OpenSSL shim
 openssl: openssl_provider.so

standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_prng.c

@@ -2,9 +2,25 @@
 #include <stdbool.h>
 #include "prng/prng.h"
 
+#ifdef DUMMY_PRELOAD
+
+JNIEXPORT jboolean JNICALL Java_cz_crcs_ectester_standalone_libs_NativeECLibrary_supportsDeterministicPRNG(JNIEnv *env, jobject self) {
+	return JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL Java_cz_crcs_ectester_standalone_libs_NativeECLibrary_setupDeterministicPRNG(JNIEnv *env, jobject self, jbyteArray seed) {
+	return JNI_FALSE;
+}
+
+#else
+
 extern prng_state preload_prng_state;
 extern bool preload_prng_enabled;
 
+JNIEXPORT jboolean JNICALL Java_cz_crcs_ectester_standalone_libs_NativeECLibrary_supportsDeterministicPRNG(JNIEnv *env, jobject self) {
+	return JNI_TRUE;
+}
+
 JNIEXPORT jboolean JNICALL Java_cz_crcs_ectester_standalone_libs_NativeECLibrary_setupDeterministicPRNG(JNIEnv *env, jobject self, jbyteArray seed) {
 	jsize seed_length = (*env)->GetArrayLength(env, seed);
 	jbyte *seed_data = (*env)->GetByteArrayElements(env, seed, NULL);
@@ -15,4 +31,6 @@ JNIEXPORT jboolean JNICALL Java_cz_crcs_ectester_standalone_libs_NativeECLibrary
 
 	(*env)->ReleaseByteArrayElements(env, seed, seed_data, JNI_ABORT);
 	return JNI_TRUE;
-}
+}
+#endif
+