Split the ec package into common package, rename reader part of the project.

16 files changed, 33 insertions, 766 deletions

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/ec/EC_Category.java b/src/cz/crcs/ectester/reader/ec/EC_Category.java
deleted file mode 100644
index 41cbad8..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Category.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.TreeMap;
-
-/**
- * A category of EC_Data objects, has a name, description and represents a directory in
- * the cz.crcs.ectester.data package.
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Category {
-
-    private String name;
-    private String directory;
-    private String desc;
-
-    private Map<String, EC_Data> objects;
-
-
-    public EC_Category(String name, String directory) {
-        this.name = name;
-        this.directory = directory;
-    }
-
-    public EC_Category(String name, String directory, String desc) {
-        this(name, directory);
-        this.desc = desc;
-    }
-
-    public EC_Category(String name, String directory, String desc, Map<String, EC_Data> objects) {
-        this(name, directory, desc);
-        this.objects = objects;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDirectory() {
-        return directory;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public Map<String, EC_Data> getObjects() {
-        return Collections.unmodifiableMap(objects);
-    }
-
-    public <T extends EC_Data> Map<String, T> getObjects(Class<T> cls) {
-        Map<String, T> objs = new TreeMap<>();
-        for (Map.Entry<String, EC_Data> entry : objects.entrySet()) {
-            if (cls.isInstance(entry.getValue())) {
-                objs.put(entry.getKey(), cls.cast(entry.getValue()));
-            }
-        }
-        return Collections.unmodifiableMap(objs);
-    }
-
-    public <T extends EC_Data> T getObject(Class<T> cls, String id) {
-        EC_Data obj = objects.get(id);
-        if (cls.isInstance(obj)) {
-            return cls.cast(obj);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder out = new StringBuilder();
-        out.append("\t- ").append(name).append((desc == null || desc.equals("")) ? "" : ": " + desc);
-        out.append(System.lineSeparator());
-
-        Map<String, EC_Curve> curves = getObjects(EC_Curve.class);
-        int size = curves.size();
-        if (size > 0) {
-            out.append("\t\tCurves: ");
-            for (Map.Entry<String, EC_Curve> curve : curves.entrySet()) {
-                out.append(curve.getKey());
-                size--;
-                if (size > 0)
-                    out.append(", ");
-            }
-            out.append(System.lineSeparator());
-        }
-
-        Map<String, EC_Key> keys = getObjects(EC_Key.class);
-        size = keys.size();
-        if (size > 0) {
-            out.append("\t\tKeys: ");
-            for (Map.Entry<String, EC_Key> key : keys.entrySet()) {
-                out.append(key.getKey());
-                size--;
-                if (size > 0)
-                    out.append(", ");
-            }
-            out.append(System.lineSeparator());
-        }
-
-        Map<String, EC_Keypair> keypairs = getObjects(EC_Keypair.class);
-        size = keypairs.size();
-        if (size > 0) {
-            out.append("\t\tKeypairs: ");
-            for (Map.Entry<String, EC_Keypair> key : keypairs.entrySet()) {
-                out.append(key.getKey());
-                size--;
-                if (size > 0)
-                    out.append(", ");
-            }
-            out.append(System.lineSeparator());
-        }
-
-        Map<String, EC_KAResult> results = getObjects(EC_KAResult.class);
-        size = results.size();
-        if (size > 0) {
-            out.append("\t\tResults: ");
-            for (Map.Entry<String, EC_KAResult> result : results.entrySet()) {
-                out.append(result.getKey());
-                size--;
-                if (size > 0)
-                    out.append(", ");
-            }
-            out.append(System.lineSeparator());
-        }
-        return out.toString();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EC_Category && Objects.equals(this.name, ((EC_Category) obj).name);
-    }
-
-    @Override
-    public int hashCode() {
-        return this.name.hashCode() ^ this.directory.hashCode();
-    }
-
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
deleted file mode 100644
index cb4a2df..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.applet.EC_Consts;
-import javacard.security.KeyPair;
-
-/**
- * An Elliptic curve, contains parameters Fp/F2M, A, B, G, R, (K)?.
- *
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Curve extends EC_Params {
-    private short bits;
-    private byte field;
-    private String desc;
-
-    /**
-     * @param bits
-     * @param field KeyPair.ALG_EC_FP or KeyPair.ALG_EC_F2M
-     */
-    public EC_Curve(short bits, byte field) {
-        super(field == KeyPair.ALG_EC_FP ? EC_Consts.PARAMETERS_DOMAIN_FP : EC_Consts.PARAMETERS_DOMAIN_F2M);
-        this.bits = bits;
-        this.field = field;
-    }
-
-    public EC_Curve(String id, short bits, byte field) {
-        this(bits, field);
-        this.id = id;
-    }
-
-    public EC_Curve(String id, short bits, byte field, String desc) {
-        this(id, bits, field);
-        this.desc = desc;
-    }
-
-    public short getBits() {
-        return bits;
-    }
-
-    public byte getField() {
-        return field;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    @Override
-    public String toString() {
-        return "<" + getId() + "> " + (field == KeyPair.ALG_EC_FP ? "Prime" : "Binary") + " field Elliptic curve (" + String.valueOf(bits) + "b)" + (desc == null ? "" : ": " + desc);
-    }
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Data.java b/src/cz/crcs/ectester/reader/ec/EC_Data.java
deleted file mode 100644
index 0ceddef..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Data.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.reader.Util;
-
-import java.io.*;
-import java.util.*;
-import java.util.regex.Pattern;
-
-/**
- * A list of byte arrays for holding EC data.
- *
- * The data can be read from a byte array via <code>readBytes()</code>, from a CSV via <code>readCSV()</code>.
- * The data can be exported to a byte array via <code>flatten()</code> or to a string array via <code>expand()</code>.
- * @author Jan Jancar johny@neuromancer.sk
- */
-public abstract class EC_Data {
-    String id;
-    int count;
-    byte[][] data;
-
-    private static final Pattern HEX = Pattern.compile("(0x|0X)?[a-fA-F\\d]+");
-
-    EC_Data() {
-    }
-
-    EC_Data(int count) {
-        this.count = count;
-        this.data = new byte[count][];
-    }
-
-    EC_Data(byte[][] data) {
-        this.count = data.length;
-        this.data = data;
-    }
-
-    EC_Data(String id, int count) {
-        this(count);
-        this.id = id;
-    }
-
-    EC_Data(String id, byte[][] data) {
-        this(data);
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public byte[][] getData() {
-        return data;
-    }
-
-    public boolean hasData() {
-        return data != null;
-    }
-
-    public byte[] getParam(int index) {
-        return data[index];
-    }
-
-    public byte[] flatten() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for (byte[] param : data) {
-            byte[] length = new byte[2];
-            Util.setShort(length, 0, (short) param.length);
-
-            out.write(length, 0, 2);
-            out.write(param, 0, param.length);
-        }
-
-        return out.toByteArray();
-    }
-
-    public String[] expand() {
-        List<String> out = new ArrayList<>(count);
-        for (byte[] param : data) {
-            out.add(Util.bytesToHex(param, false));
-        }
-
-        return out.toArray(new String[out.size()]);
-    }
-
-    private static byte[] pad(byte[] data) {
-        if (data.length == 1) {
-            return new byte[]{(byte) 0, data[0]};
-        } else if (data.length == 0 || data.length > 2) {
-            return data;
-        }
-        return null;
-    }
-
-    private static byte[] parse(String param) {
-        byte[] data;
-        if (param.startsWith("0x") || param.startsWith("0X")) {
-            data = Util.hexToBytes(param.substring(2));
-        } else {
-            data = Util.hexToBytes(param);
-        }
-        if (data == null)
-            return new byte[0];
-        if (data.length < 2)
-            return pad(data);
-        return data;
-    }
-
-    private boolean readHex(String[] hex) {
-        if (hex.length != count) {
-            return false;
-        }
-
-        for (int i = 0; i < count; ++i) {
-            this.data[i] = parse(hex[i]);
-        }
-        return true;
-    }
-
-    public boolean readCSV(InputStream in) {
-        Scanner s = new Scanner(in);
-
-        s.useDelimiter(",|;");
-        List<String> data = new LinkedList<>();
-        while (s.hasNext()) {
-            String field = s.next();
-            data.add(field.replaceAll("\\s+", ""));
-        }
-
-        if (data.isEmpty()) {
-            return false;
-        }
-        for (String param : data) {
-            if (!HEX.matcher(param).matches()) {
-                return false;
-            }
-        }
-        return readHex(data.toArray(new String[data.size()]));
-    }
-
-    public boolean readBytes(byte[] bytes) {
-        int offset = 0;
-        for (int i = 0; i < count; i++) {
-            if (bytes.length - offset < 2) {
-                return false;
-            }
-            short paramLength = Util.getShort(bytes, offset);
-            offset += 2;
-            if (bytes.length < offset + paramLength) {
-                return false;
-            }
-            data[i] = new byte[paramLength];
-            System.arraycopy(bytes, offset, data[i], 0, paramLength);
-            offset += paramLength;
-        }
-        return true;
-    }
-
-    public void writeCSV(OutputStream out) throws IOException {
-        Writer w = new OutputStreamWriter(out);
-        w.write(String.join(",", expand()));
-        w.flush();
-    }
-
-    @Override
-    public String toString() {
-        return String.join(",", expand());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof EC_Data) {
-            EC_Data other = (EC_Data) obj;
-            if (this.id != null || other.id != null) {
-                return Objects.equals(this.id, other.id);
-            }
-
-            if (this.count != other.count)
-                return false;
-            for (int i = 0; i < this.count; ++i) {
-                if (!Arrays.equals(this.data[i], other.data[i])) {
-                    return false;
-                }
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        if (this.id != null) {
-            return this.id.hashCode();
-        }
-        return Arrays.deepHashCode(this.data);
-    }
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
deleted file mode 100644
index 4a67bbe..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.reader.Util;
-
-/**
- * A result of EC based Key agreement operation.
- *
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_KAResult extends EC_Data {
-
-    private byte ka;
-    private String curve;
-    private String oneKey;
-    private String otherKey;
-
-    private String desc;
-
-    public EC_KAResult(byte ka, String curve, String oneKey, String otherKey) {
-        super(1);
-        this.ka = ka;
-        this.curve = curve;
-        this.oneKey = oneKey;
-        this.otherKey = otherKey;
-    }
-
-    public EC_KAResult(String id, byte ka, String curve, String oneKey, String otherKey) {
-        this(ka, curve, oneKey, otherKey);
-        this.id = id;
-    }
-
-    public EC_KAResult(String id, byte ka, String curve, String oneKey, String otherKey, String desc) {
-        this(id, ka, curve, oneKey, otherKey);
-        this.desc = desc;
-    }
-
-    public byte getKA() {
-        return ka;
-    }
-
-    public String getCurve() {
-        return curve;
-    }
-
-    public String getOneKey() {
-        return oneKey;
-    }
-
-    public String getOtherKey() {
-        return otherKey;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    @Override
-    public String toString() {
-        String algo = Util.getKA(ka);
-        return "<" + getId() + "> " + algo + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
-    }
-
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Key.java b/src/cz/crcs/ectester/reader/ec/EC_Key.java
deleted file mode 100644
index 5077d5b..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Key.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.applet.EC_Consts;
-
-/**
- * An abstract-like EC key. Concrete implementations create a public and private keys.
- *
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Key extends EC_Params {
-
-    private String curve;
-    private String desc;
-
-    private EC_Key(short mask, String curve) {
-        super(mask);
-        this.curve = curve;
-    }
-
-    private EC_Key(short mask, String curve, String desc) {
-        this(mask, curve);
-        this.desc = desc;
-    }
-
-    private EC_Key(String id, short mask, String curve, String desc) {
-        this(mask, curve, desc);
-        this.id = id;
-    }
-
-    public String getCurve() {
-        return curve;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * An EC public key, contains the W parameter.
-     */
-    public static class Public extends EC_Key {
-
-        public Public(String curve) {
-            super(EC_Consts.PARAMETER_W, curve);
-        }
-
-        public Public(String curve, String desc) {
-            super(EC_Consts.PARAMETER_W, curve, desc);
-        }
-
-        public Public(String id, String curve, String desc) {
-            super(id, EC_Consts.PARAMETER_W, curve, desc);
-        }
-
-        @Override
-        public String toString() {
-            return "<" + getId() + "> EC Public key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
-        }
-    }
-
-    /**
-     * An EC private key, contains the S parameter.
-     */
-    public static class Private extends EC_Key {
-
-        public Private(String curve) {
-            super(EC_Consts.PARAMETER_S, curve);
-        }
-
-        public Private(String curve, String desc) {
-            super(EC_Consts.PARAMETER_S, curve, desc);
-        }
-
-        public Private(String id, String curve, String desc) {
-            super(id, EC_Consts.PARAMETER_S, curve, desc);
-        }
-
-        @Override
-        public String toString() {
-            return "<" + getId() + "> EC Private key, over " + getCurve() + (getDesc() == null ? "" : ": " + getDesc());
-        }
-    }
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
deleted file mode 100644
index 2643346..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.applet.EC_Consts;
-
-/**
- * An EC keypair, contains both the W and S parameters.
- *
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Keypair extends EC_Params {
-    private String curve;
-    private String desc;
-
-    public EC_Keypair(String curve) {
-        super(EC_Consts.PARAMETERS_KEYPAIR);
-        this.curve = curve;
-    }
-
-    public EC_Keypair(String curve, String desc) {
-        this(curve);
-        this.desc = desc;
-    }
-
-    public EC_Keypair(String id, String curve, String desc) {
-        this(curve, desc);
-        this.id = id;
-    }
-
-    public String getCurve() {
-        return curve;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    @Override
-    public String toString() {
-        return "<" + getId() + "> EC Keypair, over " + curve + (desc == null ? "" : ": " + desc);
-    }
-}
diff --git a/src/cz/crcs/ectester/reader/ec/EC_Params.java b/src/cz/crcs/ectester/reader/ec/EC_Params.java
deleted file mode 100644
index 6fb164b..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Params.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.Util;
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A list of EC parameters, can contain a subset of the Fp/F2M, A, B, G, R, K, W, S parameters.
- *
- * The set of parameters is uniquely identified by a short bit string.
- * The parameters can be exported to a byte array via <code>flatten()</code> or to a comma delimited
- * string via <code>expand()</code>.
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Params extends EC_Data {
-    private short params;
-
-    public EC_Params(short params) {
-        this.params = params;
-        this.count = numParams();
-        this.data = new byte[this.count][];
-    }
-
-    public EC_Params(short params, byte[][] data) {
-        this.params = params;
-        this.count = data.length;
-        this.data = data;
-    }
-
-    public EC_Params(String id, short params) {
-        this(params);
-        this.id = id;
-    }
-
-    public EC_Params(String id, short params, byte[][] data) {
-        this(params, data);
-        this.id = id;
-    }
-
-    public short getParams() {
-        return params;
-    }
-
-    public boolean hasParam(short param) {
-        return (params & param) != 0;
-    }
-
-    public int numParams() {
-        short paramMask = EC_Consts.PARAMETER_FP;
-        int num = 0;
-        while (paramMask <= EC_Consts.PARAMETER_S) {
-            if ((paramMask & params) != 0) {
-                if (paramMask == EC_Consts.PARAMETER_F2M) {
-                    num += 3;
-                }
-                if (paramMask == EC_Consts.PARAMETER_W || paramMask == EC_Consts.PARAMETER_G) {
-                    num += 1;
-                }
-                ++num;
-            }
-            paramMask = (short) (paramMask << 1);
-        }
-        return num;
-    }
-
-    @Override
-    public byte[] flatten() {
-        return flatten(params);
-    }
-
-    public byte[] flatten(short params) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        short paramMask = EC_Consts.PARAMETER_FP;
-        int i = 0;
-        while (paramMask <= EC_Consts.PARAMETER_S) {
-            short masked = (short) (this.params & params & paramMask);
-            short shallow = (short) (this.params & paramMask);
-            if (masked != 0) {
-                byte[] param = data[i];
-                if (masked == EC_Consts.PARAMETER_F2M) {
-                    //add m, e_1, e_2, e_3
-                    param = Util.concatenate(param, data[i + 1]);
-                    if (!Util.allValue(data[i + 2], (byte) 0)) {
-                        param = Util.concatenate(param, data[i + 2]);
-                    }
-                    if (!Util.allValue(data[i + 3], (byte) 0)) {
-                        param = Util.concatenate(param, data[i + 3]);
-                    }
-                    if (!(param.length == 4 || param.length == 8))
-                        throw new RuntimeException("PARAMETER_F2M length is not 8.(should be)");
-                }
-                if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
-                    //read another param (the y coord) and put into X962 format.
-                    byte[] y = data[i + 1];
-                    param = Util.concatenate(new byte[]{4}, param, y); //<- ugly but works!
-                }
-                if (param.length == 0)
-                    throw new RuntimeException("Empty parameter read?");
-
-                //write length
-                byte[] length = new byte[2];
-                Util.setShort(length, 0, (short) param.length);
-                out.write(length, 0, 2);
-                //write data
-                out.write(param, 0, param.length);
-            }
-            if (shallow == EC_Consts.PARAMETER_F2M) {
-                i += 4;
-            } else if (shallow == EC_Consts.PARAMETER_G || shallow == EC_Consts.PARAMETER_W) {
-                i += 2;
-            } else if (shallow != 0) {
-                i++;
-            }
-            paramMask = (short) (paramMask << 1);
-        }
-
-        return (out.size() == 0) ? null : out.toByteArray();
-    }
-
-    @Override
-    public String[] expand() {
-        List<String> out = new ArrayList<>();
-
-        short paramMask = EC_Consts.PARAMETER_FP;
-        int index = 0;
-        while (paramMask <= EC_Consts.PARAMETER_S) {
-            short masked = (short) (params & paramMask);
-            if (masked != 0) {
-                byte[] param = data[index];
-                if (masked == EC_Consts.PARAMETER_F2M) {
-                    for (int i = 0; i < 4; ++i) {
-                        out.add(Util.bytesToHex(data[index + i], false));
-                    }
-                    index += 4;
-                } else if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
-                    out.add(Util.bytesToHex(param, false));
-                    out.add(Util.bytesToHex(data[index + 1], false));
-                    index += 2;
-                } else {
-                    out.add(Util.bytesToHex(param, false));
-                    index++;
-                }
-            }
-            paramMask = (short) (paramMask << 1);
-        }
-        return out.toArray(new String[out.size()]);
-    }
-}
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.");
     }