Add better chunking support and detect it at runtime.

1 files changed, 13 insertions, 8 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 9447814..ab21cd9 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -81,9 +81,9 @@ public class ECTesterReader {
     private static String CLI_HEADER;
     private static String CLI_FOOTER = "\n" + LICENSE;
 
-    private static final byte[] SELECT_ECTESTERAPPLET = {(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x00, (byte) 0x0a,
-            (byte) 0x45, (byte) 0x43, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x30, (byte) 0x31};
-    private static final byte[] AID = {(byte) 0x45, (byte) 0x43, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x30, (byte) 0x31};
+    private static final byte[] SELECT_PREFIX = {(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x00, (byte) 0x0c};
+    private static final byte[] AID_221 = {(byte) 0x45, (byte) 0x43, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x30, (byte) 0x33, (byte) 0x32, (byte) 0x62}; // VERSION v0.3.2
+    private static final byte[] AID_222 = {(byte) 0x45, (byte) 0x43, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x30, (byte) 0x33, (byte) 0x32, (byte) 0x78}; // VERSION v0.3.2
     private static final byte[] INSTALL_DATA = new byte[10];
 
     static {
@@ -137,7 +137,7 @@ public class ECTesterReader {
 
             //connect or simulate connection
             if (cfg.simulate) {
-                if (!cardManager.prepareLocalSimulatorApplet(AID, INSTALL_DATA, ECTesterApplet.class)) {
+                if (!cardManager.prepareLocalSimulatorApplet(AID_221, INSTALL_DATA, ECTesterApplet.class)) {
                     System.err.println(Colors.error("Failed to establish a simulator."));
                     System.exit(1);
                 }
@@ -146,11 +146,16 @@ public class ECTesterReader {
                     System.err.println(Colors.error("Failed to connect to card."));
                     System.exit(1);
                 }
-                ResponseAPDU selectResp = cardManager.send(SELECT_ECTESTERAPPLET);
+                ResponseAPDU selectResp = cardManager.send(ByteUtil.concatenate(SELECT_PREFIX, AID_222));
                 if ((short) selectResp.getSW() != ISO7816.SW_NO_ERROR) {
-                    System.err.println(Colors.error("Failed to select ECTester applet, is it installed?"));
-                    cardManager.disconnectFromCard();
-                    System.exit(1);
+                    selectResp = cardManager.send(ByteUtil.concatenate(SELECT_PREFIX, AID_221));
+                    if ((short) selectResp.getSW() != ISO7816.SW_NO_ERROR) {
+                        System.err.println(Colors.error("Failed to select ECTester applet, is it installed?"));
+                        cardManager.disconnectFromCard();
+                        System.exit(1);
+                    } else {
+                        cardManager.setChunking(true);
+                    }
                 }
             }