From 1ec0cd462865f06c673e54ed4556079d3a0917a6 Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 25 Apr 2024 17:08:37 +0200 Subject: Add XDH and EdDSA keygen. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab2a2ee..8ad7bcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: strategy: matrix: - java: [ "11", "17", "21" ] + java: [ "17", "21" ] env: # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!! # also, add the wolfcrypt JNI path -- cgit v1.3.1 From 2d6081dd3044a1d76a7e30f25d704a42fe8d2411 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sat, 27 Apr 2024 00:24:22 +0200 Subject: Add note about required Java versions. --- .github/workflows/build.yml | 4 ++-- README.md | 5 ++++- common/build.gradle.kts | 2 +- standalone/build.gradle.kts | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ad7bcd..10769c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: strategy: matrix: - java: [ "11", "17", "21" ] + java: [ "15", "17", "21" ] name: Build reader on Java ${{ matrix.java }} steps: - uses: actions/checkout@v4 @@ -88,7 +88,7 @@ jobs: strategy: matrix: - java: [ "17", "21" ] + java: [ "15", "17", "21" ] env: # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!! # also, add the wolfcrypt JNI path diff --git a/README.md b/README.md index f9cbfd7..726be68 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,15 @@ There are three parts of ECTester, the JavaCard applet used for testing, the rea standalone app which tests software libraries. The target platform for ECTester is Linux, but things should work on Windows as well, although testing of standalone libraries will be limited to Java libraries and Microsoft CNG library. +The ECTester parts require different Java versions. Reader and standalone parts require Java >= 15 while the applet build +will be able to target different JavaCard versions based on the Java version, see [this list](https://github.com/martinpaljak/ant-javacard/wiki/JavaCard-SDK-and-JDK-version-compatibility). + To build ECTester simply do: ```bash git submodule update --init --recursive # To initialize submodules (JavaCard SDKs, Microsoft CNG, BoringSSL, ...) ./gradlew :applet:buildJavaCard # To build the applet (cap) -> "applet/build/javacard/applet[221,222,305].cap". ./gradlew :reader:uberJar # To build the reader tool (jar) -> "reader/build/libs/ECTesterReader.jar" -./gradlew :standalone:libs # To build the native library shims. (Necessary +./gradlew :standalone:libs # To build the native library shims. ./gradlew :standalone:uberJar # To build the standalone tool (jar) -> "standalone/build/libs/ECTesterStandalone.jar" ``` The applet comes in several flavors, targeting JavaCard `2.2.1`, `2.2.2` and `3.0.5`. The `2.2.2` and later flavors diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 0aca7fb..1aff0d7 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -23,5 +23,5 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_15 } \ No newline at end of file diff --git a/standalone/build.gradle.kts b/standalone/build.gradle.kts index f8d7f9b..5ad3fb4 100644 --- a/standalone/build.gradle.kts +++ b/standalone/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_15 } application { -- cgit v1.3.1 From fd6385d8432bf18e5d94e37fcc4fc7023fb5d0cc Mon Sep 17 00:00:00 2001 From: J08nY Date: Sat, 27 Apr 2024 00:25:46 +0200 Subject: Java 15 unavailable in CI. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10769c1..b39b474 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: strategy: matrix: - java: [ "15", "17", "21" ] + java: [ "17", "21", "22" ] name: Build reader on Java ${{ matrix.java }} steps: - uses: actions/checkout@v4 @@ -88,7 +88,7 @@ jobs: strategy: matrix: - java: [ "15", "17", "21" ] + java: [ "17", "21", "22"] env: # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!! # also, add the wolfcrypt JNI path -- cgit v1.3.1 From c4980ceb1452488d1fb78627ed16e3a36700ccd4 Mon Sep 17 00:00:00 2001 From: J08nY Date: Mon, 6 May 2024 19:19:29 +0200 Subject: Do not test with Java 22 yet (Gradle does not support it fully). --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b39b474..fea8fe5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: strategy: matrix: - java: [ "17", "21", "22" ] + java: [ "17", "21"] name: Build reader on Java ${{ matrix.java }} steps: - uses: actions/checkout@v4 @@ -88,7 +88,7 @@ jobs: strategy: matrix: - java: [ "17", "21", "22"] + java: [ "17", "21"] env: # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!! # also, add the wolfcrypt JNI path -- cgit v1.3.1