From eb3f5b288b35a16396d84cee04f6c7b77111f706 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 14:22:35 -0500 Subject: [PATCH 1/3] point to branch and update versions --- .github/workflows/checks.yaml | 2 +- cmdline/src/main/java/io/opentdf/platform/Command.java | 2 +- sdk/src/main/java/io/opentdf/platform/sdk/Version.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index dc1870bf..0e9f3433 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -246,7 +246,7 @@ jobs: packages: read checks: write pull-requests: write - uses: opentdf/tests/.github/workflows/xtest.yml@main + uses: opentdf/tests/.github/workflows/xtest.yml@dspx-2518-enable-java-extended-ec with: focus-sdk: java java-ref: ${{ github.ref }} latest diff --git a/cmdline/src/main/java/io/opentdf/platform/Command.java b/cmdline/src/main/java/io/opentdf/platform/Command.java index 48f943ed..7beb56f3 100644 --- a/cmdline/src/main/java/io/opentdf/platform/Command.java +++ b/cmdline/src/main/java/io/opentdf/platform/Command.java @@ -53,7 +53,7 @@ */ class Versions { // Version of the SDK, managed by release-please. - public static final String SDK = "0.12.0"; // x-release-please-version + public static final String SDK = "0.13.0"; // x-release-please-version // This sdk aims to support this version of the TDF spec; currently 4.3.0. public static final String TDF_SPEC = "4.3.0"; diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/Version.java b/sdk/src/main/java/io/opentdf/platform/sdk/Version.java index 53f131c7..546c4905 100644 --- a/sdk/src/main/java/io/opentdf/platform/sdk/Version.java +++ b/sdk/src/main/java/io/opentdf/platform/sdk/Version.java @@ -13,7 +13,7 @@ class Version implements Comparable { // Version of the SDK, managed by release-please. - public static final String SDK = "0.12.0"; // x-release-please-version + public static final String SDK = "0.13.0"; // x-release-please-version private final int major; private final int minor; From 812c0f2cb67a621958c6700c9751673a80ec01f7 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 15:47:17 -0500 Subject: [PATCH 2/3] use key type from kas key not tdf config --- sdk/src/main/java/io/opentdf/platform/sdk/TDF.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java b/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java index 578159d9..3ee4ba22 100644 --- a/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java +++ b/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java @@ -227,8 +227,9 @@ private Manifest.KeyAccess createKeyAccess(Config.TDFConfig tdfConfig, Config.KA ? tdfConfig.wrappingKeyType.toString() : kasInfo.Algorithm; - if (KeyType.fromString(algorithm).isEc()) { - var ecKeyWrappedKeyInfo = createECWrappedKey(tdfConfig, kasInfo, symKey); + var keyType = KeyType.fromString(algorithm); + if (keyType.isEc()) { + var ecKeyWrappedKeyInfo = createECWrappedKey(kasInfo, symKey, keyType); keyAccess.wrappedKey = ecKeyWrappedKeyInfo.wrappedKey; keyAccess.ephemeralPublicKey = ecKeyWrappedKeyInfo.publicKey; keyAccess.keyType = kECWrapped; @@ -239,9 +240,9 @@ private Manifest.KeyAccess createKeyAccess(Config.TDFConfig tdfConfig, Config.KA return keyAccess; } - private ECKeyWrappedKeyInfo createECWrappedKey(Config.TDFConfig tdfConfig, Config.KASInfo kasInfo, - byte[] symKey) { - var curveName = tdfConfig.wrappingKeyType.getECCurve(); + private ECKeyWrappedKeyInfo createECWrappedKey(Config.KASInfo kasInfo, + byte[] symKey, KeyType keyType) { + var curveName = keyType.getECCurve(); var keyPair = new ECKeyPair(curveName, ECKeyPair.ECAlgorithm.ECDH); ECPublicKey kasPubKey = ECKeyPair.publicKeyFromPem(kasInfo.PublicKey); From 1e2ef989f3e1e6e814494954595e95450fd4d2d0 Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Tue, 3 Mar 2026 16:20:57 -0500 Subject: [PATCH 3/3] remove changes for testing --- .github/workflows/checks.yaml | 2 +- cmdline/src/main/java/io/opentdf/platform/Command.java | 2 +- sdk/src/main/java/io/opentdf/platform/sdk/Version.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 0e9f3433..dc1870bf 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -246,7 +246,7 @@ jobs: packages: read checks: write pull-requests: write - uses: opentdf/tests/.github/workflows/xtest.yml@dspx-2518-enable-java-extended-ec + uses: opentdf/tests/.github/workflows/xtest.yml@main with: focus-sdk: java java-ref: ${{ github.ref }} latest diff --git a/cmdline/src/main/java/io/opentdf/platform/Command.java b/cmdline/src/main/java/io/opentdf/platform/Command.java index 7beb56f3..48f943ed 100644 --- a/cmdline/src/main/java/io/opentdf/platform/Command.java +++ b/cmdline/src/main/java/io/opentdf/platform/Command.java @@ -53,7 +53,7 @@ */ class Versions { // Version of the SDK, managed by release-please. - public static final String SDK = "0.13.0"; // x-release-please-version + public static final String SDK = "0.12.0"; // x-release-please-version // This sdk aims to support this version of the TDF spec; currently 4.3.0. public static final String TDF_SPEC = "4.3.0"; diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/Version.java b/sdk/src/main/java/io/opentdf/platform/sdk/Version.java index 546c4905..53f131c7 100644 --- a/sdk/src/main/java/io/opentdf/platform/sdk/Version.java +++ b/sdk/src/main/java/io/opentdf/platform/sdk/Version.java @@ -13,7 +13,7 @@ class Version implements Comparable { // Version of the SDK, managed by release-please. - public static final String SDK = "0.13.0"; // x-release-please-version + public static final String SDK = "0.12.0"; // x-release-please-version private final int major; private final int minor;