aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cz/crcs/ectester/reader/ECTester.java10
-rw-r--r--src/cz/crcs/ectester/reader/output/OutputWriter.java4
-rw-r--r--src/cz/crcs/ectester/reader/output/TextOutputWriter.java4
-rw-r--r--src/cz/crcs/ectester/reader/output/XMLOutputWriter.java4
-rw-r--r--src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java (renamed from src/cz/crcs/ectester/reader/output/HTMLOutputWriter.java)8
-rw-r--r--src/cz/crcs/ectester/reader/test/TestSuite.java19
6 files changed, 24 insertions, 25 deletions
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 0d558cb..1b69998 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -351,7 +351,7 @@ public class ECTester {
sent.add(export);
for (Response r : sent) {
- writer.printResponse(r);
+ writer.outputResponse(r);
}
EC_Params exported = new EC_Params(domain, export.getParams());
@@ -480,7 +480,7 @@ public class ECTester {
prepare.add(curve.send());
for (Response r : prepare) {
- writer.printResponse(r);
+ writer.outputResponse(r);
}
byte pubkey = (cfg.anyPublicKey || cfg.anyKey) ? ECTesterApplet.KEYPAIR_REMOTE : ECTesterApplet.KEYPAIR_LOCAL;
@@ -506,7 +506,7 @@ public class ECTester {
Response.ECDH perform = new Command.ECDH(cardManager, pubkey, privkey, ECTesterApplet.EXPORT_TRUE, EC_Consts.CORRUPTION_NONE, cfg.ECDHKA).send();
ecdh.add(perform);
for (Response r : ecdh) {
- writer.printResponse(r);
+ writer.outputResponse(r);
}
if (!perform.successful() || !perform.hasSecret()) {
@@ -565,7 +565,7 @@ public class ECTester {
prepare.add(curve.send());
for (Response r : prepare) {
- writer.printResponse(r);
+ writer.outputResponse(r);
}
FileWriter out = null;
@@ -583,7 +583,7 @@ public class ECTester {
Response.ECDSA perform = new Command.ECDSA(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_TRUE, data).send();
ecdsa.add(perform);
for (Response r : ecdsa) {
- writer.printResponse(r);
+ writer.outputResponse(r);
}
if (!perform.successful() || !perform.hasSignature()) {
diff --git a/src/cz/crcs/ectester/reader/output/OutputWriter.java b/src/cz/crcs/ectester/reader/output/OutputWriter.java
index 761d712..09185b1 100644
--- a/src/cz/crcs/ectester/reader/output/OutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/OutputWriter.java
@@ -12,7 +12,7 @@ import javax.xml.transform.TransformerException;
*/
public interface OutputWriter {
void begin();
- void printResponse(Response r);
- void printTest(Test t);
+ void outputResponse(Response r);
+ void outputTest(Test t);
void end();
}
diff --git a/src/cz/crcs/ectester/reader/output/TextOutputWriter.java b/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
index 7e62e89..6887f61 100644
--- a/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
@@ -39,7 +39,7 @@ public class TextOutputWriter implements OutputWriter {
}
@Override
- public void printResponse(Response r) {
+ public void outputResponse(Response r) {
String out = "";
out += String.format("%-62s:", r.getDescription()) + " : ";
out += responseSuffix(r);
@@ -48,7 +48,7 @@ public class TextOutputWriter implements OutputWriter {
}
@Override
- public void printTest(Test t) {
+ public void outputTest(Test t) {
if (!t.hasRun())
return;
diff --git a/src/cz/crcs/ectester/reader/output/XMLOutputWriter.java b/src/cz/crcs/ectester/reader/output/XMLOutputWriter.java
index 4f72a16..b9f8c8f 100644
--- a/src/cz/crcs/ectester/reader/output/XMLOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLOutputWriter.java
@@ -65,7 +65,7 @@ public class XMLOutputWriter implements OutputWriter {
}
@Override
- public void printResponse(Response r) {
+ public void outputResponse(Response r) {
root.appendChild(responseElement(r));
}
@@ -96,7 +96,7 @@ public class XMLOutputWriter implements OutputWriter {
}
@Override
- public void printTest(Test t) {
+ public void outputTest(Test t) {
if (!t.hasRun())
return;
root.appendChild(testElement(t));
diff --git a/src/cz/crcs/ectester/reader/output/HTMLOutputWriter.java b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
index c20771d..34ff29a 100644
--- a/src/cz/crcs/ectester/reader/output/HTMLOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
@@ -6,19 +6,19 @@ import cz.crcs.ectester.reader.test.Test;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
-public class HTMLOutputWriter implements OutputWriter {
+public class YAMLOutputWriter implements OutputWriter {
@Override
public void begin() {
}
@Override
- public void printResponse(Response r) {
+ public void outputResponse(Response r) {
}
@Override
- public void printTest(Test t) {
+ public void outputTest(Test t) {
}
@@ -26,4 +26,4 @@ public class HTMLOutputWriter implements OutputWriter {
public void end() {
}
-} \ No newline at end of file
+}
diff --git a/src/cz/crcs/ectester/reader/test/TestSuite.java b/src/cz/crcs/ectester/reader/test/TestSuite.java
index 33c462f..8369439 100644
--- a/src/cz/crcs/ectester/reader/test/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestSuite.java
@@ -4,7 +4,6 @@ import cz.crcs.ectester.applet.ECTesterApplet;
import cz.crcs.ectester.applet.EC_Consts;
import cz.crcs.ectester.data.EC_Store;
import cz.crcs.ectester.reader.CardMngr;
-import cz.crcs.ectester.reader.output.OutputLogger;
import cz.crcs.ectester.reader.ECTester;
import cz.crcs.ectester.reader.Util;
import cz.crcs.ectester.reader.command.Command;
@@ -40,7 +39,7 @@ public abstract class TestSuite {
for (Test t : tests) {
if (!t.hasRun()) {
t.run();
- writer.printTest(t);
+ writer.outputTest(t);
}
}
writer.end();
@@ -62,7 +61,7 @@ public abstract class TestSuite {
* @param ecdsaExpected expected result of the ordinary ECDSA command
* @return tests to run
*/
- List<Test> testCurve(CardMngr cardManager, Test.Result generateExpected, Test.Result ecdhExpected, Test.Result ecdsaExpected) {
+ List<Test> defaultCurveTests(CardMngr cardManager, Test.Result generateExpected, Test.Result ecdhExpected, Test.Result ecdsaExpected) {
List<Test> tests = new LinkedList<>();
tests.add(new Test.Simple(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH), generateExpected));
@@ -87,7 +86,7 @@ public abstract class TestSuite {
* @param ecdsaExpected expected result of the ordinary ECDSA command
* @return tests to run
*/
- List<Test> testCategory(CardMngr cardManager, String category, byte field, Test.Result setExpected, Test.Result generateExpected, Test.Result ecdhExpected, Test.Result ecdsaExpected) {
+ List<Test> defaultCategoryTests(CardMngr cardManager, String category, byte field, Test.Result setExpected, Test.Result generateExpected, Test.Result ecdhExpected, Test.Result ecdsaExpected) {
List<Test> tests = new LinkedList<>();
Map<String, EC_Curve> curves = dataStore.getObjects(EC_Curve.class, category);
if (curves == null)
@@ -97,7 +96,7 @@ public abstract class TestSuite {
if (curve.getField() == field && (curve.getBits() == cfg.bits || cfg.all)) {
tests.add(new Test.Simple(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), field), Test.Result.SUCCESS));
tests.add(new Test.Simple(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), setExpected));
- tests.addAll(testCurve(cardManager, generateExpected, ecdhExpected, ecdsaExpected));
+ tests.addAll(defaultCurveTests(cardManager, generateExpected, ecdhExpected, ecdsaExpected));
tests.add(new Test.Simple(new Command.Cleanup(cardManager), Test.Result.ANY));
}
}
@@ -116,10 +115,10 @@ public abstract class TestSuite {
tests.add(new Test.Simple(new Command.Support(cardManager), Test.Result.ANY));
if (cfg.namedCurve != null) {
if (cfg.primeField) {
- tests.addAll(testCategory(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
+ tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
}
if (cfg.binaryField) {
- tests.addAll(testCategory(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
+ tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
}
} else {
if (cfg.all) {
@@ -153,7 +152,7 @@ public abstract class TestSuite {
Command curve = Command.prepareCurve(cardManager, dataStore, cfg, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType);
if (curve != null)
tests.add(new Test.Simple(curve, Test.Result.SUCCESS));
- tests.addAll(testCurve(cardManager, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
+ tests.addAll(defaultCurveTests(cardManager, Test.Result.SUCCESS, Test.Result.SUCCESS, Test.Result.SUCCESS));
tests.add(new Test.Simple(new Command.Cleanup(cardManager), Test.Result.ANY));
}
}
@@ -312,10 +311,10 @@ public abstract class TestSuite {
* These should generally fail, the curves aren't curves.
*/
if (cfg.primeField) {
- tests.addAll(testCategory(cardManager, cfg.testSuite, KeyPair.ALG_EC_FP, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE));
+ tests.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_FP, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE));
}
if (cfg.binaryField) {
- tests.addAll(testCategory(cardManager, cfg.testSuite, KeyPair.ALG_EC_F2M, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE));
+ tests.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_F2M, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE));
}
return super.run(cardManager);
}
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 15:18:23 +0000