20 files changed, 43 insertions, 66 deletions

diff --git a/build.xml b/build.xml
index 3d778f3..f89b743 100644
--- a/build.xml
+++ b/build.xml
@@ -70,28 +70,6 @@
     nbproject/build-impl.xml file. 
 
     -->
-    <!--
-    <path id="classpath">
-        <fileset dir="lib" includes="**/*.jar"/>
-    </path>
-
-    <target name="clean">
-        <delete file="dist/ECTester.jar"/>
-    </target>
-    <target name="build">
-        <javac srcdir="src" destdir="dist/production/ECTester" classpathref="classpath" excludes="**/SimpleAPDU.java"/>
-    </target>
-    <target name="jar" depends="build">
-        <jar destfile="dist/ECTester.jar">
-            <fileset dir="dist/production/ECTester"/>
-            <fileset dir="dist/data"/>
-            <manifest>
-                <attribute name="Main-Class" value="ECTester"/>
-                <attribute name="Class-Path" value="lib/jcardsim-2.2.2-all.jar lib/commons-cli-1.3.1.jar"/>
-            </manifest>
-        </jar>
-    </target>
-    -->
     <target name="-post-jar">
         <copy file="src/cz/crcs/ectester/scripts/ectester.sh" todir="${dist.dir}"/>
         <copy file="src/cz/crcs/ectester/scripts/ectester.bat" todir="${dist.dir}"/>
diff --git a/manifest.mf b/manifest.mf
index 2cb1a50..cbfea93 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Class-Path: lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.3.1.jar lib/snakeyaml-1.19.jar
-Main-Class: cz.crcs.ectester.reader.ECTester
+Main-Class: cz.crcs.ectester.reader.ECTesterReader
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 152dc9c..8c65b4e 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -59,7 +59,7 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-main.class=cz.crcs.ectester.reader.ECTester
+main.class=cz.crcs.ectester.reader.ECTesterReader
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Category.java b/src/cz/crcs/ectester/common/ec/EC_Category.java
index 41cbad8..32a788d 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Category.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Category.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/common/ec/EC_Curve.java
index cb4a2df..19cfe2d 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Curve.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
 import javacard.security.KeyPair;
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/common/ec/EC_Data.java
index 0ceddef..da97208 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Data.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.reader.Util;
 
diff --git a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
index 4a67bbe..b215d0e 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.reader.Util;
 
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Key.java b/src/cz/crcs/ectester/common/ec/EC_Key.java
index 5077d5b..a34b0e7 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Key.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Key.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
 
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java b/src/cz/crcs/ectester/common/ec/EC_Keypair.java
index 2643346..53632cd 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Keypair.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
 
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Params.java b/src/cz/crcs/ectester/common/ec/EC_Params.java
index 6fb164b..5b8295e 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Params.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Params.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.reader.Util;
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index 9b1f5bb..3103c1d 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -1,7 +1,7 @@
 package cz.crcs.ectester.data;
 
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.ec.*;
+import cz.crcs.ectester.common.ec.*;
 import javacard.security.KeyPair;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 550e070..4eadfd3 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -25,9 +25,9 @@ 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.command.Command;
-import cz.crcs.ectester.reader.ec.EC_Category;
-import cz.crcs.ectester.reader.ec.EC_Data;
-import cz.crcs.ectester.reader.ec.EC_Params;
+import cz.crcs.ectester.common.ec.EC_Category;
+import cz.crcs.ectester.common.ec.EC_Data;
+import cz.crcs.ectester.common.ec.EC_Params;
 import cz.crcs.ectester.reader.output.*;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.test.*;
@@ -49,7 +49,7 @@ import static cz.crcs.ectester.applet.ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH
  * @author Jan Jancar johny@neuromancer.sk
  * @version v0.1.0
  */
-public class ECTester {
+public class ECTesterReader {
 
     private CardMngr cardManager;
     private OutputLogger logger;
@@ -60,7 +60,7 @@ public class ECTester {
 
     private Options opts = new Options();
     private static final String VERSION = "v0.1.0";
-    private static final String DESCRIPTION = "ECTester " + VERSION + ", a javacard Elliptic Curve Cryptograhy support tester/utility.";
+    private static final String DESCRIPTION = "ECTesterReader " + VERSION + ", a javacard Elliptic Curve Cryptograhy support tester/utility.";
     private static final String LICENSE = "MIT Licensed\nCopyright (c) 2016-2017 Petr Svenda <petr@svenda.com>";
     private static final String CLI_HEADER = "\n" + DESCRIPTION + "\n\n";
     private static final String CLI_FOOTER = "\n" + LICENSE;
@@ -314,7 +314,7 @@ public class ECTester {
     private void help() {
         HelpFormatter help = new HelpFormatter();
         help.setOptionComparator(null);
-        help.printHelp("ECTester.jar", CLI_HEADER, opts, CLI_FOOTER, true);
+        help.printHelp("ECTesterReader.jar", CLI_HEADER, opts, CLI_FOOTER, true);
     }
 
     /**
@@ -629,7 +629,7 @@ public class ECTester {
     }
 
     public static void main(String[] args) {
-        ECTester app = new ECTester();
+        ECTesterReader app = new ECTesterReader();
         app.run(args);
     }
 
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index 3c11456..3668fbb 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -4,13 +4,13 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.Util;
-import cz.crcs.ectester.reader.ec.EC_Curve;
-import cz.crcs.ectester.reader.ec.EC_Key;
-import cz.crcs.ectester.reader.ec.EC_Keypair;
-import cz.crcs.ectester.reader.ec.EC_Params;
+import cz.crcs.ectester.common.ec.EC_Curve;
+import cz.crcs.ectester.common.ec.EC_Key;
+import cz.crcs.ectester.common.ec.EC_Keypair;
+import cz.crcs.ectester.common.ec.EC_Params;
 import javacard.security.KeyPair;
 
 import javax.smartcardio.CardException;
@@ -54,7 +54,7 @@ public abstract class Command {
      * @return a Command to send in order to prepare the curve on the keypairs.
      * @throws IOException if curve file cannot be found/opened
      */
-    public static Command prepareCurve(CardMngr cardManager, EC_Store dataStore, ECTester.Config cfg, byte keyPair, short keyLength, byte keyClass) throws IOException {
+    public static Command prepareCurve(CardMngr cardManager, EC_Store dataStore, ECTesterReader.Config cfg, byte keyPair, short keyLength, byte keyClass) throws IOException {
 
         if (cfg.customCurve) {
             // Set custom curve (one of the SECG curves embedded applet-side)
@@ -109,7 +109,7 @@ public abstract class Command {
      * @return a CommandAPDU setting params loaded on the keyPair/s
      * @throws IOException if any of the key files cannot be found/opened
      */
-    public static Command prepareKey(CardMngr cardManager, EC_Store dataStore, ECTester.Config cfg, byte keyPair) throws IOException {
+    public static Command prepareKey(CardMngr cardManager, EC_Store dataStore, ECTesterReader.Config cfg, byte keyPair) throws IOException {
         short params = EC_Consts.PARAMETERS_NONE;
         byte[] data = null;
 
diff --git a/src/cz/crcs/ectester/reader/response/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index 4abfd14..b816a97 100644
--- a/src/cz/crcs/ectester/reader/response/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -3,7 +3,6 @@ package cz.crcs.ectester.reader.response;
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.reader.Util;
-import cz.crcs.ectester.reader.ec.EC_Data;
 import javacard.framework.ISO7816;
 import javacard.security.KeyPair;
 
diff --git a/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java
index 8e7ca31..9c8393d 100644
--- a/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java
@@ -4,10 +4,10 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.ec.EC_Curve;
-import cz.crcs.ectester.reader.ec.EC_Key;
+import cz.crcs.ectester.common.ec.EC_Curve;
+import cz.crcs.ectester.common.ec.EC_Key;
 import javacard.security.KeyPair;
 
 import java.util.Map;
@@ -19,7 +19,7 @@ import static cz.crcs.ectester.reader.test.Result.ExpectedValue;
  */
 public class CompositeCurvesSuite extends TestSuite {
 
-    public CompositeCurvesSuite(EC_Store dataStore, ECTester.Config cfg) {
+    public CompositeCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "composite", "The composite suite tests ECDH over curves with composite order. This should generally fail, as using such a curve is unsafe.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/DefaultSuite.java b/src/cz/crcs/ectester/reader/test/DefaultSuite.java
index 736b7c5..b487a6e 100644
--- a/src/cz/crcs/ectester/reader/test/DefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/DefaultSuite.java
@@ -4,7 +4,7 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
 import javacard.security.KeyPair;
 
@@ -17,7 +17,7 @@ import static cz.crcs.ectester.reader.test.Result.ExpectedValue;
  */
 public class DefaultSuite extends TestSuite {
 
-    public DefaultSuite(EC_Store dataStore, ECTester.Config cfg) {
+    public DefaultSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "default", "The default test suite tests basic support of ECDH and ECDSA.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java b/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java
index f61b695..3dcabb3 100644
--- a/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java
@@ -4,10 +4,10 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.ec.EC_Curve;
-import cz.crcs.ectester.reader.ec.EC_Key;
+import cz.crcs.ectester.common.ec.EC_Curve;
+import cz.crcs.ectester.common.ec.EC_Key;
 import javacard.security.KeyPair;
 
 import java.io.IOException;
@@ -23,7 +23,7 @@ import static cz.crcs.ectester.reader.test.Result.ExpectedValue;
  */
 public class InvalidCurvesSuite extends TestSuite {
 
-    public InvalidCurvesSuite(EC_Store dataStore, ECTester.Config cfg) {
+    public InvalidCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "invalid", "The invalid curve suite tests whether the card rejects points outside of the curve during ECDH.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/TestSuite.java b/src/cz/crcs/ectester/reader/test/TestSuite.java
index f13317c..3b6af5a 100644
--- a/src/cz/crcs/ectester/reader/test/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestSuite.java
@@ -4,9 +4,9 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.ec.EC_Curve;
+import cz.crcs.ectester.common.ec.EC_Curve;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -23,12 +23,12 @@ import static cz.crcs.ectester.reader.test.Result.Value;
  */
 public abstract class TestSuite {
     EC_Store dataStore;
-    ECTester.Config cfg;
+    ECTesterReader.Config cfg;
     String name;
     String description;
     List<Test> tests = new LinkedList<>();
 
-    TestSuite(EC_Store dataStore, ECTester.Config cfg, String name, String description) {
+    TestSuite(EC_Store dataStore, ECTesterReader.Config cfg, String name, String description) {
         this.dataStore = dataStore;
         this.cfg = cfg;
         this.name = name;
diff --git a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
index ff46feb..6a3121b 100644
--- a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
@@ -4,10 +4,10 @@ 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.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.Util;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.ec.*;
+import cz.crcs.ectester.common.ec.*;
 import cz.crcs.ectester.reader.response.Response;
 import javacard.security.KeyPair;
 
@@ -24,7 +24,7 @@ import static cz.crcs.ectester.reader.test.Result.Value;
  */
 public class TestVectorSuite extends TestSuite {
 
-    public TestVectorSuite(EC_Store dataStore, ECTester.Config cfg) {
+    public TestVectorSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "test", "The test-vectors suite contains a collection of test vectors which test basic ECDH correctness.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java b/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
index e9389b4..09f10d3 100644
--- a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
@@ -2,7 +2,7 @@ package cz.crcs.ectester.reader.test;
 
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
-import cz.crcs.ectester.reader.ECTester;
+import cz.crcs.ectester.reader.ECTesterReader;
 import javacard.security.KeyPair;
 
 import java.io.IOException;
@@ -14,7 +14,7 @@ import static cz.crcs.ectester.reader.test.Result.ExpectedValue;
  */
 public class WrongCurvesSuite extends TestSuite {
 
-    public WrongCurvesSuite(EC_Store dataStore, ECTester.Config cfg) {
+    public WrongCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "wrong", "The wrong curve suite tests whether the card rejects domain parameters which are not curves.");
     }