missed the point

opentdf · Jul 23, 2024 · 9ac7375 · 9ac7375
1 parent 5e04c5e
commit 9ac7375
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java b/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java
@@ -37,7 +37,7 @@ static public class KeyAccess {
         public String url;
         public String protocol;
         public String wrappedKey;
-        public PolicyBinding policyBinding;
+        public Object policyBinding;
         public String encryptedMetadata;
         public String kid;
     }

diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java b/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java
@@ -216,9 +216,10 @@ private void prepareManifest(Config.TDFConfig tdfConfig) {
 
                 // Add policyBinding
                 var hexBinding = Hex.encodeHexString(CryptoUtils.CalculateSHA256Hmac(symKey, base64PolicyObject.getBytes(StandardCharsets.UTF_8)));
-                keyAccess.policyBinding = new Manifest.PolicyBinding();
-                keyAccess.policyBinding.alg = kHmacIntegrityAlgorithm;
-                keyAccess.policyBinding.hash = encoder.encodeToString(hexBinding.getBytes(StandardCharsets.UTF_8));;
+                var policyBinding = new Manifest.PolicyBinding();
+                policyBinding.alg = kHmacIntegrityAlgorithm;
+                policyBinding.hash = encoder.encodeToString(hexBinding.getBytes(StandardCharsets.UTF_8));;
+                keyAccess.policyBinding = policyBinding;
 
                 // Wrap the key with kas public key
                 AsymEncryption asymmetricEncrypt = new AsymEncryption(kasInfo.PublicKey);

diff --git a/sdk/src/test/java/io/opentdf/platform/sdk/ManifestTest.java b/sdk/src/test/java/io/opentdf/platform/sdk/ManifestTest.java
@@ -73,8 +73,10 @@ void testManifestMarshalAndUnMarshal()  {
         List<Manifest.KeyAccess> keyAccess = manifest.encryptionInformation.keyAccessObj;
         assertEquals(keyAccess.get(0).keyType, "wrapped");
         assertEquals(keyAccess.get(0).protocol, "kas");
-        assertEquals(keyAccess.get(0).policyBinding.alg, "HS256");
-        assertEquals(keyAccess.get(0).policyBinding.hash, "YTgzNThhNzc5NWRhMjdjYThlYjk4ZmNmODliNzc2Y2E5ZmZiZDExZDQ3OTM5ODFjZTRjNmE3MmVjOTUzZTFlMA==");
+        assertEquals(keyAccess.get(0).policyBinding.getClass(), Manifest.PolicyBinding.class);
+        var policyBinding = (Manifest.PolicyBinding)keyAccess.get(0).policyBinding;
+        assertEquals(policyBinding.alg, "HS256");
+        assertEquals(policyBinding.hash, "YTgzNThhNzc5NWRhMjdjYThlYjk4ZmNmODliNzc2Y2E5ZmZiZDExZDQ3OTM5ODFjZTRjNmE3MmVjOTUzZTFlMA==");
         assertEquals(manifest.encryptionInformation.method.algorithm, "AES-256-GCM");
         assertEquals(manifest.encryptionInformation.integrityInformation.rootSignature.algorithm, "HS256");
         assertEquals(manifest.encryptionInformation.integrityInformation.segmentHashAlg, "GMAC");