Separate build files for standalone and reader apps.

18 files changed, 55 insertions, 48 deletions

diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/common/Util.java
index 001f58c..0136493 100644
--- a/src/cz/crcs/ectester/reader/Util.java
+++ b/src/cz/crcs/ectester/common/Util.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader;
+package cz.crcs.ectester.common;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
diff --git a/src/cz/crcs/ectester/common/ec/EC_Data.java b/src/cz/crcs/ectester/common/ec/EC_Data.java
index da97208..d308261 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Data.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Data.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.Util;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/cz/crcs/ectester/common/ec/EC_KAResult.java b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
index b215d0e..3b74c57 100644
--- a/src/cz/crcs/ectester/common/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.Util;
 
 /**
  * A result of EC based Key agreement operation.
diff --git a/src/cz/crcs/ectester/common/ec/EC_Params.java b/src/cz/crcs/ectester/common/ec/EC_Params.java
index 5b8295e..d50ebb0 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Params.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Params.java
@@ -1,7 +1,7 @@
 package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
diff --git a/src/cz/crcs/ectester/common/output/OutputLogger.java b/src/cz/crcs/ectester/common/output/OutputLogger.java
index b876c5b..09b8f73 100644
--- a/src/cz/crcs/ectester/common/output/OutputLogger.java
+++ b/src/cz/crcs/ectester/common/output/OutputLogger.java
@@ -1,7 +1,5 @@
 package cz.crcs.ectester.common.output;
 
-import cz.crcs.ectester.reader.output.TeeOutputStream;
-
 import java.io.*;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/cz/crcs/ectester/reader/output/TeeOutputStream.java b/src/cz/crcs/ectester/common/output/TeeOutputStream.java
index 2a1af99..2401fce 100644
--- a/src/cz/crcs/ectester/reader/output/TeeOutputStream.java
+++ b/src/cz/crcs/ectester/common/output/TeeOutputStream.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.output;
+package cz.crcs.ectester.common.output;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/cz/crcs/ectester/common/test/Test.java b/src/cz/crcs/ectester/common/test/Test.java
index 5973d0f..750a410 100644
--- a/src/cz/crcs/ectester/common/test/Test.java
+++ b/src/cz/crcs/ectester/common/test/Test.java
@@ -39,6 +39,13 @@ public abstract class Test implements Testable {
         return result.ok();
     }
 
+    public boolean error() {
+        if (!hasRun) {
+            return false;
+        }
+        return result.compareTo(Value.ERROR);
+    }
+
     public abstract String getDescription();
 
     public boolean hasRun() {
diff --git a/src/cz/crcs/ectester/reader/CardMngr.java b/src/cz/crcs/ectester/reader/CardMngr.java
index e11bcb3..ad5b368 100644
--- a/src/cz/crcs/ectester/reader/CardMngr.java
+++ b/src/cz/crcs/ectester/reader/CardMngr.java
@@ -2,6 +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 javacard.framework.AID;
 
 import javax.smartcardio.*;
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 99b2f83..e13a683 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -23,6 +23,7 @@ package cz.crcs.ectester.reader;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.common.ec.EC_Category;
 import cz.crcs.ectester.common.ec.EC_Data;
 import cz.crcs.ectester.common.ec.EC_Params;
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index 3668fbb..9d23322 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -6,7 +6,7 @@ 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.reader.Util;
+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;
diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index c357233..0f5b6e8 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.reader.Util;
+import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.reader.response.Response;
 
 import java.io.PrintStream;
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index f35e467..24a308c 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.reader.Util;
+import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.common.test.Test;
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 15c0522..c637a13 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.reader.Util;
+import cz.crcs.ectester.common.Util;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.common.test.Test;
diff --git a/src/cz/crcs/ectester/reader/response/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index b816a97..4158ac3 100644
--- a/src/cz/crcs/ectester/reader/response/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -2,7 +2,7 @@ package cz.crcs.ectester.reader.response;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.Util;
 import javacard.framework.ISO7816;
 import javacard.security.KeyPair;
 
diff --git a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
index 742661d..668056b 100644
--- a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
@@ -8,7 +8,7 @@ import cz.crcs.ectester.common.test.Test;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
-import cz.crcs.ectester.reader.Util;
+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;
diff --git a/src/cz/crcs/ectester/scripts/ectester-reader.bat b/src/cz/crcs/ectester/scripts/ectester-reader.bat
new file mode 100644
index 0000000..876fda7
--- /dev/null
+++ b/src/cz/crcs/ectester/scripts/ectester-reader.bat
@@ -0,0 +1,34 @@
+@ECHO OFF
+SETLOCAL enabledelayedexpansion
+
+SET n=0
+:loop
+IF NOT "%1"=="" (
+    IF "%1"=="--dangerous" (
+        SET dangerous=1
+    ) ELSE (
+        SET positional[!n!]=%1
+        SET /A n+=1
+    )
+    SHIFT
+    GOTO :loop
+)
+
+IF NOT "%n%"=="1" (
+    ECHO "One argument expected:"
+    ECHO "    ./ectester-reader.bat [--dangerous] CARD_NAME"
+)
+
+SET card=!positional[%%0]!
+
+SET tests="default test-vectors"
+java -jar ECTesterReader.jar -t default -a --format yaml -l %card%.default
+java -jar ECTesterReader.jar -t test-vectors -a --format yaml -l %card%.test-vectors
+IF "%dangerous%"=="1" (
+    SET tests=%tests% "invalid wrong composite"
+    java -jar ECTesterReader.jar -t invalid -a --format yaml -l %card%.invalid
+    java -jar ECTesterReader.jar -t wrong -a --format yaml -l %card%.wrong
+    java -jar ECTesterReader.jar -t composite -a --format yaml -l %card%.composite
+)
+
+zip %card%.zip %tests%
diff --git a/src/cz/crcs/ectester/scripts/ectester.sh b/src/cz/crcs/ectester/scripts/ectester-reader.sh
index 8040096..e6458c9 100755
--- a/src/cz/crcs/ectester/scripts/ectester.sh
+++ b/src/cz/crcs/ectester/scripts/ectester-reader.sh
@@ -22,7 +22,7 @@ set -- "${positional[@]}"
 
 if [[ $# -lt 1 ]]; then
     echo "At least one argument expected:" >&2
-    echo "    ./ectester.sh [--dangerous] CARD_NAME [ECTester args]" >&2
+    echo "    ./ectester-reader.sh [--dangerous] CARD_NAME [ECTester args]" >&2
     exit 1
 fi
 
diff --git a/src/cz/crcs/ectester/scripts/ectester.bat b/src/cz/crcs/ectester/scripts/ectester.bat
deleted file mode 100644
index e20b855..0000000
--- a/src/cz/crcs/ectester/scripts/ectester.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-@ECHO OFF
-SETLOCAL enabledelayedexpansion
-
-SET n=0
-:loop
-IF NOT "%1"=="" (
-    IF "%1"=="--dangerous" (
-        SET dangerous=1
-    ) ELSE (
-        SET positional[!n!]=%1
-        SET /A n+=1
-    )
-    SHIFT
-    GOTO :loop
-)
-
-IF NOT "%n%"=="1" (
-    ECHO "One argument expected:"
-    ECHO "    ./ectester.bar [--dangerous] CARD_NAME"
-)
-
-SET card=!positional[%%0]!
-
-SET tests="default test-vectors"
-java -jar ECTester.jar -t default -a --format yaml -l %card%.default
-java -jar ECTester.jar -t test-vectors -a --format yaml -l %card%.test-vectors
-IF "%dangerous%"=="1" (
-    SET tests=%tests% "invalid wrong composite"
-    java -jar ECTester.jar -t invalid -a --format yaml -l %card%.invalid
-    java -jar ECTester.jar -t wrong -a --format yaml -l %card%.wrong
-    java -jar ECTester.jar -t composite -a --format yaml -l %card%.composite
-)
-
-zip %card%.zip %tests%