Add support for deterministic PRNG to OpenSSL.

3 files changed, 58 insertions, 5 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 4f76639..7967bcb 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -191,7 +191,8 @@ public class ECTesterStandalone {
         Option output = Option.builder("o").longOpt("output").desc("Output into file <output_file>. The file can be prefixed by the format (one of text,yml,xml), such as: xml:<output_file>.").hasArgs().argName("output_file").optionalArg(false).numberOfArgs(1).build();
         Option outputRaw = Option.builder("o").longOpt("output").desc("Output CSV into file <output_file>.").hasArgs().argName("output_file").optionalArg(false).numberOfArgs(1).build();
         Option quiet = Option.builder("q").longOpt("quiet").desc("Do not output to stdout.").build();
-        Option timeSource = Option.builder("ts").longOpt("time-source").desc("Use a given native timing source: {rdtsc, monotonic, monotonic-raw, cputime-process, cputime-thread, perfcount}").hasArgs().argName("source").optionalArg(false).numberOfArgs(1).build();
+        Option timeSource = Option.builder("ts").longOpt("time-source").desc("Use a given native timing source: {rdtsc, monotonic, monotonic-raw, cputime-process, cputime-thread}").hasArgs().argName("source").optionalArg(false).numberOfArgs(1).build();
+        Option prngSeed = Option.builder("ps").longOpt("prng-seed").desc("Use a deterministic PRNG with the given seed (hexadecimal).").hasArgs().argName("seed").optionalArg(false).numberOfArgs(1).build();
 
         Options testOpts = new Options();
         testOpts.addOption(bits);
@@ -199,6 +200,7 @@ public class ECTesterStandalone {
         testOpts.addOption(curveName);
         testOpts.addOption(output);
         testOpts.addOption(quiet);
+        testOpts.addOption(prngSeed);
         testOpts.addOption(Option.builder("gt").longOpt("kpg-type").desc("Set the KeyPairGenerator object [type].").hasArg().argName("type").optionalArg(false).build());
         testOpts.addOption(Option.builder("kt").longOpt("ka-type").desc("Set the KeyAgreement object [type].").hasArg().argName("type").optionalArg(false).build());
         testOpts.addOption(Option.builder("st").longOpt("sig-type").desc("Set the Signature object [type].").hasArg().argName("type").optionalArg(false).build());
@@ -215,6 +217,7 @@ public class ECTesterStandalone {
         ecdhOpts.addOption(curveName);
         ecdhOpts.addOption(outputRaw);
         ecdhOpts.addOption(timeSource);
+        ecdhOpts.addOption(prngSeed);
         ecdhOpts.addOption(Option.builder("t").longOpt("type").desc("Set KeyAgreement object [type].").hasArg().argName("type").optionalArg(false).build());
         ecdhOpts.addOption(Option.builder().longOpt("key-type").desc("Set the key [algorithm] for which the key should be derived in KeyAgreements with KDF. Default is \"AES\".").hasArg().argName("algorithm").optionalArg(false).build());
         ecdhOpts.addOption(Option.builder("n").longOpt("amount").hasArg().argName("amount").optionalArg(false).desc("Do ECDH [amount] times.").build());
@@ -231,6 +234,7 @@ public class ECTesterStandalone {
         ecdsaOpts.addOption(curveName);
         ecdsaOpts.addOption(outputRaw);
         ecdsaOpts.addOption(timeSource);
+        ecdsaOpts.addOption(prngSeed);
         ecdsaOpts.addOptionGroup(privateKey);
         ecdsaOpts.addOptionGroup(publicKey);
         ecdsaOpts.addOption(Option.builder().longOpt("fixed").desc("Perform all ECDSA with fixed keypair.").build());
@@ -246,6 +250,7 @@ public class ECTesterStandalone {
         generateOpts.addOption(curveName);
         generateOpts.addOption(outputRaw);
         generateOpts.addOption(timeSource);
+        generateOpts.addOption(prngSeed);
         generateOpts.addOption(Option.builder("n").longOpt("amount").hasArg().argName("amount").optionalArg(false).desc("Generate [amount] of EC keys.").build());
         generateOpts.addOption(Option.builder("t").longOpt("type").hasArg().argName("type").optionalArg(false).desc("Set KeyPairGenerator object [type].").build());
         ParserOptions generate = new ParserOptions(new DefaultParser(), generateOpts, "Generate EC keypairs.");
@@ -307,6 +312,7 @@ public class ECTesterStandalone {
                 System.out.println(Colors.bold("\t\t- Fullname: ") + lib.getProvider().getName());
                 System.out.println(Colors.bold("\t\t- Version: ") + lib.getProvider().getVersionStr());
                 System.out.println(Colors.bold("\t\t- Supports native timing: ") + lib.getNativeTimingSupport().toString());
+                System.out.println(Colors.bold("\t\t- Supports deterministic PRNG: ") + lib.supportsDeterministicPRNG());
                 Set<KeyPairGeneratorIdent> kpgs = lib.getKPGs();
                 if (!kpgs.isEmpty()) {
                     System.out.println(Colors.bold("\t\t- KeyPairGenerators: ") + kpgs.stream().map(KeyPairGeneratorIdent::getName).sorted().collect(Collectors.joining(", ")));
@@ -430,6 +436,12 @@ public class ECTesterStandalone {
             kpg.initialize(spec);
         }
 
+        if (cli.hasOption("ecdh.prng-seed")) {
+            String seedString = cli.getOptionValue("ecdh.prng-seed");
+            byte[] seed = ByteUtil.hexToBytes(seedString, true);
+            lib.setupDeterministicPRNG(seed);
+        }
+
         if (cli.hasOption("ecdh.time-source")) {
             if (!lib.setNativeTimingType(cli.getOptionValue("ecdh.time-source"))) {
                 System.err.println("Couldn't set native time source.");
@@ -586,6 +598,12 @@ public class ECTesterStandalone {
             kpg.initialize(new ECGenParameterSpec(curveName));
         }
 
+        if (cli.hasOption("ecdsa.prng-seed")) {
+            String seedString = cli.getOptionValue("ecdsa.prng-seed");
+            byte[] seed = ByteUtil.hexToBytes(seedString, true);
+            lib.setupDeterministicPRNG(seed);
+        }
+
         if (cli.hasOption("ecdsa.time-source")) {
             if (!lib.setNativeTimingType(cli.getOptionValue("ecdsa.time-source"))) {
                 System.err.println("Couldn't set native time source.");
@@ -722,6 +740,12 @@ public class ECTesterStandalone {
             kpg.initialize(new ECGenParameterSpec(curveName));
         }
 
+        if (cli.hasOption("generate.prng-seed")) {
+            String seedString = cli.getOptionValue("generate.prng-seed");
+            byte[] seed = ByteUtil.hexToBytes(seedString, true);
+            lib.setupDeterministicPRNG(seed);
+        }
+
         if (cli.hasOption("generate.time-source")) {
             if (!lib.setNativeTimingType(cli.getOptionValue("generate.time-source"))) {
                 System.err.println("Couldn't set native time source.");
@@ -818,6 +842,13 @@ public class ECTesterStandalone {
             testTo = -1;
         }
 
+        ProviderECLibrary lib = cfg.selected;
+        if (cli.hasOption("test.prng-seed")) {
+            String seedString = cli.getOptionValue("test.prng-seed");
+            byte[] seed = ByteUtil.hexToBytes(seedString, true);
+            lib.setupDeterministicPRNG(seed);
+        }
+
         switch (testSuite) {
             case "test-vectors":
                 suite = new StandaloneTestVectorSuite(writer, cfg, cli);
@@ -997,6 +1028,15 @@ public class ECTesterStandalone {
                 }
             }
 
+            if (cli.isNext("generate") || cli.isNext("ecdh") || cli.isNext("ecdsa") || cli.isNext("test")) {
+                if (cli.hasOption(next + ".prng-seed")) {
+                    if (!selected.supportsDeterministicPRNG()) {
+                        System.err.printf("Deterministic PRNG is not supported by library %s.%n", selected.name());
+                        return false;
+                    }
+                }
+            }
+
             return true;
         }
     }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
index 61f00a4..13490f9 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
@@ -16,4 +16,10 @@ public class OpensslLib extends NativeECLibrary {
 
     @Override
     public native Set<String> getCurves();
+
+    @Override
+    public native boolean supportsDeterministicPRNG();
+
+    @Override
+    public native void setupDeterministicPRNG(byte[] seed);
 }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
index d9d6749..936120f 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
@@ -69,21 +69,28 @@ public abstract class ProviderECLibrary implements ECLibrary {
     }
 
     public boolean setNativeTimingType(String type) {
-    	return false;
+        return false;
     }
 
     public long getNativeTimingResolution() {
         return 0;
     }
 
-	public String getNativeTimingUnit() {
-		return null;
-	}
+    public String getNativeTimingUnit() {
+        return null;
+    }
 
     public long getLastNativeTiming() {
         return 0;
     }
 
+    public boolean supportsDeterministicPRNG() {
+        return false;
+    }
+
+    public void setupDeterministicPRNG(byte[] seed) {
+    }
+
     @Override
     public Set<KeyAgreementIdent> getKAs() {
         return getIdents("KeyAgreement", KeyAgreementIdent::get);