4 files changed, 17 insertions, 14 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.");
                     }
diff --git a/src/cz/crcs/ectester/scripts/ectester.sh b/src/cz/crcs/ectester/scripts/ectester.sh
index 0de1bc3..8040096 100755
--- a/src/cz/crcs/ectester/scripts/ectester.sh
+++ b/src/cz/crcs/ectester/scripts/ectester.sh
@@ -20,12 +20,15 @@ esac
 done
 set -- "${positional[@]}"
 
-if [[ $# -ne 1 ]]; then
-    echo "One argument expected:" >&2
-    echo "    ./ectester.sh [--dangerous] CARD_NAME" >&2
+if [[ $# -lt 1 ]]; then
+    echo "At least one argument expected:" >&2
+    echo "    ./ectester.sh [--dangerous] CARD_NAME [ECTester args]" >&2
     exit 1
 fi
 
+card="$1"
+shift
+
 declare -a tests=("default" "test-vectors")
 if [[ "$dangerous" == "1" ]]; then
     tests+=("invalid" "wrong" "composite")
@@ -34,12 +37,12 @@ fi
 declare -a files=()
 for i in $(seq 0 $((${#tests[@]} - 1))); do
     test="${tests[$i]}"
-    java -jar ECTester.jar -t ${test} -a --format yaml -l ${1}.${test}
-    files+=(${1}.$test)
+    java -jar ECTester.jar -t ${test} -a --format yaml -l ${card}.${test} $@
+    files+=(${card}.$test)
 done
 
 if command -v tar 2>&1 >/dev/null; then
-    tar -czvf ${1}.tar.gz ${files[*]}
+    tar -czvf ${card}.tar.gz ${files[*]}
 elif command -v zip 2>&1 >/dev/null; then
-    zip ${1}.zip ${files[*]}
-fi
\ No newline at end of file
+    zip ${card}.zip ${files[*]}
+fi