From 03ec7382a82d411bd5d16ed0c5f12c28a42c62c2 Mon Sep 17 00:00:00 2001 From: J08nY Date: Fri, 5 Jan 2018 17:18:44 +0100 Subject: Fix YAML output key mis-rename. --- src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java | 2 +- src/cz/crcs/ectester/reader/ECTesterReader.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java index e9c293f..af76927 100644 --- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java +++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java @@ -48,7 +48,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter { for (Test innerTest : test.getTests()) { innerTests.add(testObject(innerTest)); } - testObj.put("run", innerTests); + testObj.put("tests", innerTests); } else { SimpleTest test = (SimpleTest) t; testObj = testableObject(test.getTestable()); diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java index 63c779c..48d34b3 100644 --- a/src/cz/crcs/ectester/reader/ECTesterReader.java +++ b/src/cz/crcs/ectester/reader/ECTesterReader.java @@ -364,7 +364,8 @@ public class ECTesterReader { private void generate() throws CardException, IOException { byte keyClass = cfg.primeField ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M; - new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_LOCAL, (short) cfg.bits, keyClass).send(); + Response allocate = new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_LOCAL, (short) cfg.bits, keyClass).send(); + respWriter.outputResponse(allocate); Command curve = Command.prepareCurve(cardManager, dataStore, cfg, ECTesterApplet.KEYPAIR_LOCAL, (short) cfg.bits, keyClass); FileWriter keysFile = new FileWriter(cfg.output); -- cgit v1.2.3-70-g09d2