Align claim names with RFC spec

Signed-off-by: HarshvMahawar <[email protected]>

Author: HarshvMahawar

src/claims.py

@@ -21,9 +21,9 @@ class AttestationResult(BaseJCSerializable):
 
     # https://www.ietf.org/archive/id/draft-ietf-rats-eat-31.html#section-7.2.4
     jc_map = {
-        "profile": KeyMapping(265, "profile"),
-        "issued_at": KeyMapping(6, "issued_at"),
-        "verifier_id": KeyMapping(1004, "verifier_id"),
+        "profile": KeyMapping(265, "eat_profile"),
+        "issued_at": KeyMapping(6, "iat"),
+        "verifier_id": KeyMapping(1004, "ear.verifier-id"),
         "submods": KeyMapping(266, "submods"),
     }
 

src/submod.py

@@ -11,6 +11,6 @@ class Submod(BaseJCSerializable):
     status: TrustTier
 
     jc_map = {
-        "status": KeyMapping(1000, "status"),
-        "trust_vector": KeyMapping(1001, "trust_vector"),
+        "status": KeyMapping(1000, "ear.status"),
+        "trust_vector": KeyMapping(1001, "ear.trustworthiness-vector"),
     }

tests/test_claims.py

@@ -47,12 +47,12 @@ def sample_attestation_result():
 
 def test_attestation_result_to_dict(sample_attestation_result):
     expected = {
-        "profile": "test_profile",
-        "issued_at": 1234567890,
-        "verifier_id": {"developer": "Acme Inc.", "build": "v1"},
+        "eat_profile": "test_profile",
+        "iat": 1234567890,
+        "ear.verifier-id": {"developer": "Acme Inc.", "build": "v1"},
         "submods": {
             "submod1": {
-                "trust_vector": {
+                "ear.trustworthiness-vector": {
                     "instance_identity": TRUSTWORTHY_INSTANCE_CLAIM.value,
                     "configuration": APPROVED_CONFIG_CLAIM.value,
                     "executables": APPROVED_RUNTIME_CLAIM.value,
@@ -62,7 +62,7 @@ def test_attestation_result_to_dict(sample_attestation_result):
                     "storage_opaque": HW_KEYS_ENCRYPTED_SECRETS_CLAIM.value,
                     "sourced_data": TRUSTED_SOURCES_CLAIM.value,
                 },
-                "status": TRUST_TIER_AFFIRMING.value,
+                "ear.status": TRUST_TIER_AFFIRMING.value,
             }
         },
     }
@@ -77,12 +77,12 @@ def test_attestation_result_to_json(sample_attestation_result):
 
 def test_attestation_result_from_dict():
     data = {
-        "profile": "test_profile",
-        "issued_at": 1234567890,
-        "verifier_id": {"developer": "Acme Inc.", "build": "v1"},
+        "eat_profile": "test_profile",
+        "iat": 1234567890,
+        "ear.verifier-id": {"developer": "Acme Inc.", "build": "v1"},
         "submods": {
             "submod1": {
-                "trust_vector": {
+                "ear.trustworthiness-vector": {
                     "instance_identity": TRUSTWORTHY_INSTANCE_CLAIM.value,
                     "configuration": APPROVED_CONFIG_CLAIM.value,
                     "executables": APPROVED_RUNTIME_CLAIM.value,
@@ -92,7 +92,7 @@ def test_attestation_result_from_dict():
                     "storage_opaque": HW_KEYS_ENCRYPTED_SECRETS_CLAIM.value,
                     "sourced_data": TRUSTED_SOURCES_CLAIM.value,
                 },
-                "status": TRUST_TIER_AFFIRMING.value,
+                "ear.status": TRUST_TIER_AFFIRMING.value,
             }
         },
     }