aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cz/crcs/ectester/reader/ECTester.java10
-rw-r--r--src/cz/crcs/ectester/reader/output/ResponseWriter.java2
-rw-r--r--src/cz/crcs/ectester/reader/output/TextTestWriter.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 413acae..3de6094 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -387,7 +387,7 @@ public class ECTester {
while (generated < cfg.generateAmount || cfg.generateAmount == 0) {
if ((cfg.fresh || generated == 0) && curve != null) {
Response fresh = curve.send();
- logger.println(fresh.toString());
+ respWriter.outputResponse(fresh);
}
Command.Generate generate = new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL);
@@ -405,7 +405,7 @@ public class ECTester {
break;
}
}
- logger.println(response.toString());
+ respWriter.outputResponse(response);
String pub = Util.bytesToHex(export.getParameter(ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.PARAMETER_W), false);
String priv = Util.bytesToHex(export.getParameter(ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.PARAMETER_S), false);
@@ -415,7 +415,7 @@ public class ECTester {
generated++;
}
Response cleanup = new Command.Cleanup(cardManager).send();
- logger.println(cleanup.toString());
+ respWriter.outputResponse(cleanup);
keysFile.close();
}
@@ -535,7 +535,7 @@ public class ECTester {
++done;
}
Response cleanup = new Command.Cleanup(cardManager).send();
- logger.println(cleanup.toString());
+ respWriter.outputResponse(cleanup);
if (out != null)
out.close();
@@ -612,7 +612,7 @@ public class ECTester {
++done;
}
Response cleanup = new Command.Cleanup(cardManager).send();
- logger.println(cleanup.toString());
+ respWriter.outputResponse(cleanup);
if (out != null)
out.close();
diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index 120fdba..ee5d652 100644
--- a/src/cz/crcs/ectester/reader/output/ResponseWriter.java
+++ b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
@@ -31,7 +31,7 @@ public class ResponseWriter {
public void outputResponse(Response r) {
String out = "";
- out += String.format("%-70s:", r.getDescription()) + " : ";
+ out += String.format("%-70s", r.getDescription()) + " : ";
out += responseSuffix(r);
output.println(out);
output.flush();
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index ca42fba..a5cb526 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -49,7 +49,7 @@ public class TextTestWriter implements TestWriter {
}
out.append(testString(tests[i])).append(System.lineSeparator());
}
- out.append(String.format("%-70s:", testPrefix(t) + " : " + test.getDescription()));
+ out.append(String.format("%-70s", testPrefix(t) + " : " + test.getDescription()));
}
return out.toString();
}