rename assertionkey to signingkey

Author: elizabethhealy

cmdline/src/main/java/io/opentdf/platform/Command.java

@@ -186,10 +186,10 @@ void encrypt(
             // iterate through the assertions and correct the key types
             for (int i = 0; i < assertionConfigs.length; i++) {
                 AssertionConfig config = assertionConfigs[i];
-                if (config.assertionKey != null && config.assertionKey.isDefined()) {
+                if (config.signingKey != null && config.signingKey.isDefined()) {
                     try {
-                        Object correctedKey = correctKeyType(config.assertionKey.alg, config.assertionKey.key, false);
-                        config.assertionKey.key = correctedKey;
+                        Object correctedKey = correctKeyType(config.signingKey.alg, config.signingKey.key, false);
+                        config.signingKey.key = correctedKey;
                     } catch (Exception e) {
                         throw new RuntimeException("Error with assertion signing key: " + e.getMessage(), e);
                     }

sdk/src/main/java/io/opentdf/platform/sdk/AssertionConfig.java

@@ -121,6 +121,5 @@ public int hashCode() {
     public Scope scope;
     public AppliesToState appliesToState;
     public Statement statement;
-    @SerializedName(value = "signingKey")
-    public AssertionKey assertionKey;
+    public AssertionKey signingKey;
 }

sdk/src/main/java/io/opentdf/platform/sdk/TDF.java

@@ -542,8 +542,8 @@ public TDFObject createTDF(InputStream payload,
 
             var assertionSigningKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.HS256,
                     tdfObject.aesGcm.getKey());
-            if (assertionConfig.assertionKey != null && assertionConfig.assertionKey.isDefined()) {
-                assertionSigningKey = assertionConfig.assertionKey;
+            if (assertionConfig.signingKey != null && assertionConfig.signingKey.isDefined()) {
+                assertionSigningKey = assertionConfig.signingKey;
             }
 
             assertion.sign(new Manifest.Assertion.HashValues(assertionHash, encodedHash), assertionSigningKey);

sdk/src/test/java/io/opentdf/platform/sdk/TDFTest.java

@@ -97,7 +97,7 @@ void testSimpleTDFEncryptAndDecrypt() throws Exception {
         assertion1.statement.format = "base64binary";
         assertion1.statement.schema = "text";
         assertion1.statement.value = "ICAgIDxlZGoOkVkaD4=";
-        assertion1.assertionKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.HS256, key);
+        assertion1.signingKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.HS256, key);
 
         Config.TDFConfig config = Config.newTDFConfig(
                 Config.withAutoconfigure(false),
@@ -151,7 +151,7 @@ void testSimpleTDFWithAssertionWithRS256() throws Exception {
         assertionConfig.statement.format = "base64binary";
         assertionConfig.statement.schema = "text";
         assertionConfig.statement.value = "ICAgIDxlZGoOkVkaD4=";
-        assertionConfig.assertionKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.RS256,
+        assertionConfig.signingKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.RS256,
                 keypair.getPrivate());
 
         Config.TDFConfig config = Config.newTDFConfig(
@@ -195,7 +195,7 @@ void testWithAssertionVerificationDisabled() throws Exception {
         assertionConfig.statement.format = "base64binary";
         assertionConfig.statement.schema = "text";
         assertionConfig.statement.value = "ICAgIDxlZGoOkVkaD4=";
-        assertionConfig.assertionKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.RS256,
+        assertionConfig.signingKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.RS256,
                 keypair.getPrivate());
 
         Config.TDFConfig config = Config.newTDFConfig(
@@ -314,7 +314,7 @@ void testSimpleTDFWithAssertionWithHS256Failure() throws Exception {
         assertionConfig1.statement.format = "base64binary";
         assertionConfig1.statement.schema = "text";
         assertionConfig1.statement.value = "ICAgIDxlZGoOkVkaD4=";
-        assertionConfig1.assertionKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.HS256, key);
+        assertionConfig1.signingKey = new AssertionConfig.AssertionKey(AssertionConfig.AssertionKeyAlg.HS256, key);
 
         Config.TDFConfig config = Config.newTDFConfig(
                 Config.withAutoconfigure(false),