Output SWs as unsigned ints.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index 709d215..beb758c 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -64,13 +64,13 @@ public class XMLTestWriter implements TestWriter {
         responseElem.appendChild(apdu);
 
         Element naturalSW = doc.createElement("natural-sw");
-        naturalSW.setTextContent(String.valueOf(r.getNaturalSW()));
+        naturalSW.setTextContent(String.valueOf(Short.toUnsignedInt(r.getNaturalSW())));
         responseElem.appendChild(naturalSW);
 
         Element sws = doc.createElement("sws");
         for (int i = 0; i < r.getNumSW(); ++i) {
             Element sw = doc.createElement("sw");
-            sw.setTextContent(String.valueOf(r.getSW(i)));
+            sw.setTextContent(String.valueOf(Short.toUnsignedInt(r.getSW(i))));
             sws.appendChild(sw);
         }
         responseElem.appendChild(sws);
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index f0dcd3a..3b2b72d 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -50,10 +50,10 @@ public class YAMLTestWriter implements TestWriter {
         Map<String, Object> responseObj = new HashMap<>();
         responseObj.put("successful", r.successful());
         responseObj.put("apdu", Util.bytesToHex(r.getAPDU().getBytes()));
-        responseObj.put("natural_sw", r.getNaturalSW());
-        List<Short> sws = new LinkedList<>();
+        responseObj.put("natural_sw", Short.toUnsignedInt(r.getNaturalSW()));
+        List<Integer> sws = new LinkedList<>();
         for (int i = 0; i < r.getNumSW(); ++i) {
-            sws.add(r.getSW(i));
+            sws.add(Short.toUnsignedInt(r.getSW(i)));
         }
         responseObj.put("sws", sws);
         responseObj.put("duration", r.getDuration());
diff --git a/src/cz/crcs/ectester/reader/test/TestSuite.java b/src/cz/crcs/ectester/reader/test/TestSuite.java
index cb3211d..f13317c 100644
--- a/src/cz/crcs/ectester/reader/test/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestSuite.java
@@ -93,7 +93,7 @@ public abstract class TestSuite {
                     } else if (i == 1) { // ecdh normal
                         return new Result(Value.FAILURE, "The ECDH of a compressed point should have " + shouldHave.apply(ecdhCompressExpected) + ", but it did not.");
                     } else if (i <= 6) { // ecdh wrong, should fail
-                        return new Result(Value.FAILURE, "The ECDH of a corrupted point should have failed, but it dit not.");
+                        return new Result(Value.FAILURE, "The ECDH of a corrupted point should have failed, but it did not.");
                     } else { // ecdsa
                         return new Result(Value.FAILURE, "The ECDSA should have " + shouldHave.apply(ecdsaExpected) + ", but it did not.");
                     }