22 files changed, 28 insertions, 170 deletions

diff --git a/!uploader/ectester.cap b/!uploader/ectester.cap
deleted file mode 100644
index 8077260..0000000
--- a/!uploader/ectester.cap
+++ /dev/null
diff --git a/!uploader/simpleECC_NXP_JCOP_CJ2A081.txt b/!uploader/simpleECC_NXP_JCOP_CJ2A081.txt
deleted file mode 100644
index bec8ef7..0000000
--- a/!uploader/simpleECC_NXP_JCOP_CJ2A081.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# Usable for: NXP_JCOP_CJ2A081
-mode_211
-enable_trace
-establish_context
-card_connect 
-select -AID a000000003000000
-open_sc -security 1 -keyind 0 -keyver 0 -mac_key 404142434445464748494a4b4c4d4e4f -enc_key 404142434445464748494a4b4c4d4e4f
-
-delete -AID 010203040506070809
-delete -AID 010203040506
-delete -AID e1e2e3e4e5e6e7e8e9
-delete -AID e1e2e3e4e5e6
-delete -AID d1d2d3d4d5d6d7d8d9
-delete -AID d1d2d3d4d5d6
-delete -AID d1d2d3d4d5
-delete -AID b1b2b3b4b5b6b7b8b9
-delete -AID b1b2b3b4b5b6
-delete -AID a1a2a3a4a5a6a7a8a9
-delete -AID a1a2a3a4a5a6
-delete -AID 6D7970616330303031
-delete -AID 6D797061636B616731
-delete -AID a1a2a3a4a5a6a7a8a9
-delete -AID F1F2F3F4F5F6F7F8F9
-delete -AID F1F2F3F4F5F6
-delete -AID 313233343536373839
-delete -AID 313233343536
-
-delete -AID 4c6162616b4170706c6574
-delete -AID 4c6162616b
-delete -AID 4C6162616B4170706C6574
-delete -AID 4C6162616B417070
-
-install -file simpleECC.cap -nvDataLimit 2000 -instParam 00a2a3a40002000000000000 
-
-select -AID 4C6162616B4170706C6574
-
-send_apdu -APDU B05c0000020080
-
-send_apdu -APDU B05c00000200A0
-
-send_apdu -APDU B05c00000200c0
-
-send_apdu -APDU B05c0000020100
-
-
-
-
-send_apdu -APDU B05b0000
-
-send_apdu -APDU B05a0000
-
-
-card_disconnect
-release_context
diff --git a/!uploader/simpleECC_test.txt b/!uploader/simpleECC_test.txt
deleted file mode 100644
index 8139511..0000000
--- a/!uploader/simpleECC_test.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-mode_211
-enable_trace
-establish_context
-card_connect 
-
-select -AID 4C6162616B4170706C6574
-
-send_apdu -APDU B05c0000020080
-send_apdu -APDU B05c0100020080
-
-send_apdu -APDU B05c00000200A0
-send_apdu -APDU B05c01000200A0
-
-send_apdu -APDU B05c00000200c0
-send_apdu -APDU B05c01000200c0
-
-send_apdu -APDU B05c0000020100
-send_apdu -APDU B05c0100020100
-
-
-send_apdu -APDU B05b0000
-
-send_apdu -APDU B05a0000
-
-
-card_disconnect
-release_context
diff --git a/!uploader/simpleECC_testDHSecret.txt b/!uploader/simpleECC_testDHSecret.txt
deleted file mode 100644
index eb6ab5f..0000000
--- a/!uploader/simpleECC_testDHSecret.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-mode_211
-enable_trace
-establish_context
-card_connect 
-
-select -AID 4C6162616B4170706C6574
-
-send_apdu -APDU B05c01020200c0
-send_apdu -APDU B05d000000
-
-send_apdu -APDU B05d000031049d42769dfdbe113a851bb6b01b1a515d893b5adbc1f6132974749ac0967a8ff4cc54d93187602dd67eb3d22970aca2ca
-send_apdu -APDU B05d000031040178e496f67c822b0d33636bcb1e046f716d8d978d6e4cbc3bfef0789e5d3c42c43598d1b0cb44a654c79c21a6a3686a
-  
-send_apdu -APDU B05d00003104e56ae9ef1f7d2a9dfdb6fd2906218138d72ef0a0ad1e8edd288e33450b0e723a3ab9c72a886360026f37482f86f56242
-
- 
-
-send_apdu -APDU B05d00003104C9C0EDFB27B71EBE3093FC4F337638CEE02F78F63CEA902261328E9F038AFD60A0CE019B7634597964D7798E3B16D515
-send_apdu -APDU B05d00003104C9C0EDFB27B71EBE3113FC4F337638CEE02F78F63CEA902261328E9F038AFD60A0CE019B7634597964D7798E3B16D515
-
-
-card_disconnect
-release_context
diff --git a/!uploader/simpleECC_testECFull.txt b/!uploader/simpleECC_testECFull.txt
deleted file mode 100644
index acb4c4d..0000000
--- a/!uploader/simpleECC_testECFull.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-mode_211
-enable_trace
-establish_context
-card_connect 
-
-select -AID 4C6162616B4170706C6574
-
-send_apdu -APDU B05e000000
-
-
-card_disconnect
-release_context
diff --git a/!uploader/simpleECC_testSetParams.txt b/!uploader/simpleECC_testSetParams.txt
deleted file mode 100644
index 09d967a..0000000
--- a/!uploader/simpleECC_testSetParams.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-mode_211
-enable_trace
-establish_context
-card_connect 
-
-select -AID 4C6162616B4170706C6574
-send_apdu -APDU B05c0000020180
-
-send_apdu -APDU B05c0000020080
-send_apdu -APDU B05c0100020080
-send_apdu -APDU B05c0102020080
-
-send_apdu -APDU B05c00000200a0
-send_apdu -APDU B05c01000200a0
-send_apdu -APDU B05c01020200a0
-
-send_apdu -APDU B05c00000200c0
-send_apdu -APDU B05c01000200c0
-send_apdu -APDU B05c01020200c0
-
-send_apdu -APDU B05c0000020100
-send_apdu -APDU B05c0100020100
-send_apdu -APDU B05c0102020100
-
-
-card_disconnect
-release_context
diff --git a/.travis.yml b/.travis.yml
index be275b2..62681d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ deploy:
   file:
     - "dist/ECTesterReader-dist.jar"
     - "dist/ECTesterReader.jar"
-    - "!uploader/ectester.cap"
+    - "applet/ectester.cap"
     - "dist/ECTesterStandalone-dist.jar"
     - "dist/ECTesterStandalone.jar"
   skip_cleanup: true
diff --git a/README.md b/README.md
index d68deb9..66406cc 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ ECTester uses ant. There are three parts of ECTester, the JavaCard applet used f
 ```bash
 ant -f build-reader.xml package               # To build the reader tool (jar) -> "dist/ECTesterReader.jar"
 ant -f build-standalone.xml package           # To build the standalone tool (jar) -> "dist/ECTesterStandalone.jar"
-ant -f build-applet.xml build                 # To build the applet (cap) -> "!uploader/ectester.cap".
+ant -f build-applet.xml build                 # To build the applet (cap) -> "applet/ectester.cap".
 ```
 Build produces both a lightweight version of the JARs and a full version of the JARs with dependencies included, the latter has the `*-dist.jar` suffix.
 The standalone build tries building test binaries for all the supported libraries, and silently fails if the library is not properly supported.
diff --git a/!uploader/GPPcScConnectionPlugin.dll b/applet/GPPcScConnectionPlugin.dll
index 3b27f6b..3b27f6b 100644
--- a/!uploader/GPPcScConnectionPlugin.dll
+++ b/applet/GPPcScConnectionPlugin.dll
diff --git a/!uploader/GPShell.exe b/applet/GPShell.exe
index 091eece..091eece 100644
--- a/!uploader/GPShell.exe
+++ b/applet/GPShell.exe
diff --git a/!uploader/GlobalPlatform.dll b/applet/GlobalPlatform.dll
index 6dca172..6dca172 100644
--- a/!uploader/GlobalPlatform.dll
+++ b/applet/GlobalPlatform.dll
diff --git a/!uploader/gp.exe b/applet/gp.exe
index 6478bf2..6478bf2 100644
--- a/!uploader/gp.exe
+++ b/applet/gp.exe
diff --git a/!uploader/gp.jar b/applet/gp.jar
index 774d81a..774d81a 100644
--- a/!uploader/gp.jar
+++ b/applet/gp.jar
diff --git a/!uploader/gppro_upload.bat b/applet/gppro_upload.bat
index cbfd5ae..cbfd5ae 100644
--- a/!uploader/gppro_upload.bat
+++ b/applet/gppro_upload.bat
diff --git a/!uploader/gppro_upload.sh b/applet/gppro_upload.sh
index a94a948..a94a948 100755
--- a/!uploader/gppro_upload.sh
+++ b/applet/gppro_upload.sh
diff --git a/!uploader/gppro_upload_emv.bat b/applet/gppro_upload_emv.bat
index 737f8ac..737f8ac 100644
--- a/!uploader/gppro_upload_emv.bat
+++ b/applet/gppro_upload_emv.bat
diff --git a/!uploader/gppro_upload_emv.sh b/applet/gppro_upload_emv.sh
index c3b42b1..c3b42b1 100755
--- a/!uploader/gppro_upload_emv.sh
+++ b/applet/gppro_upload_emv.sh
diff --git a/!uploader/libeay32.dll b/applet/libeay32.dll
index b59a6b4..b59a6b4 100644
--- a/!uploader/libeay32.dll
+++ b/applet/libeay32.dll
diff --git a/!uploader/openkms-gp.jar b/applet/openkms-gp.jar
index 9cd5de5..9cd5de5 100644
--- a/!uploader/openkms-gp.jar
+++ b/applet/openkms-gp.jar
diff --git a/!uploader/ssleay32.dll b/applet/ssleay32.dll
index e8fabb6..e8fabb6 100644
--- a/!uploader/ssleay32.dll
+++ b/applet/ssleay32.dll
diff --git a/!uploader/zlib1.dll b/applet/zlib1.dll
index 31996cd..31996cd 100644
--- a/!uploader/zlib1.dll
+++ b/applet/zlib1.dll
diff --git a/build-applet.xml b/build-applet.xml
index 793060c..9d7d4d6 100644
--- a/build-applet.xml
+++ b/build-applet.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="build" name="ECTesterApplet">
-  <!-- Based on Martin Paljak's applets playground -->
-  <!-- Applet building dependencies -->
-  <property name="JC222" value="ext/java_card_kit-2_2_2"/>
-  <property name="JC221" value="ext/java_card_kit-2_2_1"/>
-  <property name="JC303" value="ext/java_card_kit-3_0_3"/>
-  <property name="OP20" value="ext/visa_openplatform-2_0"/>
-  <property name="GP211" value="ext/globalplatform-2_1_1"/>
-  
-  <!-- ant-javacard task from javacard.pro -->
-  <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ext/ant-javacard.jar"/>
+    <!-- Based on Martin Paljak's applets playground -->
+    <!-- Applet building dependencies -->
+    <property name="JC222" value="ext/java_card_kit-2_2_2"/>
+    <property name="JC221" value="ext/java_card_kit-2_2_1"/>
+    <property name="JC303" value="ext/java_card_kit-3_0_3"/>
+    <property name="OP20" value="ext/visa_openplatform-2_0"/>
+    <property name="GP211" value="ext/globalplatform-2_1_1"/>
 
-  <target name="build" description="Builds the CAP file.">
-    <javacard jckit="${JC222}">
-      <cap output="!uploader/ectester.cap" sources="src/cz/crcs/ectester/applet" aid="4543546573746572" >
-        <applet class="cz.crcs.ectester.applet.ECTesterApplet" aid="45435465737465723031"/>
-      </cap>
-    </javacard>
-  </target>
+    <!-- ant-javacard task from javacard.pro -->
+    <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ext/ant-javacard.jar"/>
 
-  <target name="upload" depends="build" description="Uploads the CAP file to the card, using gp.jar">
-    <exec dir="!uploader" executable="./gppro_upload.sh" osfamily="unix"/>
-    <exec dir="!uploader" executable="./gppro_upload.bat" osfamily="windows"/>
-  </target>
+    <target name="build" description="Builds the CAP file.">
+        <javacard jckit="${JC222}">
+            <cap output="applet/ectester.cap" sources="src/cz/crcs/ectester/applet" aid="4543546573746572">
+                <applet class="cz.crcs.ectester.applet.ECTesterApplet" aid="45435465737465723031"/>
+            </cap>
+        </javacard>
+    </target>
 
-  <target name="upload-emv" depends="build" description="Uploads the CAP file to the card, using gp.jar, uses the EMV protocol">
-    <exec dir="!uploader" executable="./gppro_upload_emv.sh" osfamily="unix"/>
-    <exec dir="!uploader" executable="./gppro_upload_emv.bat" osfamily="windows"/>
-  </target>
+    <target name="upload" depends="build" description="Uploads the CAP file to the card, using gp.jar">
+        <exec dir="applet" executable="./gppro_upload.sh" osfamily="unix"/>
+        <exec dir="applet" executable="./gppro_upload.bat" osfamily="windows"/>
+    </target>
+
+    <target name="upload-emv" depends="build"
+            description="Uploads the CAP file to the card, using gp.jar, uses the EMV protocol">
+        <exec dir="applet" executable="./gppro_upload_emv.sh" osfamily="unix"/>
+        <exec dir="applet" executable="./gppro_upload_emv.bat" osfamily="windows"/>
+    </target>
 </project>