diff options
| author | J08nY | 2024-03-31 12:49:50 +0200 |
|---|---|---|
| committer | J08nY | 2024-03-31 12:49:50 +0200 |
| commit | bce5eb73cf88f523469be08f7b71783dca9f3a73 (patch) | |
| tree | f36d37a1f785d56c0caea7b6fbf086e83aa631bb /standalone/src/main/java | |
| parent | 6c2d68b4772b5276e2abd6208aee2618b6e32227 (diff) | |
| download | ECTester-bce5eb73cf88f523469be08f7b71783dca9f3a73.tar.gz ECTester-bce5eb73cf88f523469be08f7b71783dca9f3a73.tar.zst ECTester-bce5eb73cf88f523469be08f7b71783dca9f3a73.zip | |
Run all test suites in CI.
Diffstat (limited to 'standalone/src/main/java')
3 files changed, 3 insertions, 3 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 a3b6e5b..c702dee 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java @@ -197,6 +197,7 @@ public class ECTesterStandalone { Option bits = Option.builder("b").longOpt("bits").hasArg().argName("n").optionalArg(false).desc("What size of curve to use.").numberOfArgs(1).build(); 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(); Options testOpts = new Options(); @@ -204,6 +205,7 @@ public class ECTesterStandalone { testOpts.addOption(namedCurve); testOpts.addOption(curveName); testOpts.addOption(output); + testOpts.addOption(quiet); 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()); @@ -759,7 +761,7 @@ public class ECTesterStandalone { * */ private void test() throws TestException, ParserConfigurationException, FileNotFoundException { - TestWriter writer = new FileTestWriter(cli.getOptionValue("test.format", "text"), true, cli.getOptionValues("test.output")); + TestWriter writer = new FileTestWriter(cli.getOptionValue("test.format", "text"), !cli.hasOption("test.quiet"), cli.getOptionValues("test.output")); StandaloneTestSuite suite; switch (cli.getArg(0).toLowerCase()) { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java index dd982aa..afed02b 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java @@ -411,7 +411,6 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { return generateSecret(pubkey, privkey, spec); } catch (NoSuchAlgorithmException | InvalidParameterSpecException e) { - e.printStackTrace(); return null; } } diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java index 571a2ee..9557288 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java @@ -618,7 +618,6 @@ public abstract class NativeSignatureSpi extends SignatureSpi { return verify(signature, data, pubkey, spec); } catch (NoSuchAlgorithmException | InvalidParameterSpecException e) { - e.printStackTrace(); return false; } } |
