summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--dist/ECTester.jarbin810137 -> 0 bytes
-rw-r--r--dist/ectester.bat34
-rwxr-xr-xdist/ectester.sh48
-rw-r--r--dist/lib/commons-cli-1.3.1.jarbin52988 -> 0 bytes
-rw-r--r--dist/lib/jcardsim-2.2.2-all.jarbin394661 -> 0 bytes
-rw-r--r--dist/lib/jcardsim-3.0.4-SNAPSHOT.jarbin492617 -> 0 bytes
-rw-r--r--dist/lib/snakeyaml-1.19.jarbin297518 -> 0 bytes
-rw-r--r--nbproject/build-impl.xml2
-rw-r--r--nbproject/copylibstask.jarbin0 -> 22335 bytes
-rw-r--r--nbproject/project.properties1
11 files changed, 10 insertions, 83 deletions
diff --git a/README.md b/README.md
index c48426e..5096bd3 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,14 @@
Tests support and behavior of smartcards with JavaCard platform with focus on Eliptic curves (`TYPE_EC_FP` and `TYPE_EC_F2M`).
+## Build
+
+ECTester uses ant.
+```bash
+ant package # To build the reader tool (jar).
+ant -f jcbuild.xml build # To build the applet (cap).
+```
+
## Usage
1. Upload `!uploader/ectester.cap` using your favorite tool (e.g., [GlobalPlatformPro tool](https://github.com/martinpaljak/GlobalPlatform))
diff --git a/dist/ECTester.jar b/dist/ECTester.jar
deleted file mode 100644
index b5d07c5..0000000
--- a/dist/ECTester.jar
+++ /dev/null
Binary files differ
diff --git a/dist/ectester.bat b/dist/ectester.bat
deleted file mode 100644
index e20b855..0000000
--- a/dist/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%
diff --git a/dist/ectester.sh b/dist/ectester.sh
deleted file mode 100755
index 8040096..0000000
--- a/dist/ectester.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.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
diff --git a/dist/lib/commons-cli-1.3.1.jar b/dist/lib/commons-cli-1.3.1.jar
deleted file mode 100644
index c3e7a1f..0000000
--- a/dist/lib/commons-cli-1.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/dist/lib/jcardsim-2.2.2-all.jar b/dist/lib/jcardsim-2.2.2-all.jar
deleted file mode 100644
index 0ac10c0..0000000
--- a/dist/lib/jcardsim-2.2.2-all.jar
+++ /dev/null
Binary files differ
diff --git a/dist/lib/jcardsim-3.0.4-SNAPSHOT.jar b/dist/lib/jcardsim-3.0.4-SNAPSHOT.jar
deleted file mode 100644
index ea3ea26..0000000
--- a/dist/lib/jcardsim-3.0.4-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/dist/lib/snakeyaml-1.19.jar b/dist/lib/snakeyaml-1.19.jar
deleted file mode 100644
index 7c73a76..0000000
--- a/dist/lib/snakeyaml-1.19.jar
+++ /dev/null
Binary files differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index e1da9f7..3b01c7f 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -834,7 +834,7 @@ is divided into following sections:
</chainedmapper>
</pathconvert>
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
diff --git a/nbproject/copylibstask.jar b/nbproject/copylibstask.jar
new file mode 100644
index 0000000..ad1d2ac
--- /dev/null
+++ b/nbproject/copylibstask.jar
Binary files differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 16be542..152dc9c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -27,6 +27,7 @@ dist.archive.excludes=
dist.dir=dist
dist.jar=${dist.dir}/ECTester.jar
dist.javadoc.dir=${dist.dir}/javadoc
+libs.CopyLibs.classpath=nbproject/copylibstask.jar
endorsed.classpath=
excludes=
includes=**