11 files changed, 151 insertions, 5 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 6ace3a0..29eb671 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -20,10 +20,13 @@ public abstract class BaseTextTestWriter implements TestWriter {
     public void begin(TestSuite suite) {
         output.println("═══ Running test suite: " + suite.getName() + " ═══");
         output.println("═══ " + suite.getDescription());
+        output.print(deviceString(suite));
     }
 
     protected abstract String testableString(Testable t);
 
+    protected abstract String deviceString(TestSuite suite);
+
     private String testString(Test t, String prefix) {
         if (!t.hasRun()) {
             return null;
diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index 9d3c8f3..f3e9411 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
@@ -39,10 +39,13 @@ public abstract class BaseXMLTestWriter implements TestWriter {
 
         root = rootElem;
         doc.appendChild(root);
+        root.appendChild(deviceElement(suite));
     }
 
     protected abstract Element testableElement(Testable t);
 
+    protected abstract Element deviceElement(TestSuite suite);
+
     private Element testElement(Test t) {
         Element testElem;
         if (t instanceof CompoundTest) {
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index af76927..0769e83 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -33,11 +33,14 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         testSuite.put("desc", suite.getDescription());
 
         testRun.put("suite", testSuite);
+        testRun.put("device", deviceObject(suite));
         testRun.put("tests", tests);
     }
 
     abstract protected Map<String, Object> testableObject(Testable t);
 
+    abstract protected Map<String, Object> deviceObject(TestSuite suite);
+
     private Map<String, Object> testObject(Test t) {
         Map<String, Object> testObj;
         if (t instanceof CompoundTest) {
diff --git a/src/cz/crcs/ectester/reader/CardMngr.java b/src/cz/crcs/ectester/reader/CardMngr.java
index a959f2a..1e42c52 100644
--- a/src/cz/crcs/ectester/reader/CardMngr.java
+++ b/src/cz/crcs/ectester/reader/CardMngr.java
@@ -174,10 +174,10 @@ public class CardMngr {
 
     public byte[] fetchCPLC() throws CardException {
         // Try CPLC via GP
-        ResponseAPDU resp = sendAPDU(FETCH_GP_CPLC_APDU);
+        ResponseAPDU resp = send(FETCH_GP_CPLC_APDU);
         // If GP CLA fails, try with ISO
         if (resp.getSW() == (ISO7816.SW_CLA_NOT_SUPPORTED & 0xffff)) {
-            resp = sendAPDU(FETCH_ISO_CPLC_APDU);
+            resp = send(FETCH_ISO_CPLC_APDU);
         }
         if (resp.getSW() == (ISO7816.SW_NO_ERROR & 0xffff)) {
             return resp.getData();
@@ -207,10 +207,13 @@ public class CardMngr {
             ICPersonalizationEquipmentID
         }
 
-        private Map<Field, byte[]> values = new HashMap<>();
+        private Map<Field, byte[]> values = new TreeMap<>();
 
         public CPLC(byte[] data) {
-            if (data == null || data.length < 3 || data[2] != 0x2A) {
+            if (data == null) {
+                return;
+            }
+            if (data.length < 3 || data[2] != 0x2A) {
                 throw new IllegalArgumentException("CPLC must be 0x2A bytes long");
             }
             //offset = TLVUtils.skipTag(data, offset, (short)0x9F7F);
@@ -263,7 +266,7 @@ public class CardMngr {
         return new CPLC(data);
     }
 
-    public String mapCPLCField(CPLC.Field field, byte[] value) {
+    public static String mapCPLCField(CPLC.Field field, byte[] value) {
         switch (field) {
             case ICFabricator:
                 String id = ByteUtil.bytesToHex(value, false);
@@ -289,6 +292,14 @@ public class CardMngr {
         }
     }
 
+    public ATR getATR() {
+        if (simulate) {
+            return new ATR(simulator.getATR());
+        } else {
+            return card.getATR();
+        }
+    }
+
     public static List<CardTerminal> getReaderList() {
         try {
             TerminalFactory factory = TerminalFactory.getDefault();
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index dedf561..eb52937 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -1,10 +1,16 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseTextTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
+import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.CardMngr;
+import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
+import javax.smartcardio.CardException;
 import java.io.PrintStream;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -25,4 +31,27 @@ public class TextTestWriter extends BaseTextTestWriter {
         }
         return "";
     }
+
+    @Override
+    protected String deviceString(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            StringBuilder sb = new StringBuilder();
+            sb.append("═══ Card ATR: ").append(ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false)).append(System.lineSeparator());
+            try {
+                CardMngr.CPLC cplc = cardSuite.getCard().getCPLC();
+                if (!cplc.values().isEmpty()) {
+                    sb.append("═══ Card CPLC data:").append(System.lineSeparator());
+                    for (Map.Entry<CardMngr.CPLC.Field, byte[]> entry : cplc.values().entrySet()) {
+                        CardMngr.CPLC.Field field = entry.getKey();
+                        byte[] value = entry.getValue();
+                        sb.append("═══ ").append(field.name()).append(": ").append(CardMngr.mapCPLCField(field, value));
+                    }
+                }
+            } catch (CardException ignored) {
+            }
+            return sb.toString();
+        }
+        return "";
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index d88a64e..356593e 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -1,15 +1,20 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseXMLTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
+import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 import org.w3c.dom.Element;
 
+import javax.smartcardio.CardException;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.OutputStream;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -72,4 +77,37 @@ public class XMLTestWriter extends BaseXMLTestWriter {
         }
         return null;
     }
+
+    private Element cplcElement(CardMngr card) {
+        Element result = doc.createElement("cplc");
+        try {
+            CardMngr.CPLC cplc = card.getCPLC();
+            if (!cplc.values().isEmpty()) {
+                for (Map.Entry<CardMngr.CPLC.Field, byte[]> entry : cplc.values().entrySet()) {
+                    CardMngr.CPLC.Field field = entry.getKey();
+                    byte[] value = entry.getValue();
+                    Element keyVal = doc.createElement(field.name());
+                    keyVal.setTextContent(ByteUtil.bytesToHex(value, false));
+                    result.appendChild(keyVal);
+                }
+            }
+        } catch (CardException ignored) {
+        }
+        return result;
+    }
+
+    @Override
+    protected Element deviceElement(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            Element result = doc.createElement("device");
+            result.setAttribute("type", "card");
+            result.appendChild(cplcElement(cardSuite.getCard()));
+
+            Element atr = doc.createElement("ATR");
+            atr.setTextContent(ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
+            result.appendChild(atr);
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 49a20f1..199f2c0 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -1,12 +1,16 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseYAMLTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
+import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
+import javax.smartcardio.CardException;
 import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -54,4 +58,33 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
         }
         return null;
     }
+
+    private Map<String, Object> cplcObject(CardMngr card) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            CardMngr.CPLC cplc = card.getCPLC();
+            if (!cplc.values().isEmpty()) {
+                for (Map.Entry<CardMngr.CPLC.Field, byte[]> entry : cplc.values().entrySet()) {
+                    CardMngr.CPLC.Field field = entry.getKey();
+                    byte[] value = entry.getValue();
+                    result.put(field.name(), ByteUtil.bytesToHex(value, false));
+                }
+            }
+        } catch (CardException ignored) {
+        }
+        return result;
+    }
+
+    @Override
+    protected Map<String, Object> deviceObject(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            Map<String, Object> result = new HashMap<>();
+            result.put("type", "card");
+            result.put("cplc", cplcObject(cardSuite.getCard()));
+            result.put("ATR", ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
+            return result;
+        }
+        return null;
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/test/CardTestSuite.java b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
index e12a588..b451265 100644
--- a/src/cz/crcs/ectester/reader/test/CardTestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
@@ -116,4 +116,8 @@ public abstract class CardTestSuite extends TestSuite {
 
         return null;
     }
+
+    public CardMngr getCard() {
+        return card;
+    }
 }
diff --git a/src/cz/crcs/ectester/standalone/output/TextTestWriter.java b/src/cz/crcs/ectester/standalone/output/TextTestWriter.java
index ddb1029..972af18 100644
--- a/src/cz/crcs/ectester/standalone/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/standalone/output/TextTestWriter.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.standalone.output;
 
 import cz.crcs.ectester.common.output.BaseTextTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 
 import java.io.PrintStream;
@@ -15,6 +16,13 @@ public class TextTestWriter extends BaseTextTestWriter {
 
     @Override
     protected String testableString(Testable t) {
+        //TODO
+        return "";
+    }
+
+    @Override
+    protected String deviceString(TestSuite suite) {
+        //TODO
         return "";
     }
 }
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/standalone/output/XMLTestWriter.java b/src/cz/crcs/ectester/standalone/output/XMLTestWriter.java
index 9606646..d2b16d8 100644
--- a/src/cz/crcs/ectester/standalone/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/standalone/output/XMLTestWriter.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.standalone.output;
 
 import cz.crcs.ectester.common.output.BaseXMLTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.standalone.test.KeyAgreementTestable;
@@ -109,4 +110,10 @@ public class XMLTestWriter extends BaseXMLTestWriter {
         }
         return result;
     }
+
+    @Override
+    protected Element deviceElement(TestSuite suite) {
+        //TODO
+        return null;
+    }
 }
diff --git a/src/cz/crcs/ectester/standalone/output/YAMLTestWriter.java b/src/cz/crcs/ectester/standalone/output/YAMLTestWriter.java
index 2133a8e..dfc6813 100644
--- a/src/cz/crcs/ectester/standalone/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/standalone/output/YAMLTestWriter.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.standalone.output;
 
 import cz.crcs.ectester.common.output.BaseYAMLTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.standalone.test.KeyAgreementTestable;
@@ -88,4 +89,10 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
         }
         return result;
     }
+
+    @Override
+    protected Map<String, Object> deviceObject(TestSuite suite) {
+        //TODO
+        return null;
+    }
 }