Skip to content

fix(sdk): Support kas keys with extended EC methods #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elizabethhealy merged 3 commits into from
Mar 3, 2026
Merged

fix(sdk): Support kas keys with extended EC methods #344

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb3f5b2
point to branch and update versions
elizabethhealy Mar 3, 2026
812c0f2
use key type from kas key not tdf config
elizabethhealy Mar 3, 2026
1e2ef98
remove changes for testing
elizabethhealy Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions sdk/src/main/java/io/opentdf/platform/sdk/TDF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Loading