Split Util class into a package.

8 files changed, 42 insertions, 41 deletions

diff --git a/src/cz/crcs/ectester/reader/CardMngr.java b/src/cz/crcs/ectester/reader/CardMngr.java
index ad5b368..cea46bc 100644
--- a/src/cz/crcs/ectester/reader/CardMngr.java
+++ b/src/cz/crcs/ectester/reader/CardMngr.java
@@ -2,7 +2,7 @@ package cz.crcs.ectester.reader;
 
 import com.licel.jcardsim.io.CAD;
 import com.licel.jcardsim.io.JavaxSmartCardInterface;
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.ByteUtil;
 import javacard.framework.AID;
 
 import javax.smartcardio.*;
@@ -80,7 +80,7 @@ public class CardMngr {
 
                 //reset the card
                 if (verbose)
-                    System.out.println(Util.bytesToHex(card.getATR().getBytes()));
+                    System.out.println(ByteUtil.bytesToHex(card.getATR().getBytes()));
 
                 cardFound = true;
             }
@@ -109,7 +109,7 @@ public class CardMngr {
                     try {
                         card = terminal.connect("*");
                         ATR atr = card.getATR();
-                        System.out.println(terminalIndex + " : " + terminal.getName() + " - " + Util.bytesToHex(atr.getBytes()));
+                        System.out.println(terminalIndex + " : " + terminal.getName() + " - " + ByteUtil.bytesToHex(atr.getBytes()));
                         terminalIndex++;
                     } catch (CardException ex) {
                         ex.printStackTrace(System.out);
@@ -227,7 +227,7 @@ public class CardMngr {
             System.out.println(">>>>");
             System.out.println(apdu);
 
-            System.out.println(Util.bytesToHex(apdu.getBytes()));
+            System.out.println(ByteUtil.bytesToHex(apdu.getBytes()));
         }
 
         long elapsed = -System.nanoTime();
@@ -238,7 +238,7 @@ public class CardMngr {
 
         if (verbose) {
             System.out.println(responseAPDU);
-            System.out.println(Util.bytesToHex(responseAPDU.getBytes()));
+            System.out.println(ByteUtil.bytesToHex(responseAPDU.getBytes()));
         }
 
         if (responseAPDU.getSW1() == (byte) 0x61) {
@@ -248,7 +248,7 @@ public class CardMngr {
 
             responseAPDU = channel.transmit(apduToSend);
             if (verbose)
-                System.out.println(Util.bytesToHex(responseAPDU.getBytes()));
+                System.out.println(ByteUtil.bytesToHex(responseAPDU.getBytes()));
         }
 
         if (verbose) {
@@ -277,7 +277,7 @@ public class CardMngr {
         if (verbose) {
             System.out.println(">>>>");
             System.out.println(apdu);
-            System.out.println(Util.bytesToHex(apdu.getBytes()));
+            System.out.println(ByteUtil.bytesToHex(apdu.getBytes()));
         }
 
         ResponseAPDU response = simulator.transmitCommand(apdu);
@@ -285,7 +285,7 @@ public class CardMngr {
 
         if (verbose) {
             System.out.println(response);
-            System.out.println(Util.bytesToHex(responseBytes));
+            System.out.println(ByteUtil.bytesToHex(responseBytes));
             System.out.println("<<<<");
         }
 
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 2c57107..d32d9d8 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -24,10 +24,10 @@ package cz.crcs.ectester.reader;
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.cli.CLITools;
-import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.common.ec.EC_Params;
 import cz.crcs.ectester.common.output.OutputLogger;
 import cz.crcs.ectester.common.test.TestException;
+import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.output.*;
@@ -385,8 +385,8 @@ public class ECTesterReader {
             }
             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);
+            String pub = ByteUtil.bytesToHex(export.getParameter(ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.PARAMETER_W), false);
+            String priv = ByteUtil.bytesToHex(export.getParameter(ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.PARAMETER_S), false);
             String line = String.format("%d;%d;%s;%s\n", generated, elapsed / 1000000, pub, priv);
             keysFile.write(line);
             keysFile.flush();
@@ -507,7 +507,7 @@ public class ECTesterReader {
             }
 
             if (out != null) {
-                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, Util.bytesToHex(perform.getSecret(), false)));
+                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, ByteUtil.bytesToHex(perform.getSecret(), false)));
             }
 
             ++done;
@@ -584,7 +584,7 @@ public class ECTesterReader {
             }
 
             if (out != null) {
-                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, Util.bytesToHex(perform.getSignature(), false)));
+                out.write(String.format("%d;%d;%s\n", done, perform.getDuration() / 1000000, ByteUtil.bytesToHex(perform.getSignature(), false)));
             }
 
             ++done;
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index 9d23322..b60db53 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -2,11 +2,11 @@ package cz.crcs.ectester.reader.command;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.response.Response;
-import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.common.ec.EC_Curve;
 import cz.crcs.ectester.common.ec.EC_Key;
 import cz.crcs.ectester.common.ec.EC_Keypair;
@@ -174,7 +174,7 @@ public abstract class Command {
             if (privkey == null) {
                 throw new IOException("Couldn't read the private key file correctly.");
             }
-            data = Util.concatenate(data, privkey);
+            data = ByteUtil.concatenate(data, privkey);
         }
         return new Command.Set(cardManager, keyPair, EC_Consts.CURVE_external, params, data);
     }
@@ -203,7 +203,7 @@ public abstract class Command {
             this.keyClass = keyClass;
 
             byte[] data = new byte[]{0, 0, keyClass};
-            Util.setShort(data, 0, keyLength);
+            ByteUtil.setShort(data, 0, keyLength);
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_ALLOCATE, keyPair, 0x00, data);
         }
 
@@ -296,7 +296,7 @@ public abstract class Command {
 
             int len = external != null ? 2 + external.length : 2;
             byte[] data = new byte[len];
-            Util.setShort(data, 0, params);
+            ByteUtil.setShort(data, 0, params);
             if (external != null) {
                 System.arraycopy(external, 0, data, 2, external.length);
             }
@@ -337,7 +337,7 @@ public abstract class Command {
             this.corruption = corruption;
 
             byte[] data = new byte[3];
-            Util.setShort(data, 0, params);
+            ByteUtil.setShort(data, 0, params);
             data[2] = corruption;
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_CORRUPT, keyPair, key, data);
@@ -403,7 +403,7 @@ public abstract class Command {
             this.params = params;
 
             byte[] data = new byte[2];
-            Util.setShort(data, 0, params);
+            ByteUtil.setShort(data, 0, params);
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_EXPORT, keyPair, key, data);
         }
@@ -446,7 +446,7 @@ public abstract class Command {
             this.type = type;
 
             byte[] data = new byte[]{export, 0,0, type};
-            Util.setShort(data, 1, corruption);
+            ByteUtil.setShort(data, 1, corruption);
 
             this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_ECDH, pubkey, privkey, data);
         }
@@ -489,7 +489,7 @@ public abstract class Command {
             this.pubkey = pubkey;
 
             byte[] data = new byte[3 + pubkey.length];
-            Util.setShort(data, 0, corruption);
+            ByteUtil.setShort(data, 0, corruption);
             data[2] = type;
             System.arraycopy(pubkey, 0, data, 3, pubkey.length);
 
@@ -526,7 +526,7 @@ public abstract class Command {
 
             int len = raw != null ? raw.length : 0;
             byte[] data = new byte[2 + len];
-            Util.setShort(data, 0, (short) len);
+            ByteUtil.setShort(data, 0, (short) len);
             if (raw != null) {
                 System.arraycopy(raw, 0, data, 2, len);
             }
diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index 0f5b6e8..1dbfdfa 100644
--- a/src/cz/crcs/ectester/reader/output/ResponseWriter.java
+++ b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.CardUtil;
 import cz.crcs.ectester.reader.response.Response;
 
 import java.io.PrintStream;
@@ -20,11 +20,11 @@ public class ResponseWriter {
         for (int j = 0; j < r.getNumSW(); ++j) {
             short sw = r.getSW(j);
             if (sw != 0) {
-                suffix.append(" ").append(Util.getSWString(sw));
+                suffix.append(" ").append(CardUtil.getSWString(sw));
             }
         }
         if (suffix.length() == 0) {
-            suffix.append(" [").append(Util.getSW(r.getNaturalSW())).append("]");
+            suffix.append(" [").append(CardUtil.getSW(r.getNaturalSW())).append("]");
         }
         return String.format("%4d ms ┃ %s", r.getDuration() / 1000000, suffix);
     }
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index 0a5155b..ebc93ac 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -1,7 +1,7 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.test.CompoundTest;
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.common.test.Test;
@@ -51,7 +51,7 @@ public class XMLTestWriter implements TestWriter {
         Element commandElem = doc.createElement("command");
 
         Element apdu = doc.createElement("apdu");
-        apdu.setTextContent(Util.bytesToHex(c.getAPDU().getBytes()));
+        apdu.setTextContent(ByteUtil.bytesToHex(c.getAPDU().getBytes()));
         commandElem.appendChild(apdu);
 
         return commandElem;
@@ -62,7 +62,7 @@ public class XMLTestWriter implements TestWriter {
         responseElem.setAttribute("successful", r.successful() ? "true" : "false");
 
         Element apdu = doc.createElement("apdu");
-        apdu.setTextContent(Util.bytesToHex(r.getAPDU().getBytes()));
+        apdu.setTextContent(ByteUtil.bytesToHex(r.getAPDU().getBytes()));
         responseElem.appendChild(apdu);
 
         Element naturalSW = doc.createElement("natural-sw");
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 84f1eac..d8350ac 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -1,7 +1,7 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.test.CompoundTest;
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.common.test.Test;
@@ -44,14 +44,14 @@ public class YAMLTestWriter implements TestWriter {
 
     private Map<String, Object> commandObject(Command c) {
         Map<String, Object> commandObj = new HashMap<>();
-        commandObj.put("apdu", Util.bytesToHex(c.getAPDU().getBytes()));
+        commandObj.put("apdu", ByteUtil.bytesToHex(c.getAPDU().getBytes()));
         return commandObj;
     }
 
     private Map<String, Object> responseObject(Response r) {
         Map<String, Object> responseObj = new HashMap<>();
         responseObj.put("successful", r.successful());
-        responseObj.put("apdu", Util.bytesToHex(r.getAPDU().getBytes()));
+        responseObj.put("apdu", ByteUtil.bytesToHex(r.getAPDU().getBytes()));
         responseObj.put("natural_sw", Short.toUnsignedInt(r.getNaturalSW()));
         List<Integer> sws = new LinkedList<>();
         for (int i = 0; i < r.getNumSW(); ++i) {
diff --git a/src/cz/crcs/ectester/reader/response/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index 4158ac3..d8edf9e 100644
--- a/src/cz/crcs/ectester/reader/response/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -2,7 +2,8 @@ package cz.crcs.ectester.reader.response;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.common.util.CardUtil;
 import javacard.framework.ISO7816;
 import javacard.security.KeyPair;
 
@@ -36,7 +37,7 @@ public abstract class Response {
         //parse SWs in response
         for (int i = 0; i < numSW; ++i) {
             if (getLength() >= (offset + 2)) {
-                short sw = Util.getShort(data, offset);
+                short sw = ByteUtil.getShort(data, offset);
                 offset += 2;
                 sws[i] = sw;
                 if (sw != ISO7816.SW_NO_ERROR) {
@@ -62,7 +63,7 @@ public abstract class Response {
                 error = true;
                 break;
             }
-            short paramLength = Util.getShort(data, offset);
+            short paramLength = ByteUtil.getShort(data, offset);
             offset += 2;
             if (data.length < offset + paramLength) {
                 error = true;
@@ -140,7 +141,7 @@ public abstract class Response {
 
         @Override
         public String getDescription() {
-            return String.format("Allocated KeyAgreement(%s) object", Util.getKATypeString(this.kaType));
+            return String.format("Allocated KeyAgreement(%s) object", CardUtil.getKATypeString(this.kaType));
         }
 
     }
@@ -289,7 +290,7 @@ public abstract class Response {
 
         @Override
         public String getDescription() {
-            String corrupt = Util.getCorruption(corruption);
+            String corrupt = CardUtil.getCorruption(corruption);
 
             String pair;
             if (keyPair == ECTesterApplet.KEYPAIR_BOTH) {
@@ -476,7 +477,7 @@ public abstract class Response {
 
         @Override
         public String getDescription() {
-            String algo = Util.getKA(type);
+            String algo = CardUtil.getKA(type);
 
             String pub = pubkey == ECTesterApplet.KEYPAIR_LOCAL ? "local" : "remote";
             String priv = privkey == ECTesterApplet.KEYPAIR_LOCAL ? "local" : "remote";
@@ -485,7 +486,7 @@ public abstract class Response {
             if (corruption == EC_Consts.CORRUPTION_NONE) {
                 validity = "unchanged";
             } else {
-                validity = Util.getCorruption(corruption);
+                validity = CardUtil.getCorruption(corruption);
             }
             return String.format("%s of %s pubkey and %s privkey(%s point)", algo, pub, priv, validity);
         }
diff --git a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
index 77653d1..98172f3 100644
--- a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
@@ -5,10 +5,10 @@ import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.test.CompoundTest;
 import cz.crcs.ectester.common.test.Result;
 import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
-import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.common.ec.*;
 import cz.crcs.ectester.reader.response.Response;
@@ -72,8 +72,8 @@ public class TestVectorSuite extends TestSuite {
                     return new Result(Value.FAILURE, "ECDH was unsuccessful.");
                 if (!dh.hasSecret())
                     return new Result(Value.FAILURE, "ECDH response did not contain the derived secret.");
-                if (!Util.compareBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength())) {
-                    int firstDiff = Util.diffBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength());
+                if (!ByteUtil.compareBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength())) {
+                    int firstDiff = ByteUtil.diffBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength());
                     return new Result(Value.FAILURE, "ECDH derived secret does not match the test, first difference was at byte " + String.valueOf(firstDiff) + ".");
                 }
                 return new Result(Value.SUCCESS);