5 files changed, 46 insertions, 30 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index ea2cbe4..a43c945 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -25,9 +25,12 @@ import cz.crcs.ectester.applet.ECTesterApplet;
 import static cz.crcs.ectester.applet.ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH;
 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.reader.response.Response;
+import cz.crcs.ectester.reader.test.TestSuite;
 import javacard.security.KeyPair;
 import org.apache.commons.cli.*;
 
diff --git a/src/cz/crcs/ectester/reader/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index cf05972..bab78c9 100644
--- a/src/cz/crcs/ectester/reader/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -1,8 +1,12 @@
-package cz.crcs.ectester.reader;
+package cz.crcs.ectester.reader.command;
 
 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.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;
@@ -192,7 +196,7 @@ public abstract class Command {
          * @param keyLength   key length to set
          * @param keyClass    key class to allocate
          */
-        protected Allocate(CardMngr cardManager, byte keyPair, short keyLength, byte keyClass) {
+        public Allocate(CardMngr cardManager, byte keyPair, short keyLength, byte keyClass) {
             super(cardManager);
             this.keyPair = keyPair;
             this.keyLength = keyLength;
@@ -223,7 +227,7 @@ public abstract class Command {
          * @param cardManager cardManager to send APDU through
          * @param kaType which type of KeyAgreement to use
          */
-        protected AllocateKeyAgreement(CardMngr cardManager, byte kaType) {
+        public AllocateKeyAgreement(CardMngr cardManager, byte kaType) {
             super(cardManager);
             this.kaType = kaType;
             byte[] data = new byte[]{kaType};
@@ -249,7 +253,7 @@ public abstract class Command {
          * @param cardManager cardManager to send APDU through
          * @param keyPair     which keyPair clear, local/remote (KEYPAIR_* || ...)
          */
-        protected Clear(CardMngr cardManager, byte keyPair) {
+        public Clear(CardMngr cardManager, byte keyPair) {
             super(cardManager);
             this.keyPair = keyPair;
 
@@ -283,7 +287,7 @@ public abstract class Command {
          * @param params      parameters to set (EC_Consts.PARAMETER_* | ...)
          * @param external    external curve data, can be null
          */
-        protected Set(CardMngr cardManager, byte keyPair, byte curve, short params, byte[] external) {
+        public Set(CardMngr cardManager, byte keyPair, byte curve, short params, byte[] external) {
             super(cardManager);
             this.keyPair = keyPair;
             this.curve = curve;
@@ -325,7 +329,7 @@ public abstract class Command {
          * @param params      parameters to corrupt (EC_Consts.PARAMETER_* | ...)
          * @param corruption  corruption type (EC_Consts.CORRUPTION_*)
          */
-        protected Corrupt(CardMngr cardManager, byte keyPair, byte key, short params, byte corruption) {
+        public Corrupt(CardMngr cardManager, byte keyPair, byte key, short params, byte corruption) {
             super(cardManager);
             this.keyPair = keyPair;
             this.key = key;
@@ -360,7 +364,7 @@ public abstract class Command {
          * @param cardManager cardManager to send APDU through
          * @param keyPair     which keyPair to generate, local/remote (KEYPAIR_* || ...)
          */
-        protected Generate(CardMngr cardManager, byte keyPair) {
+        public Generate(CardMngr cardManager, byte keyPair) {
             super(cardManager);
             this.keyPair = keyPair;
 
@@ -392,7 +396,7 @@ public abstract class Command {
          * @param key         key to export from (EC_Consts.KEY_* | ...)
          * @param params      params to export (EC_Consts.PARAMETER_* | ...)
          */
-        protected Export(CardMngr cardManager, byte keyPair, byte key, short params) {
+        public Export(CardMngr cardManager, byte keyPair, byte key, short params) {
             super(cardManager);
             this.keyPair = keyPair;
             this.key = key;
@@ -433,7 +437,7 @@ public abstract class Command {
          * @param corruption  whether to invalidate the pubkey before ECDH (EC_Consts.CORRUPTION_* | ...)
          * @param type        ECDH algorithm type (EC_Consts.KA_* | ...)
          */
-        protected ECDH(CardMngr cardManager, byte pubkey, byte privkey, byte export, short corruption, byte type) {
+        public ECDH(CardMngr cardManager, byte pubkey, byte privkey, byte export, short corruption, byte type) {
             super(cardManager);
             this.pubkey = pubkey;
             this.privkey = privkey;
@@ -476,7 +480,7 @@ public abstract class Command {
          * @param type        ECDH algorithm type (EC_Consts.KA_* | ...)
          * @param pubkey      pubkey data to do ECDH with.
          */
-        protected ECDH_direct(CardMngr cardManager, byte privkey, byte export, short corruption, byte type, byte[] pubkey) {
+        public ECDH_direct(CardMngr cardManager, byte privkey, byte export, short corruption, byte type, byte[] pubkey) {
             super(cardManager);
             this.privkey = privkey;
             this.export = export;
@@ -514,7 +518,7 @@ public abstract class Command {
          * @param export      whether to export ECDSA signature
          * @param raw         data to sign, can be null, in which case random data is signed.
          */
-        protected ECDSA(CardMngr cardManager, byte keyPair, byte export, byte[] raw) {
+        public ECDSA(CardMngr cardManager, byte keyPair, byte export, byte[] raw) {
             super(cardManager);
             this.keyPair = keyPair;
             this.export = export;
@@ -547,7 +551,7 @@ public abstract class Command {
         /**
          * @param cardManager cardManager to send APDU through
          */
-        protected Cleanup(CardMngr cardManager) {
+        public Cleanup(CardMngr cardManager) {
             super(cardManager);
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_CLEANUP, 0, 0);
@@ -570,7 +574,7 @@ public abstract class Command {
         /**
          * @param cardManager cardManager to send APDU through
          */
-        protected Support(CardMngr cardManager) {
+        public Support(CardMngr cardManager) {
             super(cardManager);
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_SUPPORT, 0, 0);
diff --git a/src/cz/crcs/ectester/reader/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index 3df956e..59b24fc 100644
--- a/src/cz/crcs/ectester/reader/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -1,8 +1,8 @@
-package cz.crcs.ectester.reader;
+package cz.crcs.ectester.reader.response;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.ec.EC_Curve;
+import cz.crcs.ectester.reader.Util;
 import javacard.framework.ISO7816;
 import javacard.security.KeyPair;
 
@@ -22,12 +22,12 @@ public abstract class Response {
     //TODO replace params with EC_Data?
     private boolean success = true;
 
-    protected Response(ResponseAPDU response, long time) {
+    public Response(ResponseAPDU response, long time) {
         this.resp = response;
         this.time = time;
     }
 
-    protected void parse(int numSW, int numParams) {
+    public void parse(int numSW, int numParams) {
         this.numSW = numSW;
         this.sws = new short[numSW];
 
@@ -160,7 +160,7 @@ public abstract class Response {
      */
     public static class AllocateKeyAgreement extends Response {
         byte kaType;
-        protected AllocateKeyAgreement(ResponseAPDU response, long time, byte kaType) {
+        public AllocateKeyAgreement(ResponseAPDU response, long time, byte kaType) {
             super(response, time);
             this.kaType = kaType;
 
@@ -180,7 +180,7 @@ public abstract class Response {
         private short keyLength;
         private byte keyClass;
 
-        protected Allocate(ResponseAPDU response, long time, byte keyPair, short keyLength, byte keyClass) {
+        public Allocate(ResponseAPDU response, long time, byte keyPair, short keyLength, byte keyClass) {
             super(response, time);
             this.keyPair = keyPair;
             this.keyLength = keyLength;
@@ -212,7 +212,7 @@ public abstract class Response {
 
         private byte keyPair;
 
-        protected Clear(ResponseAPDU response, long time, byte keyPair) {
+        public Clear(ResponseAPDU response, long time, byte keyPair) {
             super(response, time);
             this.keyPair = keyPair;
 
@@ -243,7 +243,7 @@ public abstract class Response {
         private byte curve;
         private short parameters;
 
-        protected Set(ResponseAPDU response, long time, byte keyPair, byte curve, short parameters) {
+        public Set(ResponseAPDU response, long time, byte keyPair, byte curve, short parameters) {
             super(response, time);
             this.keyPair = keyPair;
             this.curve = curve;
@@ -302,7 +302,7 @@ public abstract class Response {
         private short params;
         private byte corruption;
 
-        protected Corrupt(ResponseAPDU response, long time, byte keyPair, byte key, short params, byte corruption) {
+        public Corrupt(ResponseAPDU response, long time, byte keyPair, byte key, short params, byte corruption) {
             super(response, time);
             this.keyPair = keyPair;
             this.key = key;
@@ -337,7 +337,7 @@ public abstract class Response {
 
         private byte keyPair;
 
-        protected Generate(ResponseAPDU response, long time, byte keyPair) {
+        public Generate(ResponseAPDU response, long time, byte keyPair) {
             super(response, time);
             this.keyPair = keyPair;
 
@@ -369,7 +369,7 @@ public abstract class Response {
         private byte key;
         private short parameters;
 
-        protected Export(ResponseAPDU response, long time, byte keyPair, byte key, short parameters) {
+        public Export(ResponseAPDU response, long time, byte keyPair, byte key, short parameters) {
             super(response, time);
             this.keyPair = keyPair;
             this.key = key;
@@ -480,7 +480,7 @@ public abstract class Response {
         private short corruption;
         private byte type;
 
-        protected ECDH(ResponseAPDU response, long time, byte pubkey, byte privkey, byte export, short corruption, byte type) {
+        public ECDH(ResponseAPDU response, long time, byte pubkey, byte privkey, byte export, short corruption, byte type) {
             super(response, time);
             this.pubkey = pubkey;
             this.privkey = privkey;
@@ -529,7 +529,7 @@ public abstract class Response {
         private byte export;
         private byte[] raw;
 
-        protected ECDSA(ResponseAPDU response, long time, byte keyPair, byte export, byte[] raw) {
+        public ECDSA(ResponseAPDU response, long time, byte keyPair, byte export, byte[] raw) {
             super(response, time);
             this.keyPair = keyPair;
             this.export = export;
@@ -559,7 +559,7 @@ public abstract class Response {
      */
     public static class Cleanup extends Response {
 
-        protected Cleanup(ResponseAPDU response, long time) {
+        public Cleanup(ResponseAPDU response, long time) {
             super(response, time);
 
             parse(1, 0);
@@ -577,7 +577,7 @@ public abstract class Response {
      */
     public static class Support extends Response {
 
-        protected Support(ResponseAPDU response, long time) {
+        public Support(ResponseAPDU response, long time) {
             super(response, time);
 
             parse(3, 0);
diff --git a/src/cz/crcs/ectester/reader/Test.java b/src/cz/crcs/ectester/reader/test/Test.java
index 157e360..e22e0a4 100644
--- a/src/cz/crcs/ectester/reader/Test.java
+++ b/src/cz/crcs/ectester/reader/test/Test.java
@@ -1,4 +1,7 @@
-package cz.crcs.ectester.reader;
+package cz.crcs.ectester.reader.test;
+
+import cz.crcs.ectester.reader.command.Command;
+import cz.crcs.ectester.reader.response.Response;
 
 import javax.smartcardio.CardException;
 import java.util.function.BiFunction;
diff --git a/src/cz/crcs/ectester/reader/TestSuite.java b/src/cz/crcs/ectester/reader/test/TestSuite.java
index 24b72a3..2f52f38 100644
--- a/src/cz/crcs/ectester/reader/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestSuite.java
@@ -1,9 +1,15 @@
-package cz.crcs.ectester.reader;
+package cz.crcs.ectester.reader.test;
 
 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.DirtyLogger;
+import cz.crcs.ectester.reader.ECTester;
+import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.ec.*;
+import cz.crcs.ectester.reader.response.Response;
 import javacard.security.KeyPair;
 
 import javax.smartcardio.CardException;