Rename CCA_SSD to CCA

Signed-off-by: Yogesh Deshpande <[email protected]>
veraison · May 31, 2024 · 6af253a · 6af253a
1 parent 5c0df7f
commit 6af253a
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 74 deletions.
diff --git a/scheme/cca/evidence_handler.go b/scheme/cca/evidence_handler.go
@@ -169,7 +169,7 @@ func populateAttestationResult(
 		appraisal.TrustVector.StorageOpaque = ear.UnencryptedSecretsClaim
 	}
 
-	swComps := arm.FilterRefVal(endorsements, "CCA_SSD.sw-component")
+	swComps := arm.FilterRefVal(endorsements, "CCA.sw-component")
 	match := arm.MatchSoftware(SchemeName, claims, swComps)
 	if match {
 		appraisal.TrustVector.Executables = ear.ApprovedRuntimeClaim
@@ -180,7 +180,7 @@ func populateAttestationResult(
 		log.Debug("matchSoftware Failed")
 	}
 
-	platformConfig := arm.FilterRefVal(endorsements, "CCA_SSD.platform-config")
+	platformConfig := arm.FilterRefVal(endorsements, "CCA.platform-config")
 	match = arm.MatchPlatformConfig(SchemeName, claims, platformConfig)
 
 	if match {

diff --git a/scheme/cca/evidence_handler_test.go b/scheme/cca/evidence_handler_test.go
@@ -34,7 +34,7 @@ func Test_AppraiseEvidence_ok(t *testing.T) { // nolint: dupl
 	result, err := scheme.AppraiseEvidence(&ec, endorsemementsArray)
 	require.NoError(t, err)
 
-	attestation := result.Submods["CCA_SSD"]
+	attestation := result.Submods["CCA"]
 
 	assert.Equal(t, ear.TrustTierAffirming, *attestation.Status)
 	assert.Equal(t, attestation.TrustVector.Executables, ear.ApprovedRuntimeClaim)
@@ -60,7 +60,7 @@ func Test_AppraiseEvidence_mismatch_refval_meas(t *testing.T) { // nolint: dupl
 	result, err := scheme.AppraiseEvidence(&ec, endorsemementsArray)
 	require.NoError(t, err)
 
-	attestation := result.Submods["CCA_SSD"]
+	attestation := result.Submods["CCA"]
 
 	assert.Equal(t, ear.TrustTierWarning, *attestation.Status)
 	assert.Equal(t, attestation.TrustVector.Executables, ear.UnrecognizedRuntimeClaim)
@@ -86,7 +86,7 @@ func Test_AppraiseEvidence_mismatch_refval_cfg(t *testing.T) { // nolint: dupl
 	result, err := scheme.AppraiseEvidence(&ec, endorsemementsArray)
 	require.NoError(t, err)
 
-	attestation := result.Submods["CCA_SSD"]
+	attestation := result.Submods["CCA"]
 
 	assert.Equal(t, ear.TrustTierWarning, *attestation.Status)
 	assert.Equal(t, attestation.TrustVector.Executables, ear.ApprovedRuntimeClaim)

diff --git a/scheme/cca/scheme.go b/scheme/cca/scheme.go
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package cca
 
-const SchemeName = "CCA_SSD"
+const SchemeName = "CCA"
 
 var (
 	EndorsementMediaTypes = []string{

diff --git a/scheme/cca/store_handler_test.go b/scheme/cca/store_handler_test.go
@@ -36,7 +36,7 @@ func Test_GetTrustAnchorIDs_ok(t *testing.T) {
 		Nonce:    testNonce,
 	}
 
-	expectedTaID := []string{"CCA_SSD://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/AQICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC"}
+	expectedTaID := []string{"CCA://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/AQICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC"}
 
 	scheme := &StoreHandler{}
 
@@ -52,7 +52,7 @@ func Test_SynthKeysFromTrustAnchor_ok(t *testing.T) {
 	var endors handler.Endorsement
 	err = json.Unmarshal(endorsementsBytes, &endors)
 	require.NoError(t, err)
-	expectedKey := "CCA_SSD://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI"
+	expectedKey := "CCA://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI"
 
 	scheme := &StoreHandler{}
 	key_list, err := scheme.SynthKeysFromTrustAnchor("1", &endors)
@@ -68,7 +68,7 @@ func Test_SynthKeysFromRefValue_ok(t *testing.T) {
 	var endors handler.Endorsement
 	err = json.Unmarshal(endorsementsBytes, &endors)
 	require.NoError(t, err)
-	expectedKey := "CCA_SSD://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+	expectedKey := "CCA://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
 
 	scheme := &StoreHandler{}
 	key_list, err := scheme.SynthKeysFromRefValue("1", &endors)
@@ -80,8 +80,8 @@ func Test_GetReferenceIDs_ok(t *testing.T) {
 	var ta []string
 	var claims map[string]interface{}
 	expectedRefValID := []string{
-		"CCA_SSD://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=",
-		"CCA_SSD://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==",
+		"CCA://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=",
+		"CCA://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==",
 	}
 	evidenceBytes, err := os.ReadFile("test/extracted-claims.json")
 	require.NoError(t, err)

diff --git a/scheme/cca/test/endorsements.json b/scheme/cca/test/endorsements.json
@@ -1,7 +1,7 @@
 [
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"BL\",\"CCA_SSD.measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"3.4.2\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M1\",\"CCA_SSD.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M2\",\"CCA_SSD.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.3\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M3\",\"CCA_SSD.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.0.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.platform-config\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.platform-config-label\": \"platform-config-label\",\"CCA_SSD.platform-config-id\": \"AQID\"}}"
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"BL\",\"CCA.measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"3.4.2\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M1\",\"CCA.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M2\",\"CCA.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.3\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M3\",\"CCA.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.0.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.platform-config\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.platform-config-label\": \"platform-config-label\",\"CCA.platform-config-id\": \"AQID\"}}"
 ]
diff --git a/scheme/cca/test/invalid-key-ta-endorsements.json b/scheme/cca/test/invalid-key-ta-endorsements.json
@@ -1,11 +1,11 @@
 {
-    "scheme":"CCA_SSD",
+    "scheme":"CCA",
     "type":"VERIFICATION_KEY",
     "attributes":{
-        "CCA_SSD.hw-model":"RoadRunner",
-        "CCA_SSD.hw-vendor":"ACME",
-        "CCA_SSD.impl-id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
-        "CCA_SSD.iak-pub":"-----BEGIN PRIVATE KEY-----\nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEgvvRMqm1w5aHn7sVNA2QUJeOVcedUnmiug6VhU834gzS9k87crVwu9dz7uLOdoQl7fVF7b6J/6/g6Wu9RuJw8geWxEi5ja9G\np2TSdELm5u2E+M7IF+bsxqcdOj3n1n7N\n-----END PRIVATE KEY-----",
-        "CCA_SSD.inst-id":"Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI"
+        "CCA.hw-model":"RoadRunner",
+        "CCA.hw-vendor":"ACME",
+        "CCA.impl-id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+        "CCA.iak-pub":"-----BEGIN PRIVATE KEY-----\nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEgvvRMqm1w5aHn7sVNA2QUJeOVcedUnmiug6VhU834gzS9k87crVwu9dz7uLOdoQl7fVF7b6J/6/g6Wu9RuJw8geWxEi5ja9G\np2TSdELm5u2E+M7IF+bsxqcdOj3n1n7N\n-----END PRIVATE KEY-----",
+        "CCA.inst-id":"Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI"
     }
 }
diff --git a/scheme/cca/test/mismatch-cfg-endorsements.json b/scheme/cca/test/mismatch-cfg-endorsements.json
@@ -1,7 +1,7 @@
 [
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"BL\",\"CCA_SSD.measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"3.4.2\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M1\",\"CCA_SSD.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M2\",\"CCA_SSD.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.3\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M3\",\"CCA_SSD.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.0.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.platform-config\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.platform-config-label\": \"platform-config-label\",\"CCA_SSD.platform-config-id\": \"ACID\"}}"
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"BL\",\"CCA.measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"3.4.2\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M1\",\"CCA.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M2\",\"CCA.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.3\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M3\",\"CCA.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.0.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.platform-config\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.platform-config-label\": \"platform-config-label\",\"CCA.platform-config-id\": \"ACID\"}}"
 ]
diff --git a/scheme/cca/test/mismatch-refval-endorsements.json b/scheme/cca/test/mismatch-refval-endorsements.json
@@ -1,7 +1,7 @@
 [
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"BL\",\"CCA_SSD.measurement-value\":\"AwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"3.4.2\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M1\",\"CCA_SSD.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M2\",\"CCA_SSD.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.2.3\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.sw-component\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.measurement-desc\":\"sha-256\",\"CCA_SSD.measurement-type\":\"M3\",\"CCA_SSD.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA_SSD.version\":\"1.0.0\"}}",
-"{\"scheme\":\"CCA_SSD\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA_SSD.platform-config\",\"attributes\":{\"CCA_SSD.hw-model\":\"RoadRunner\",\"CCA_SSD.hw-vendor\":\"ACME\",\"CCA_SSD.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA_SSD.platform-config-label\": \"platform-config-label\",\"CCA_SSD.platform-config-id\": \"AQID\"}}"
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"BL\",\"CCA.measurement-value\":\"AwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"3.4.2\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M1\",\"CCA.measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M2\",\"CCA.measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.2.3\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.sw-component\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.measurement-desc\":\"sha-256\",\"CCA.measurement-type\":\"M3\",\"CCA.measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"CCA.version\":\"1.0.0\"}}",
+"{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"CCA.platform-config\",\"attributes\":{\"CCA.hw-model\":\"RoadRunner\",\"CCA.hw-vendor\":\"ACME\",\"CCA.impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"CCA.platform-config-label\": \"platform-config-label\",\"CCA.platform-config-id\": \"AQID\"}}"
 ]