From 7538aa92bffc34d8fc8474dd471a60a8bcd71ca2 Mon Sep 17 00:00:00 2001 From: J08nY Date: Mon, 30 Jan 2023 17:30:42 +0100 Subject: Now works with Java 11! Uses ph4r05's jcardsim release 3.0.5.11: https://mvnrepository.com/artifact/com.klinec/jcardsim/3.0.5.11 Uses ant-javacard v21.12.31: https://github.com/martinpaljak/ant-javacard/releases/tag/v21.12.31 Also note the JavaCard and Java compatibility issues: https://github.com/martinpaljak/ant-javacard/wiki/Version-compatibility --- .gitignore | 3 +- build-applet.xml | 35 ++++++++++++++++++------ ext/ant-javacard.jar | Bin 47967 -> 372534 bytes lib/jcardsim-2.2.2-all.jar | Bin 394661 -> 0 bytes lib/jcardsim-3.0.4-SNAPSHOT.jar | Bin 492617 -> 0 bytes lib/jcardsim-3.0.5.11.jar | Bin 0 -> 499643 bytes nbproject/reader/manifest.mf | 2 +- nbproject/reader/project.properties | 6 ++-- nbproject/standalone/manifest.mf | 2 +- nbproject/standalone/project.properties | 8 +++--- src/cz/crcs/ectester/reader/ECTesterReader.java | 5 ++-- 11 files changed, 40 insertions(+), 21 deletions(-) delete mode 100644 lib/jcardsim-2.2.2-all.jar delete mode 100644 lib/jcardsim-3.0.4-SNAPSHOT.jar create mode 100644 lib/jcardsim-3.0.5.11.jar diff --git a/.gitignore b/.gitignore index ff1c3c4..201c0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ + - + + - + + + + + + + + @@ -39,24 +48,33 @@ - - + + + - + - + - + - + + + + + + + + + @@ -84,5 +102,6 @@ + diff --git a/ext/ant-javacard.jar b/ext/ant-javacard.jar index f36143a..a9c8656 100644 Binary files a/ext/ant-javacard.jar and b/ext/ant-javacard.jar differ diff --git a/lib/jcardsim-2.2.2-all.jar b/lib/jcardsim-2.2.2-all.jar deleted file mode 100644 index 0ac10c0..0000000 Binary files a/lib/jcardsim-2.2.2-all.jar and /dev/null differ diff --git a/lib/jcardsim-3.0.4-SNAPSHOT.jar b/lib/jcardsim-3.0.4-SNAPSHOT.jar deleted file mode 100644 index ea3ea26..0000000 Binary files a/lib/jcardsim-3.0.4-SNAPSHOT.jar and /dev/null differ diff --git a/lib/jcardsim-3.0.5.11.jar b/lib/jcardsim-3.0.5.11.jar new file mode 100644 index 0000000..90be8a0 Binary files /dev/null and b/lib/jcardsim-3.0.5.11.jar differ 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 + ")"; -- cgit v1.2.3-70-g09d2