From 6ac7c6927f32bb7752cca23f214a3996a05f4267 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 11:14:16 -0500 Subject: [PATCH 1/7] enable for java --- xtest/tdfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtest/tdfs.py b/xtest/tdfs.py index 2e273df5..3f0c38d7 100644 --- a/xtest/tdfs.py +++ b/xtest/tdfs.py @@ -454,7 +454,7 @@ def _uncached_supports(self, feature: feature_type) -> bool: case ("mechanism-rsa-4096", "go"): return True case ("mechanism-rsa-4096", "java"): - return False + return True case ("mechanism-ec-curves-384-521", "go"): return True case ("mechanism-ec-curves-384-521", ("java" | "js")): From 408906a3a4e59a00aab7cab5d0632df42395b8e8 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 11:16:38 -0500 Subject: [PATCH 2/7] hardcode branch --- .github/workflows/xtest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 77344889..7aaf01fc 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -252,6 +252,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: opentdf/tests + ref: dspx-2517-enable-rsa-extended-java path: otdftests # use different name bc other repos might have tests directories persist-credentials: false From a792f6260acf8a48a322d76a8ebe69c52512f313 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 11:50:04 -0500 Subject: [PATCH 3/7] call the cli for supports info --- xtest/sdk/java/cli.sh | 7 ++++++- xtest/tdfs.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xtest/sdk/java/cli.sh b/xtest/sdk/java/cli.sh index 6457ed36..97f92ea5 100755 --- a/xtest/sdk/java/cli.sh +++ b/xtest/sdk/java/cli.sh @@ -91,7 +91,12 @@ if [ "$1" == "supports" ]; then java -jar "$SCRIPT_DIR"/cmdline.jar help encrypt | grep with-target-mode exit $? ;; - + mechanism-rsa-4096) + # rsa4096 support in > 0.12.0 + set -o pipefail + java -jar "$SCRIPT_DIR"/cmdline.jar --version | jq -re .version | awk -F. '{ if ($1 > 0 || ($1 == 0 && $2 >= 13) || ($1 == 0 && $2 == 12 && $3 >= 1)) exit 0; else exit 1; }' + exit $? + ;; *) echo "Unknown feature: $2" exit 2 diff --git a/xtest/tdfs.py b/xtest/tdfs.py index 3f0c38d7..f547f96b 100644 --- a/xtest/tdfs.py +++ b/xtest/tdfs.py @@ -453,8 +453,8 @@ def _uncached_supports(self, feature: feature_type) -> bool: return True case ("mechanism-rsa-4096", "go"): return True - case ("mechanism-rsa-4096", "java"): - return True + # case ("mechanism-rsa-4096", "java"): + # return True case ("mechanism-ec-curves-384-521", "go"): return True case ("mechanism-ec-curves-384-521", ("java" | "js")): From 67f480e423fc581597fe6105963a8239b1f684e4 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 12:59:25 -0500 Subject: [PATCH 4/7] remove comment --- xtest/tdfs.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/xtest/tdfs.py b/xtest/tdfs.py index f547f96b..fc7011f8 100644 --- a/xtest/tdfs.py +++ b/xtest/tdfs.py @@ -453,8 +453,6 @@ def _uncached_supports(self, feature: feature_type) -> bool: return True case ("mechanism-rsa-4096", "go"): return True - # case ("mechanism-rsa-4096", "java"): - # return True case ("mechanism-ec-curves-384-521", "go"): return True case ("mechanism-ec-curves-384-521", ("java" | "js")): From af19ce5fc4139258bb16070f854bbae16c4dc718 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 12:59:49 -0500 Subject: [PATCH 5/7] remove ref --- .github/workflows/xtest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 7aaf01fc..77344889 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -252,7 +252,6 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: opentdf/tests - ref: dspx-2517-enable-rsa-extended-java path: otdftests # use different name bc other repos might have tests directories persist-credentials: false From 9983583fc734d8e0d221ea9976d5927e9e67030e Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 14:20:56 -0500 Subject: [PATCH 6/7] enable ec for java --- .github/workflows/xtest.yml | 1 + xtest/sdk/java/cli.sh | 6 +++--- xtest/tdfs.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 77344889..e6e5956f 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -252,6 +252,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: opentdf/tests + ref: dspx-2518-enable-java-extended-ec path: otdftests # use different name bc other repos might have tests directories persist-credentials: false diff --git a/xtest/sdk/java/cli.sh b/xtest/sdk/java/cli.sh index 97f92ea5..c42ab7ba 100755 --- a/xtest/sdk/java/cli.sh +++ b/xtest/sdk/java/cli.sh @@ -91,10 +91,10 @@ if [ "$1" == "supports" ]; then java -jar "$SCRIPT_DIR"/cmdline.jar help encrypt | grep with-target-mode exit $? ;; - mechanism-rsa-4096) - # rsa4096 support in > 0.12.0 + mechanism-rsa-4096 | mechanism-ec-curves-384-521) + # rsa4096 support in >= 0.13.0 set -o pipefail - java -jar "$SCRIPT_DIR"/cmdline.jar --version | jq -re .version | awk -F. '{ if ($1 > 0 || ($1 == 0 && $2 >= 13) || ($1 == 0 && $2 == 12 && $3 >= 1)) exit 0; else exit 1; }' + java -jar "$SCRIPT_DIR"/cmdline.jar --version | jq -re .version | awk -F. '{ if ($1 > 0 || ($1 == 0 && $2 >= 13)) exit 0; else exit 1; }' exit $? ;; *) diff --git a/xtest/tdfs.py b/xtest/tdfs.py index f16c0c8b..896eb77b 100644 --- a/xtest/tdfs.py +++ b/xtest/tdfs.py @@ -461,7 +461,7 @@ def _uncached_supports(self, feature: feature_type) -> bool: return True case ("mechanism-ec-curves-384-521", "go"): return True - case ("mechanism-ec-curves-384-521", ("java" | "js")): + case ("mechanism-ec-curves-384-521", "js"): return False case _: pass From 4f29a7d697719d684431d48bfdf5d926510f2bc1 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 17:14:41 -0500 Subject: [PATCH 7/7] remove ref --- .github/workflows/xtest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index e6e5956f..77344889 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -252,7 +252,6 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: opentdf/tests - ref: dspx-2518-enable-java-extended-ec path: otdftests # use different name bc other repos might have tests directories persist-credentials: false