diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | build-applet.xml | 35 | ||||
| -rw-r--r-- | ext/ant-javacard.jar | bin | 47967 -> 372534 bytes | |||
| -rw-r--r-- | lib/jcardsim-2.2.2-all.jar | bin | 394661 -> 0 bytes | |||
| -rw-r--r-- | lib/jcardsim-3.0.4-SNAPSHOT.jar | bin | 492617 -> 0 bytes | |||
| -rw-r--r-- | lib/jcardsim-3.0.5.11.jar | bin | 0 -> 499643 bytes | |||
| -rw-r--r-- | nbproject/reader/manifest.mf | 2 | ||||
| -rw-r--r-- | nbproject/reader/project.properties | 6 | ||||
| -rw-r--r-- | nbproject/standalone/manifest.mf | 2 | ||||
| -rw-r--r-- | nbproject/standalone/project.properties | 8 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/reader/ECTesterReader.java | 5 |
11 files changed, 40 insertions, 21 deletions
@@ -10,6 +10,7 @@ /applet/ectester.cap /applet/ectester221.cap /applet/ectester222.cap +/applet/ectester304.cap # Test runs in /dist /dist/*.default @@ -38,4 +39,4 @@ # Python stuff /util/__pycache__/ -/util/.ipynb_checkpoints/
\ No newline at end of file +/util/.ipynb_checkpoints/ diff --git a/build-applet.xml b/build-applet.xml index 8f5bd3a..c31ae23 100644 --- a/build-applet.xml +++ b/build-applet.xml @@ -18,20 +18,29 @@ <property name="pkg_aid" value="4543546573746572"/> <property name="applet_aid_221" value="454354657374657230333362"/> <!--// VERSION v0.3.3 --> <property name="applet_aid_222" value="454354657374657230333378"/> <!--// VERSION v0.3.3 --> + <property name="applet_aid_304" value="454354657374657230333394"/> <!--// VERSION v0.3.3 --> <property name="cap_221" value="ectester221.cap"/> <property name="cap_222" value="ectester222.cap"/> - <property name="cap" value="${cap_222}"/> + <property name="cap_304" value="ectester304.cap"/> + <property name="cap" value="${cap_304}"/> - <condition property="cap_extended"> + <condition property="build_221"> + <equals arg1="${cap}" arg2="${cap_221}"/> + </condition> + <condition property="build_222"> <equals arg1="${cap}" arg2="${cap_222}"/> </condition> + <condition property="build_304"> + <equals arg1="${cap}" arg2="${cap_304}"/> + </condition> <target name="build-check"> <fail message="Invalid cap name!"> <condition> <not> <or> + <equals arg1="${cap}" arg2="${cap_304}"/> <equals arg1="${cap}" arg2="${cap_222}"/> <equals arg1="${cap}" arg2="${cap_221}"/> </or> @@ -39,24 +48,33 @@ </condition> </fail> </target> - - <target name="build-221" description="Builds the CAP file for JavaCard 2.2.1." unless="cap_extended"> + + <!-- TODO: These conditions disallow a manual request to build a concrete version. Fix this. --> + <target name="build-221" description="Builds the CAP file for JavaCard 2.2.1." if="build_221"> <javacard jckit="${JC221}"> - <cap verify="false" output="applet/ectester221.cap" sources="src/cz/crcs/ectester/applet" aid="${pkg_aid}" excludes="ECTesterAppletExtended.*"> + <cap verify="false" output="applet/${cap_221}" sources="src/cz/crcs/ectester/applet" aid="${pkg_aid}" excludes="ECTesterAppletExtended.*"> <applet class="cz.crcs.ectester.applet.ECTesterApplet" aid="${applet_aid_221}"/> </cap> </javacard> </target> - <target name="build-222" description="Builds the CAP file for JavaCard 2.2.2." if="cap_extended"> + <target name="build-222" description="Builds the CAP file for JavaCard 2.2.2." if="build_222"> <javacard jckit="${JC222}"> - <cap output="applet/ectester222.cap" sources="src/cz/crcs/ectester/applet" aid="${pkg_aid}" excludes="ECTesterApplet.*"> + <cap output="applet/${cap_222}" sources="src/cz/crcs/ectester/applet" aid="${pkg_aid}" excludes="ECTesterApplet.*"> <applet class="cz.crcs.ectester.applet.ECTesterAppletExtended" aid="${applet_aid_222}"/> </cap> </javacard> </target> - <target name="build" description="Builds the CAP file." depends="build-check,build-221,build-222"> + <target name="build-304" description="Builds the CAP file for JavaCard 3.0.4." if="build_304"> + <javacard jckit="${JC304}"> + <cap output="applet/${cap_304}" sources="src/cz/crcs/ectester/applet" aid="${pkg_aid}" excludes="ECTesterApplet.*"> + <applet class="cz.crcs.ectester.applet.ECTesterAppletExtended" aid="${applet_aid_304}"/> + </cap> + </javacard> + </target> + + <target name="build" description="Builds the CAP file." depends="build-check,build-221,build-222,build-304"> </target> <target name="upload" depends="build" description="Uploads the CAP file to the card, using gp.jar."> @@ -84,5 +102,6 @@ <target name="clean" description="Clean the built CAP files."> <delete file="applet/${cap_221}" quiet="true"/> <delete file="applet/${cap_222}" quiet="true"/> + <delete file="applet/${cap_304}" quiet="true"/> </target> </project> diff --git a/ext/ant-javacard.jar b/ext/ant-javacard.jar Binary files differindex f36143a..a9c8656 100644 --- a/ext/ant-javacard.jar +++ b/ext/ant-javacard.jar diff --git a/lib/jcardsim-2.2.2-all.jar b/lib/jcardsim-2.2.2-all.jar Binary files differdeleted file mode 100644 index 0ac10c0..0000000 --- a/lib/jcardsim-2.2.2-all.jar +++ /dev/null diff --git a/lib/jcardsim-3.0.4-SNAPSHOT.jar b/lib/jcardsim-3.0.4-SNAPSHOT.jar Binary files differdeleted file mode 100644 index ea3ea26..0000000 --- a/lib/jcardsim-3.0.4-SNAPSHOT.jar +++ /dev/null diff --git a/lib/jcardsim-3.0.5.11.jar b/lib/jcardsim-3.0.5.11.jar Binary files differnew file mode 100644 index 0000000..90be8a0 --- /dev/null +++ b/lib/jcardsim-3.0.5.11.jar diff --git a/nbproject/reader/manifest.mf b/nbproject/reader/manifest.mf index 4bb6334..521ebdb 100644 --- a/nbproject/reader/manifest.mf +++ b/nbproject/reader/manifest.mf @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Class-Path: lib/bcprov-jdk15on-1.58.jar lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar +Class-Path: lib/bcprov-jdk15on-1.58.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar Main-Class: cz.crcs.ectester.reader.ECTesterReader diff --git a/nbproject/reader/project.properties b/nbproject/reader/project.properties index c00c309..ea20d1d 100644 --- a/nbproject/reader/project.properties +++ b/nbproject/reader/project.properties @@ -34,7 +34,7 @@ includes=**/applet/**,**/common/**,**/data/**,**/reader/** jar.compress=true javac.classpath=\ lib/bcprov-jdk15on-1.58.jar:\ - lib/jcardsim-3.0.4-SNAPSHOT.jar:\ + lib/jcardsim-3.0.5.11.jar:\ lib/commons-cli-1.4.jar:\ lib/snakeyaml-1.19.jar # Space-separated list of extra javac options @@ -42,8 +42,8 @@ javac.compilerargs=-Xlint:all javac.deprecation=false javac.processorpath=\ ${javac.classpath} -javac.source=1.8 -javac.target=1.8 +javac.source=11 +javac.target=11 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/nbproject/standalone/manifest.mf b/nbproject/standalone/manifest.mf index ad7aacb..61e31fe 100644 --- a/nbproject/standalone/manifest.mf +++ b/nbproject/standalone/manifest.mf @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Class-Path: lib/bcprov-jdk15on-1.58.jar lib/wolfcrypt-jni.jar lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar +Class-Path: lib/bcprov-jdk15on-1.58.jar lib/wolfcrypt-jni.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar Main-Class: cz.crcs.ectester.standalone.ECTesterStandalone diff --git a/nbproject/standalone/project.properties b/nbproject/standalone/project.properties index 29ad3cc..1fc1700 100644 --- a/nbproject/standalone/project.properties +++ b/nbproject/standalone/project.properties @@ -35,16 +35,16 @@ jar.compress=true javac.classpath=\ lib/bcprov-jdk15on-1.58.jar:\ lib/wolfcrypt-jni.jar:\ - lib/jcardsim-3.0.4-SNAPSHOT.jar:\ + lib/jcardsim-3.0.5.11.jar:\ lib/commons-cli-1.4.jar:\ lib/snakeyaml-1.19.jar # Space-separated list of extra javac options -javac.compilerargs=-Xlint:all +javac.compilerargs=-Xlint:all --add-modules jdk.crypto.ec javac.deprecation=false javac.processorpath=\ ${javac.classpath} -javac.source=1.8 -javac.target=1.8 +javac.source=11 +javac.target=11 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java index 7bd7d42..02c6558 100644 --- a/src/cz/crcs/ectester/reader/ECTesterReader.java +++ b/src/cz/crcs/ectester/reader/ECTesterReader.java @@ -49,7 +49,6 @@ import javax.xml.parsers.ParserConfigurationException; import java.io.*; import java.math.BigInteger; import java.net.URL; -import java.net.URLClassLoader; import java.nio.file.Files; import java.security.Security; import java.security.spec.ECParameterSpec; @@ -89,9 +88,9 @@ public class ECTesterReader { private static final int TRY_VERSIONS = 10; static { - URLClassLoader cl = (URLClassLoader) ECTesterReader.class.getClassLoader(); + ClassLoader cl = ECTesterReader.class.getClassLoader(); try { - URL url = cl.findResource("META-INF/MANIFEST.MF"); + URL url = cl.getResource("META-INF/MANIFEST.MF"); Manifest manifest = new Manifest(url.openStream()); String commit = manifest.getMainAttributes().getValue("Git-Commit"); GIT_COMMIT = (commit == null) ? "" : "(git " + commit + ")"; |