diff options
| author | J08nY | 2018-01-08 23:00:48 +0100 |
|---|---|---|
| committer | J08nY | 2018-01-08 23:00:48 +0100 |
| commit | d19d8ad062a3c0053789eae5f7c9662399f781e0 (patch) | |
| tree | 219410bed7870da07b5488183e9629d5ab87cdc8 | |
| parent | 7e83e25bebb37a91d4278bbc1fe1c4ad5ec9c7c2 (diff) | |
| download | ECTester-d19d8ad062a3c0053789eae5f7c9662399f781e0.tar.gz ECTester-d19d8ad062a3c0053789eae5f7c9662399f781e0.tar.zst ECTester-d19d8ad062a3c0053789eae5f7c9662399f781e0.zip | |
| -rw-r--r-- | build-reader.xml | 2 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/reader/ECTesterReader.java | 1 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/scripts/ectester-reader.bat | 34 | ||||
| -rwxr-xr-x | src/cz/crcs/ectester/scripts/ectester-reader.sh | 48 |
4 files changed, 2 insertions, 83 deletions
diff --git a/build-reader.xml b/build-reader.xml index 98cdef4..11d6145 100644 --- a/build-reader.xml +++ b/build-reader.xml @@ -75,10 +75,12 @@ <copy file="LICENSE" todir="${build.classes.dir}"/> </target> + <!-- <target name="-post-jar"> <copy file="src/cz/crcs/ectester/scripts/ectester-reader.sh" todir="${dist.dir}"/> <copy file="src/cz/crcs/ectester/scripts/ectester-reader.bat" todir="${dist.dir}"/> </target> + --> <target name="package" depends="jar"> <property name="store.jar.name" value="ECTesterReader-dist"/> diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java index 48d34b3..d4b95ed 100644 --- a/src/cz/crcs/ectester/reader/ECTesterReader.java +++ b/src/cz/crcs/ectester/reader/ECTesterReader.java @@ -62,7 +62,6 @@ import static cz.crcs.ectester.applet.ECTesterApplet.Signature_ALG_ECDSA_SHA; * @version v0.1.0 */ public class ECTesterReader { - private CardMngr cardManager; private OutputLogger logger; private TestWriter testWriter; diff --git a/src/cz/crcs/ectester/scripts/ectester-reader.bat b/src/cz/crcs/ectester/scripts/ectester-reader.bat deleted file mode 100644 index 876fda7..0000000 --- a/src/cz/crcs/ectester/scripts/ectester-reader.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-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-reader.sh b/src/cz/crcs/ectester/scripts/ectester-reader.sh deleted file mode 100755 index e6458c9..0000000 --- a/src/cz/crcs/ectester/scripts/ectester-reader.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -dangerous="0" - -positional=() -while [[ $# -gt 0 ]] -do - -key="$1" -case $key in - --dangerous) - dangerous=1 - shift - ;; - *) - positional+=("$1") - shift - ;; -esac -done -set -- "${positional[@]}" - -if [[ $# -lt 1 ]]; then - echo "At least one argument expected:" >&2 - echo " ./ectester-reader.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") -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 ${card}.${test} $@ - files+=(${card}.$test) -done - -if command -v tar 2>&1 >/dev/null; then - tar -czvf ${card}.tar.gz ${files[*]} -elif command -v zip 2>&1 >/dev/null; then - zip ${card}.zip ${files[*]} -fi |
