From 1a49868ac8186eb3ebae13e91f522110b9aae839 Mon Sep 17 00:00:00 2001 From: Kallal Mukherjee Date: Fri, 3 Oct 2025 16:43:53 +0000 Subject: [PATCH 1/3] fix: rename ARM_CCA scheme to CCA for consistency - Renamed directory from scheme/arm-cca to scheme/cca - Updated scheme name from ARM_CCA to CCA - Updated all package names from arm_cca to cca - Updated all import paths and references - Updated plugin names and binaries - Updated test data and integration tests - Updated documentation and README files This addresses the consistency feedback from PR reviewer that CCA scheme should not have vendor prefix like other schemes. Signed-off-by: Kallal Mukherjee --- builtin/schemes.gen.go | 2 +- deployments/rpm/veraison-services.spec.template | 2 +- .../data/results/cca.freshness-fail.json | 4 ++-- integration-tests/data/results/cca.good.json | 4 ++-- .../tests/test_cca_verify_challenge.tavern.yaml | 4 ++-- scheme/Makefile | 2 +- scheme/README.md | 2 +- scheme/arm-cca/test/platform/endorsements.json | 7 ------- .../test/platform/mismatch-cfg-endorsements.json | 7 ------- .../platform/mismatch-refval-endorsements.json | 7 ------- .../arm-cca/test/platform/mult-endorsements.json | 5 ----- scheme/arm-cca/test/realm/match-endorsements.json | 8 -------- .../arm-cca/test/realm/no-realm-endorsements.json | 7 ------- .../arm-cca/test/realm/no-rem-endorsements.json | 8 -------- .../arm-cca/test/realm/no-rpv-endorsements.json | 8 -------- .../test/realm/rim-mismatch-endorsements.json | 8 -------- scheme/{arm-cca => cca}/Makefile | 2 +- scheme/{arm-cca => cca}/README.md | 12 ++++++------ scheme/{arm-cca => cca}/corim_extractor.go | 4 ++-- scheme/{arm-cca => cca}/endorsement_handler.go | 4 ++-- .../{arm-cca => cca}/endorsement_handler_test.go | 4 ++-- scheme/{arm-cca => cca}/evidence_handler.go | 2 +- scheme/{arm-cca => cca}/evidence_handler_test.go | 4 ++-- scheme/{arm-cca => cca}/platform.go | 4 ++-- scheme/{arm-cca => cca}/plugin/Makefile | 0 scheme/{arm-cca => cca}/plugin/combined/Makefile | 4 ++-- scheme/{arm-cca => cca}/plugin/combined/main.go | 2 +- .../plugin/endorsement-handler}/Makefile | 4 ++-- .../plugin/endorsement-handler/main.go | 2 +- .../plugin/evidence-handler}/Makefile | 4 ++-- .../plugin/evidence-handler/main.go | 2 +- .../plugin/store-handler/Makefile | 7 ++++--- .../{arm-cca => cca}/plugin/store-handler/main.go | 2 +- scheme/{arm-cca => cca}/realm.go | 4 ++-- scheme/{arm-cca => cca}/scheme.go | 4 ++-- scheme/{arm-cca => cca}/store_handler.go | 4 ++-- scheme/{arm-cca => cca}/store_handler_test.go | 14 +++++++------- .../test/corim/build-test-vectors.sh | 0 .../test/corim/src/comidCcaRealm.json | 0 .../test/corim/src/comidCcaRealmInvalidClass.json | 0 .../corim/src/comidCcaRealmInvalidInstance.json | 0 .../test/corim/src/comidCcaRealmNoClass.json | 0 .../test/corim/src/comidCcaRealmNoInstance.json | 0 .../test/corim/src/comidCcaRefValFour.json | 0 .../test/corim/src/comidCcaRefValOne.json | 0 .../{arm-cca => cca}/test/corim/src/corimCca.json | 0 .../test/corim/src/corimCcaNoProfile.json | 0 .../test/corim/src/corimCcaRealm.json | 0 .../corim/unsignedCorimCcaComidCcaRefValFour.cbor | Bin .../corim/unsignedCorimCcaComidCcaRefValOne.cbor | Bin ...signedCorimCcaNoProfileComidCcaRefValFour.cbor | Bin ...nsignedCorimCcaNoProfileComidCcaRefValOne.cbor | Bin .../corim/unsignedCorimCcaRealmComidCcaRealm.cbor | Bin ...nedCorimCcaRealmComidCcaRealmInvalidClass.cbor | Bin ...CorimCcaRealmComidCcaRealmInvalidInstance.cbor | Bin ...unsignedCorimCcaRealmComidCcaRealmNoClass.cbor | Bin ...ignedCorimCcaRealmComidCcaRealmNoInstance.cbor | Bin .../{arm-cca => cca}/test/evidence/cca-token.cbor | Bin .../{arm-cca => cca}/test/evidence/cca-token.json | 0 .../test/evidence/extracted-claims.json | 0 .../{arm-cca => cca}/test/evidence/extracted.json | 0 scheme/cca/test/platform/endorsements.json | 7 +++++++ .../platform/invalid-key-ta-endorsements.json | 2 +- .../test/platform/mismatch-cfg-endorsements.json | 7 +++++++ .../platform/mismatch-refval-endorsements.json | 7 +++++++ scheme/cca/test/platform/mult-endorsements.json | 5 +++++ .../test/platform/refval-endorsements.json | 2 +- .../test/platform/ta-endorsements.json | 2 +- .../test/platform/ta-integ-endorsements.json | 2 +- scheme/cca/test/realm/match-endorsements.json | 8 ++++++++ scheme/cca/test/realm/no-realm-endorsements.json | 7 +++++++ scheme/cca/test/realm/no-rem-endorsements.json | 8 ++++++++ scheme/cca/test/realm/no-rpv-endorsements.json | 8 ++++++++ .../cca/test/realm/rim-mismatch-endorsements.json | 8 ++++++++ scheme/{arm-cca => cca}/test_vectors.go | 5 ++--- 75 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 scheme/arm-cca/test/platform/endorsements.json delete mode 100644 scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json delete mode 100644 scheme/arm-cca/test/platform/mismatch-refval-endorsements.json delete mode 100644 scheme/arm-cca/test/platform/mult-endorsements.json delete mode 100644 scheme/arm-cca/test/realm/match-endorsements.json delete mode 100644 scheme/arm-cca/test/realm/no-realm-endorsements.json delete mode 100644 scheme/arm-cca/test/realm/no-rem-endorsements.json delete mode 100644 scheme/arm-cca/test/realm/no-rpv-endorsements.json delete mode 100644 scheme/arm-cca/test/realm/rim-mismatch-endorsements.json rename scheme/{arm-cca => cca}/Makefile (84%) rename scheme/{arm-cca => cca}/README.md (88%) rename scheme/{arm-cca => cca}/corim_extractor.go (94%) rename scheme/{arm-cca => cca}/endorsement_handler.go (93%) rename scheme/{arm-cca => cca}/endorsement_handler_test.go (97%) rename scheme/{arm-cca => cca}/evidence_handler.go (99%) rename scheme/{arm-cca => cca}/evidence_handler_test.go (98%) rename scheme/{arm-cca => cca}/platform.go (96%) rename scheme/{arm-cca => cca}/plugin/Makefile (100%) rename scheme/{arm-cca => cca}/plugin/combined/Makefile (72%) rename scheme/{arm-cca => cca}/plugin/combined/main.go (88%) rename scheme/{arm-cca/plugin/evidence-handler => cca/plugin/endorsement-handler}/Makefile (69%) rename scheme/{arm-cca => cca}/plugin/endorsement-handler/main.go (84%) rename scheme/{arm-cca/plugin/endorsement-handler => cca/plugin/evidence-handler}/Makefile (68%) rename scheme/{arm-cca => cca}/plugin/evidence-handler/main.go (84%) rename scheme/{arm-cca => cca}/plugin/store-handler/Makefile (51%) rename scheme/{arm-cca => cca}/plugin/store-handler/main.go (84%) rename scheme/{arm-cca => cca}/realm.go (98%) rename scheme/{arm-cca => cca}/scheme.go (92%) rename scheme/{arm-cca => cca}/store_handler.go (97%) rename scheme/{arm-cca => cca}/store_handler_test.go (80%) rename scheme/{arm-cca => cca}/test/corim/build-test-vectors.sh (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRealm.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRealmInvalidClass.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRealmInvalidInstance.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRealmNoClass.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRealmNoInstance.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRefValFour.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/comidCcaRefValOne.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/corimCca.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/corimCcaNoProfile.json (100%) rename scheme/{arm-cca => cca}/test/corim/src/corimCcaRealm.json (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor (100%) rename scheme/{arm-cca => cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor (100%) rename scheme/{arm-cca => cca}/test/evidence/cca-token.cbor (100%) rename scheme/{arm-cca => cca}/test/evidence/cca-token.json (100%) rename scheme/{arm-cca => cca}/test/evidence/extracted-claims.json (100%) rename scheme/{arm-cca => cca}/test/evidence/extracted.json (100%) create mode 100644 scheme/cca/test/platform/endorsements.json rename scheme/{arm-cca => cca}/test/platform/invalid-key-ta-endorsements.json (95%) create mode 100644 scheme/cca/test/platform/mismatch-cfg-endorsements.json create mode 100644 scheme/cca/test/platform/mismatch-refval-endorsements.json create mode 100644 scheme/cca/test/platform/mult-endorsements.json rename scheme/{arm-cca => cca}/test/platform/refval-endorsements.json (92%) rename scheme/{arm-cca => cca}/test/platform/ta-endorsements.json (94%) rename scheme/{arm-cca => cca}/test/platform/ta-integ-endorsements.json (95%) create mode 100644 scheme/cca/test/realm/match-endorsements.json create mode 100644 scheme/cca/test/realm/no-realm-endorsements.json create mode 100644 scheme/cca/test/realm/no-rem-endorsements.json create mode 100644 scheme/cca/test/realm/no-rpv-endorsements.json create mode 100644 scheme/cca/test/realm/rim-mismatch-endorsements.json rename scheme/{arm-cca => cca}/test_vectors.go (89%) diff --git a/builtin/schemes.gen.go b/builtin/schemes.gen.go index b9ba786e..12fcad4a 100644 --- a/builtin/schemes.gen.go +++ b/builtin/schemes.gen.go @@ -5,7 +5,7 @@ import ( scheme1 "github.com/veraison/services/scheme/parsec-cca" scheme2 "github.com/veraison/services/scheme/riot" - scheme3 "github.com/veraison/services/scheme/arm-cca" + scheme3 "github.com/veraison/services/scheme/cca" scheme4 "github.com/veraison/services/scheme/tpm-enacttrust" scheme5 "github.com/veraison/services/scheme/parsec-tpm" scheme6 "github.com/veraison/services/scheme/psa-iot" diff --git a/deployments/rpm/veraison-services.spec.template b/deployments/rpm/veraison-services.spec.template index a0ffac90..72a837b0 100644 --- a/deployments/rpm/veraison-services.spec.template +++ b/deployments/rpm/veraison-services.spec.template @@ -88,7 +88,7 @@ cp -a $DEPLOYMENT_DEST/* %{buildroot}/ %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/evcli %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/pocli %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/veraison -%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/arm-cca.plugin +%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/cca.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-cca.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-tpm.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/psa.plugin diff --git a/integration-tests/data/results/cca.freshness-fail.json b/integration-tests/data/results/cca.freshness-fail.json index 6152af86..7b3e95c5 100644 --- a/integration-tests/data/results/cca.freshness-fail.json +++ b/integration-tests/data/results/cca.freshness-fail.json @@ -1,6 +1,6 @@ { - "ARM_CCA": { - "ear.appraisal-policy-id": "policy:ARM_CCA", + "CCA": { + "ear.appraisal-policy-id": "policy:CCA", "ear.status": "contraindicated", "ear.trustworthiness-vector": { "configuration": 99, diff --git a/integration-tests/data/results/cca.good.json b/integration-tests/data/results/cca.good.json index d2c4b3be..70a8703c 100644 --- a/integration-tests/data/results/cca.good.json +++ b/integration-tests/data/results/cca.good.json @@ -11,7 +11,7 @@ "sourced-data": 0, "storage-opaque": 2 }, - "ear.appraisal-policy-id": "policy:ARM_CCA", + "ear.appraisal-policy-id": "policy:CCA", "ear.veraison.annotated-evidence": { "cca-platform-challenge": "Bea1iETGoM0ZOCBpuv2w5JRmKjrc+P3hFHjpM5Ua8XkP9d5ceOPbESPaCiB6i2ZVbgoi8Z7mS9wviZU7azJVXw==", "cca-platform-config": "AQID", @@ -50,7 +50,7 @@ } }, "CCA_REALM": { - "ear.appraisal-policy-id": "policy:ARM_CCA", + "ear.appraisal-policy-id": "policy:CCA", "ear.status": "warning", "ear.trustworthiness-vector": { "configuration": 0, diff --git a/integration-tests/tests/test_cca_verify_challenge.tavern.yaml b/integration-tests/tests/test_cca_verify_challenge.tavern.yaml index df36c46a..59279181 100644 --- a/integration-tests/tests/test_cca_verify_challenge.tavern.yaml +++ b/integration-tests/tests/test_cca_verify_challenge.tavern.yaml @@ -43,7 +43,7 @@ stages: - name: submit cca policy request: method: POST - url: https://{management-service}/management/v1/policy/ARM_CCA + url: https://{management-service}/management/v1/policy/CCA headers: content-type: application/vnd.veraison.policy.opa accept: application/vnd.veraison.policy+json @@ -58,7 +58,7 @@ stages: - name: activate cca policy request: method: POST - url: https://{management-service}/management/v1/policy/ARM_CCA/{policy-uuid}/activate + url: https://{management-service}/management/v1/policy/CCA/{policy-uuid}/activate headers: authorization: '{alt-authorization}' # set via hook response: diff --git a/scheme/Makefile b/scheme/Makefile index c3336e19..c06acc38 100644 --- a/scheme/Makefile +++ b/scheme/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 SUBDIR := common -SUBDIR += arm-cca +SUBDIR += cca SUBDIR += riot SUBDIR += psa-iot SUBDIR += tpm-enacttrust diff --git a/scheme/README.md b/scheme/README.md index 79c86fc3..878bbcf8 100644 --- a/scheme/README.md +++ b/scheme/README.md @@ -12,7 +12,7 @@ schemes. Currently the following schemes are implemented: -- `arm-cca` Arm Confidential Compute Architecture attestation. +- `cca` Confidential Compute Architecture attestation. - `psa-iot`: Arm Platform Security Architecture attestation. - `riot`: [RIoT based DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible attestation (note: this does not implement any specific DICE architecture). diff --git a/scheme/arm-cca/test/platform/endorsements.json b/scheme/arm-cca/test/platform/endorsements.json deleted file mode 100644 index 668c7519..00000000 --- a/scheme/arm-cca/test/platform/endorsements.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" -] diff --git a/scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json b/scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json deleted file mode 100644 index daf117b4..00000000 --- a/scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"ACID\"}}" -] diff --git a/scheme/arm-cca/test/platform/mismatch-refval-endorsements.json b/scheme/arm-cca/test/platform/mismatch-refval-endorsements.json deleted file mode 100644 index a67df936..00000000 --- a/scheme/arm-cca/test/platform/mismatch-refval-endorsements.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"AwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" -] diff --git a/scheme/arm-cca/test/platform/mult-endorsements.json b/scheme/arm-cca/test/platform/mult-endorsements.json deleted file mode 100644 index 60fc23d7..00000000 --- a/scheme/arm-cca/test/platform/mult-endorsements.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "{\n\"scheme\":\"ARM_CCA\",\n\"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n\"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"BL\",\n \"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"3.4.2\"\n }\n }", - "\n{\n \"scheme\":\"ARM_CCA\",\n \"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n \"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"M1\",\n \"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"1.2.0\"}\n }\n ", - "\n {\n \"scheme\":\"ARM_CCA\",\n \"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n, \"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"M2\",\n \"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"1.2.3\"}\n }\n " -] \ No newline at end of file diff --git a/scheme/arm-cca/test/realm/match-endorsements.json b/scheme/arm-cca/test/realm/match-endorsements.json deleted file mode 100644 index 75332a7f..00000000 --- a/scheme/arm-cca/test/realm/match-endorsements.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\",\"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\",\"rem0\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem1\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem2\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem3\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\"}}" -] diff --git a/scheme/arm-cca/test/realm/no-realm-endorsements.json b/scheme/arm-cca/test/realm/no-realm-endorsements.json deleted file mode 100644 index ad07b473..00000000 --- a/scheme/arm-cca/test/realm/no-realm-endorsements.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" -] diff --git a/scheme/arm-cca/test/realm/no-rem-endorsements.json b/scheme/arm-cca/test/realm/no-rem-endorsements.json deleted file mode 100644 index e1162997..00000000 --- a/scheme/arm-cca/test/realm/no-rem-endorsements.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform.config-id\": \"AQID\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"}}" -] diff --git a/scheme/arm-cca/test/realm/no-rpv-endorsements.json b/scheme/arm-cca/test/realm/no-rpv-endorsements.json deleted file mode 100644 index 90ca9290..00000000 --- a/scheme/arm-cca/test/realm/no-rpv-endorsements.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform.config-id\": \"AQID\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"rem0\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem1\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem2\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem3\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\"}}" -] diff --git a/scheme/arm-cca/test/realm/rim-mismatch-endorsements.json b/scheme/arm-cca/test/realm/rim-mismatch-endorsements.json deleted file mode 100644 index b5994de2..00000000 --- a/scheme/arm-cca/test/realm/rim-mismatch-endorsements.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", - "{\"scheme\":\"ARM_CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}", - "{\"scheme\":\"ARM_CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQq==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\",\"rem0\": \"AQID\",\"rem1\": \"AQID\",\"rem2\": \"AQID\",\"rem3\": \"AQID\"}}" -] diff --git a/scheme/arm-cca/Makefile b/scheme/cca/Makefile similarity index 84% rename from scheme/arm-cca/Makefile rename to scheme/cca/Makefile index 5e974738..891a9939 100644 --- a/scheme/arm-cca/Makefile +++ b/scheme/cca/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 .DEFAULT_GOAL := test -GOPKG := github.com/veraison/services/scheme/arm-cca +GOPKG := github.com/veraison/services/scheme/cca SRCS := $(wildcard *.go) SUBDIR += plugin diff --git a/scheme/arm-cca/README.md b/scheme/cca/README.md similarity index 88% rename from scheme/arm-cca/README.md rename to scheme/cca/README.md index 4b59035e..6d4f1f7a 100644 --- a/scheme/arm-cca/README.md +++ b/scheme/cca/README.md @@ -1,6 +1,6 @@ -This directory contains packages implementing `arm-cca` (Arm Confidential Compute Architecture) attestation scheme. +This directory contains packages implementing `cca` (Confidential Compute Architecture) attestation scheme. -Arm CCA attestation scheme is a composite attestation scheme which comprises a CCA Platform Attestation & a Realm Attestation. +CCA attestation scheme is a composite attestation scheme which comprises a CCA Platform Attestation & a Realm Attestation. Endorsement Store Interface for the CCA Platform and Realm Attestation Scheme is given below. @@ -11,7 +11,7 @@ Endorsement Store Interface for the CCA Platform and Realm Attestation Scheme is #### Reference Value ```json { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "reference value", "subType": "platform.sw-component", "attributes": { @@ -26,7 +26,7 @@ Endorsement Store Interface for the CCA Platform and Realm Attestation Scheme is } } { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "reference value", "subType": "platform.config", "attributes": { @@ -42,7 +42,7 @@ Endorsement Store Interface for the CCA Platform and Realm Attestation Scheme is #### Trust Anchor ```json { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "trust anchor", "attributes": { "hw-model": "RoadRunner", @@ -62,7 +62,7 @@ A Realm instance is uniquely identified by the values of Realm initial measureme ```json { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "REFERENCE_VALUE", "subType": "realm.reference-value", "attributes": { diff --git a/scheme/arm-cca/corim_extractor.go b/scheme/cca/corim_extractor.go similarity index 94% rename from scheme/arm-cca/corim_extractor.go rename to scheme/cca/corim_extractor.go index 3b40f875..d1ee9524 100644 --- a/scheme/arm-cca/corim_extractor.go +++ b/scheme/cca/corim_extractor.go @@ -1,6 +1,6 @@ -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "fmt" diff --git a/scheme/arm-cca/endorsement_handler.go b/scheme/cca/endorsement_handler.go similarity index 93% rename from scheme/arm-cca/endorsement_handler.go rename to scheme/cca/endorsement_handler.go index 0d8676e6..882f9f10 100644 --- a/scheme/arm-cca/endorsement_handler.go +++ b/scheme/cca/endorsement_handler.go @@ -1,6 +1,6 @@ -// Copyright 2022-2025 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "mime" diff --git a/scheme/arm-cca/endorsement_handler_test.go b/scheme/cca/endorsement_handler_test.go similarity index 97% rename from scheme/arm-cca/endorsement_handler_test.go rename to scheme/cca/endorsement_handler_test.go index 21d62359..1a5f106d 100644 --- a/scheme/arm-cca/endorsement_handler_test.go +++ b/scheme/cca/endorsement_handler_test.go @@ -1,6 +1,6 @@ -// Copyright 2022-2025 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "testing" diff --git a/scheme/arm-cca/evidence_handler.go b/scheme/cca/evidence_handler.go similarity index 99% rename from scheme/arm-cca/evidence_handler.go rename to scheme/cca/evidence_handler.go index 0df93b71..7b9374dd 100644 --- a/scheme/arm-cca/evidence_handler.go +++ b/scheme/cca/evidence_handler.go @@ -1,7 +1,7 @@ // Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "bytes" diff --git a/scheme/arm-cca/evidence_handler_test.go b/scheme/cca/evidence_handler_test.go similarity index 98% rename from scheme/arm-cca/evidence_handler_test.go rename to scheme/cca/evidence_handler_test.go index f37e4b98..5cb35cbb 100644 --- a/scheme/arm-cca/evidence_handler_test.go +++ b/scheme/cca/evidence_handler_test.go @@ -1,7 +1,7 @@ -// Copyright 2022-2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "encoding/json" diff --git a/scheme/arm-cca/platform.go b/scheme/cca/platform.go similarity index 96% rename from scheme/arm-cca/platform.go rename to scheme/cca/platform.go index 03df32f5..37efb5f6 100644 --- a/scheme/arm-cca/platform.go +++ b/scheme/cca/platform.go @@ -1,7 +1,7 @@ -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "fmt" diff --git a/scheme/arm-cca/plugin/Makefile b/scheme/cca/plugin/Makefile similarity index 100% rename from scheme/arm-cca/plugin/Makefile rename to scheme/cca/plugin/Makefile diff --git a/scheme/arm-cca/plugin/combined/Makefile b/scheme/cca/plugin/combined/Makefile similarity index 72% rename from scheme/arm-cca/plugin/combined/Makefile rename to scheme/cca/plugin/combined/Makefile index ec6dd9bc..87b5ea7b 100644 --- a/scheme/arm-cca/plugin/combined/Makefile +++ b/scheme/cca/plugin/combined/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/arm-cca.plugin -GOPKG := github.com/veraison/services/scheme/arm-cca +PLUGIN := ../../../bin/cca.plugin +GOPKG := github.com/veraison/services/scheme/cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/arm-cca/plugin/combined/main.go b/scheme/cca/plugin/combined/main.go similarity index 88% rename from scheme/arm-cca/plugin/combined/main.go rename to scheme/cca/plugin/combined/main.go index b3edf9ae..b9841b9a 100644 --- a/scheme/arm-cca/plugin/combined/main.go +++ b/scheme/cca/plugin/combined/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/arm-cca" + scheme "github.com/veraison/services/scheme/cca" ) func main() { diff --git a/scheme/arm-cca/plugin/evidence-handler/Makefile b/scheme/cca/plugin/endorsement-handler/Makefile similarity index 69% rename from scheme/arm-cca/plugin/evidence-handler/Makefile rename to scheme/cca/plugin/endorsement-handler/Makefile index 337da3f0..7a68f1ef 100644 --- a/scheme/arm-cca/plugin/evidence-handler/Makefile +++ b/scheme/cca/plugin/endorsement-handler/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/arm-cca-evidence-handler.plugin -GOPKG := github.com/veraison/services/scheme/arm-cca +PLUGIN := ../../../bin/cca-endorsement-handler.plugin +GOPKG := github.com/veraison/services/scheme/cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/arm-cca/plugin/endorsement-handler/main.go b/scheme/cca/plugin/endorsement-handler/main.go similarity index 84% rename from scheme/arm-cca/plugin/endorsement-handler/main.go rename to scheme/cca/plugin/endorsement-handler/main.go index 3520cd06..2767b919 100644 --- a/scheme/arm-cca/plugin/endorsement-handler/main.go +++ b/scheme/cca/plugin/endorsement-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/arm-cca" + scheme "github.com/veraison/services/scheme/cca" ) func main() { diff --git a/scheme/arm-cca/plugin/endorsement-handler/Makefile b/scheme/cca/plugin/evidence-handler/Makefile similarity index 68% rename from scheme/arm-cca/plugin/endorsement-handler/Makefile rename to scheme/cca/plugin/evidence-handler/Makefile index d319feaa..9c89a9b5 100644 --- a/scheme/arm-cca/plugin/endorsement-handler/Makefile +++ b/scheme/cca/plugin/evidence-handler/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/arm-cca-endorsement-handler.plugin -GOPKG := github.com/veraison/services/scheme/arm-cca +PLUGIN := ../../../bin/cca-evidence-handler.plugin +GOPKG := github.com/veraison/services/scheme/cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/arm-cca/plugin/evidence-handler/main.go b/scheme/cca/plugin/evidence-handler/main.go similarity index 84% rename from scheme/arm-cca/plugin/evidence-handler/main.go rename to scheme/cca/plugin/evidence-handler/main.go index 9669bebb..5ee2e266 100644 --- a/scheme/arm-cca/plugin/evidence-handler/main.go +++ b/scheme/cca/plugin/evidence-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/arm-cca" + scheme "github.com/veraison/services/scheme/cca" ) func main() { diff --git a/scheme/arm-cca/plugin/store-handler/Makefile b/scheme/cca/plugin/store-handler/Makefile similarity index 51% rename from scheme/arm-cca/plugin/store-handler/Makefile rename to scheme/cca/plugin/store-handler/Makefile index c31926f7..17ec1b51 100644 --- a/scheme/arm-cca/plugin/store-handler/Makefile +++ b/scheme/cca/plugin/store-handler/Makefile @@ -1,8 +1,9 @@ -# Copyright 2024 Contributors to the Veraison project. +# Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/arm-cca-store-handler.plugin -GOPKG := github.com/veraison/services/scheme/arm-cca +PLUGIN := ../../../bin/cca-store-handler.plugin +GOPKG := github.com/veraison/services/scheme/cca +SRCS := main.go SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/arm-cca/plugin/store-handler/main.go b/scheme/cca/plugin/store-handler/main.go similarity index 84% rename from scheme/arm-cca/plugin/store-handler/main.go rename to scheme/cca/plugin/store-handler/main.go index 1cbf2d6e..4712df55 100644 --- a/scheme/arm-cca/plugin/store-handler/main.go +++ b/scheme/cca/plugin/store-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/arm-cca" + scheme "github.com/veraison/services/scheme/cca" ) func main() { diff --git a/scheme/arm-cca/realm.go b/scheme/cca/realm.go similarity index 98% rename from scheme/arm-cca/realm.go rename to scheme/cca/realm.go index f29ee373..b3fc831f 100644 --- a/scheme/arm-cca/realm.go +++ b/scheme/cca/realm.go @@ -1,7 +1,7 @@ -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "bytes" diff --git a/scheme/arm-cca/scheme.go b/scheme/cca/scheme.go similarity index 92% rename from scheme/arm-cca/scheme.go rename to scheme/cca/scheme.go index 6e4c65a5..58e55c95 100644 --- a/scheme/arm-cca/scheme.go +++ b/scheme/cca/scheme.go @@ -1,8 +1,8 @@ // Copyright 2024-2025 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca -const SchemeName = "ARM_CCA" +const SchemeName = "CCA" var ( EndorsementMediaTypes = []string{ diff --git a/scheme/arm-cca/store_handler.go b/scheme/cca/store_handler.go similarity index 97% rename from scheme/arm-cca/store_handler.go rename to scheme/cca/store_handler.go index 537a4fbf..de156c2e 100644 --- a/scheme/arm-cca/store_handler.go +++ b/scheme/cca/store_handler.go @@ -1,7 +1,7 @@ -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "fmt" diff --git a/scheme/arm-cca/store_handler_test.go b/scheme/cca/store_handler_test.go similarity index 80% rename from scheme/arm-cca/store_handler_test.go rename to scheme/cca/store_handler_test.go index 4ccb6821..65b811a5 100644 --- a/scheme/arm-cca/store_handler_test.go +++ b/scheme/cca/store_handler_test.go @@ -1,7 +1,7 @@ -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import ( "encoding/json" @@ -36,7 +36,7 @@ func Test_GetTrustAnchorIDs_ok(t *testing.T) { Nonce: testNonce, } - expectedTaID := []string{"ARM_CCA://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 := "ARM_CCA://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 := "ARM_CCA://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{ - "ARM_CCA://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=", - "ARM_CCA://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==", + "CCA://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=", + "CCA://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==", } evidenceBytes, err := os.ReadFile("test/evidence/extracted-claims.json") require.NoError(t, err) diff --git a/scheme/arm-cca/test/corim/build-test-vectors.sh b/scheme/cca/test/corim/build-test-vectors.sh similarity index 100% rename from scheme/arm-cca/test/corim/build-test-vectors.sh rename to scheme/cca/test/corim/build-test-vectors.sh diff --git a/scheme/arm-cca/test/corim/src/comidCcaRealm.json b/scheme/cca/test/corim/src/comidCcaRealm.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRealm.json rename to scheme/cca/test/corim/src/comidCcaRealm.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRealmInvalidClass.json b/scheme/cca/test/corim/src/comidCcaRealmInvalidClass.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRealmInvalidClass.json rename to scheme/cca/test/corim/src/comidCcaRealmInvalidClass.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRealmInvalidInstance.json b/scheme/cca/test/corim/src/comidCcaRealmInvalidInstance.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRealmInvalidInstance.json rename to scheme/cca/test/corim/src/comidCcaRealmInvalidInstance.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRealmNoClass.json b/scheme/cca/test/corim/src/comidCcaRealmNoClass.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRealmNoClass.json rename to scheme/cca/test/corim/src/comidCcaRealmNoClass.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRealmNoInstance.json b/scheme/cca/test/corim/src/comidCcaRealmNoInstance.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRealmNoInstance.json rename to scheme/cca/test/corim/src/comidCcaRealmNoInstance.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRefValFour.json b/scheme/cca/test/corim/src/comidCcaRefValFour.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRefValFour.json rename to scheme/cca/test/corim/src/comidCcaRefValFour.json diff --git a/scheme/arm-cca/test/corim/src/comidCcaRefValOne.json b/scheme/cca/test/corim/src/comidCcaRefValOne.json similarity index 100% rename from scheme/arm-cca/test/corim/src/comidCcaRefValOne.json rename to scheme/cca/test/corim/src/comidCcaRefValOne.json diff --git a/scheme/arm-cca/test/corim/src/corimCca.json b/scheme/cca/test/corim/src/corimCca.json similarity index 100% rename from scheme/arm-cca/test/corim/src/corimCca.json rename to scheme/cca/test/corim/src/corimCca.json diff --git a/scheme/arm-cca/test/corim/src/corimCcaNoProfile.json b/scheme/cca/test/corim/src/corimCcaNoProfile.json similarity index 100% rename from scheme/arm-cca/test/corim/src/corimCcaNoProfile.json rename to scheme/cca/test/corim/src/corimCcaNoProfile.json diff --git a/scheme/arm-cca/test/corim/src/corimCcaRealm.json b/scheme/cca/test/corim/src/corimCcaRealm.json similarity index 100% rename from scheme/arm-cca/test/corim/src/corimCcaRealm.json rename to scheme/cca/test/corim/src/corimCcaRealm.json diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor b/scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor rename to scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor b/scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor rename to scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor b/scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor rename to scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor b/scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor rename to scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor b/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor rename to scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor b/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor rename to scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor b/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor rename to scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor b/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor rename to scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor diff --git a/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor b/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor similarity index 100% rename from scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor rename to scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor diff --git a/scheme/arm-cca/test/evidence/cca-token.cbor b/scheme/cca/test/evidence/cca-token.cbor similarity index 100% rename from scheme/arm-cca/test/evidence/cca-token.cbor rename to scheme/cca/test/evidence/cca-token.cbor diff --git a/scheme/arm-cca/test/evidence/cca-token.json b/scheme/cca/test/evidence/cca-token.json similarity index 100% rename from scheme/arm-cca/test/evidence/cca-token.json rename to scheme/cca/test/evidence/cca-token.json diff --git a/scheme/arm-cca/test/evidence/extracted-claims.json b/scheme/cca/test/evidence/extracted-claims.json similarity index 100% rename from scheme/arm-cca/test/evidence/extracted-claims.json rename to scheme/cca/test/evidence/extracted-claims.json diff --git a/scheme/arm-cca/test/evidence/extracted.json b/scheme/cca/test/evidence/extracted.json similarity index 100% rename from scheme/arm-cca/test/evidence/extracted.json rename to scheme/cca/test/evidence/extracted.json diff --git a/scheme/cca/test/platform/endorsements.json b/scheme/cca/test/platform/endorsements.json new file mode 100644 index 00000000..fc1a971e --- /dev/null +++ b/scheme/cca/test/platform/endorsements.json @@ -0,0 +1,7 @@ +[ + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" +] diff --git a/scheme/arm-cca/test/platform/invalid-key-ta-endorsements.json b/scheme/cca/test/platform/invalid-key-ta-endorsements.json similarity index 95% rename from scheme/arm-cca/test/platform/invalid-key-ta-endorsements.json rename to scheme/cca/test/platform/invalid-key-ta-endorsements.json index 1515bb30..2ce97658 100644 --- a/scheme/arm-cca/test/platform/invalid-key-ta-endorsements.json +++ b/scheme/cca/test/platform/invalid-key-ta-endorsements.json @@ -1,5 +1,5 @@ { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "VERIFICATION_KEY", "attributes": { "hw-model": "RoadRunner", diff --git a/scheme/cca/test/platform/mismatch-cfg-endorsements.json b/scheme/cca/test/platform/mismatch-cfg-endorsements.json new file mode 100644 index 00000000..d5f0b593 --- /dev/null +++ b/scheme/cca/test/platform/mismatch-cfg-endorsements.json @@ -0,0 +1,7 @@ +[ + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"ACID\"}}" +] diff --git a/scheme/cca/test/platform/mismatch-refval-endorsements.json b/scheme/cca/test/platform/mismatch-refval-endorsements.json new file mode 100644 index 00000000..ed80ca76 --- /dev/null +++ b/scheme/cca/test/platform/mismatch-refval-endorsements.json @@ -0,0 +1,7 @@ +[ + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"AwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" +] diff --git a/scheme/cca/test/platform/mult-endorsements.json b/scheme/cca/test/platform/mult-endorsements.json new file mode 100644 index 00000000..a1de3022 --- /dev/null +++ b/scheme/cca/test/platform/mult-endorsements.json @@ -0,0 +1,5 @@ +[ + "{\n\"scheme\":\"CCA\",\n\"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n\"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"BL\",\n \"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"3.4.2\"\n }\n }", + "\n{\n \"scheme\":\"CCA\",\n \"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n \"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"M1\",\n \"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"1.2.0\"}\n }\n ", + "\n {\n \"scheme\":\"CCA\",\n \"type\":\"REFERENCE_VALUE\",\n\"subType\":\"platform.sw-component\",\n, \"attributes\":{\n \"hw-model\":\"RoadRunner\",\n \"hw-vendor\":\"ACME\",\n \"impl-id\":\"76543210fedcba9817161514131211101f1e1d1c1b1a1918\",\n \"measurement-desc\":\"sha-256\",\n \"measurement-type\":\"M2\",\n \"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\n \"version\":\"1.2.3\"}\n }\n " +] \ No newline at end of file diff --git a/scheme/arm-cca/test/platform/refval-endorsements.json b/scheme/cca/test/platform/refval-endorsements.json similarity index 92% rename from scheme/arm-cca/test/platform/refval-endorsements.json rename to scheme/cca/test/platform/refval-endorsements.json index bf3460bf..d8253b58 100644 --- a/scheme/arm-cca/test/platform/refval-endorsements.json +++ b/scheme/cca/test/platform/refval-endorsements.json @@ -1,5 +1,5 @@ { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "REFERENCE_VALUE", "subType": "platform.config", "attributes": { diff --git a/scheme/arm-cca/test/platform/ta-endorsements.json b/scheme/cca/test/platform/ta-endorsements.json similarity index 94% rename from scheme/arm-cca/test/platform/ta-endorsements.json rename to scheme/cca/test/platform/ta-endorsements.json index fc9975d3..eefb4bed 100644 --- a/scheme/arm-cca/test/platform/ta-endorsements.json +++ b/scheme/cca/test/platform/ta-endorsements.json @@ -1,5 +1,5 @@ { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "VERIFICATION_KEY", "attributes": { "hw-model": "RoadRunner", diff --git a/scheme/arm-cca/test/platform/ta-integ-endorsements.json b/scheme/cca/test/platform/ta-integ-endorsements.json similarity index 95% rename from scheme/arm-cca/test/platform/ta-integ-endorsements.json rename to scheme/cca/test/platform/ta-integ-endorsements.json index 0027b84d..abaf925e 100644 --- a/scheme/arm-cca/test/platform/ta-integ-endorsements.json +++ b/scheme/cca/test/platform/ta-integ-endorsements.json @@ -1,5 +1,5 @@ { - "scheme": "ARM_CCA", + "scheme": "CCA", "type": "VERIFICATION_KEY", "attributes": { "hw-model": "RoadRunner", diff --git a/scheme/cca/test/realm/match-endorsements.json b/scheme/cca/test/realm/match-endorsements.json new file mode 100644 index 00000000..5db3417d --- /dev/null +++ b/scheme/cca/test/realm/match-endorsements.json @@ -0,0 +1,8 @@ +[ + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\",\"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\",\"rem0\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem1\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem2\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem3\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\"}}" +] diff --git a/scheme/cca/test/realm/no-realm-endorsements.json b/scheme/cca/test/realm/no-realm-endorsements.json new file mode 100644 index 00000000..9ba51460 --- /dev/null +++ b/scheme/cca/test/realm/no-realm-endorsements.json @@ -0,0 +1,7 @@ +[ + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}" +] diff --git a/scheme/cca/test/realm/no-rem-endorsements.json b/scheme/cca/test/realm/no-rem-endorsements.json new file mode 100644 index 00000000..619e0b78 --- /dev/null +++ b/scheme/cca/test/realm/no-rem-endorsements.json @@ -0,0 +1,8 @@ +[ + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform.config-id\": \"AQID\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"}}" +] diff --git a/scheme/cca/test/realm/no-rpv-endorsements.json b/scheme/cca/test/realm/no-rpv-endorsements.json new file mode 100644 index 00000000..131fae63 --- /dev/null +++ b/scheme/cca/test/realm/no-rpv-endorsements.json @@ -0,0 +1,8 @@ +[ + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform.config-id\": \"AQID\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"rem0\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem1\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem2\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\",\"rem3\": \"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==\"}}" +] diff --git a/scheme/cca/test/realm/rim-mismatch-endorsements.json b/scheme/cca/test/realm/rim-mismatch-endorsements.json new file mode 100644 index 00000000..c4a12ed6 --- /dev/null +++ b/scheme/cca/test/realm/rim-mismatch-endorsements.json @@ -0,0 +1,8 @@ +[ + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"BL\",\"measurement-value\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"3.4.2\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M1\",\"measurement-value\":\"CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M2\",\"measurement-value\":\"DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.2.3\"}}", + "{\"scheme\":\"CCA\",\"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.sw-component\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"measurement-desc\":\"sha-256\",\"measurement-type\":\"M3\",\"measurement-value\":\"EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"signer-id\":\"BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=\",\"version\":\"1.0.0\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"platform.config\",\"attributes\":{\"hw-model\":\"RoadRunner\",\"hw-vendor\":\"ACME\",\"impl-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"platform-config-label\": \"platform-config-label\",\"platform-config-id\": \"AQID\"}}", + "{\"scheme\":\"CCA\", \"type\":\"REFERENCE_VALUE\",\"subType\": \"realm.reference-value\", \"attributes\":{\"realm-initial-measurement\":\"Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQq==\", \"hash-alg-id\":\"sha-384\",\"hw-vendor\":\"ACME\",\"class-id\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"realm-personalization-value\": \"QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA==\",\"rem0\": \"AQID\",\"rem1\": \"AQID\",\"rem2\": \"AQID\",\"rem3\": \"AQID\"}}" +] diff --git a/scheme/arm-cca/test_vectors.go b/scheme/cca/test_vectors.go similarity index 89% rename from scheme/arm-cca/test_vectors.go rename to scheme/cca/test_vectors.go index 71c0393c..f504eabc 100644 --- a/scheme/arm-cca/test_vectors.go +++ b/scheme/cca/test_vectors.go @@ -1,8 +1,7 @@ -// Copyright 2024 Contributors to the Veraison project. -// Copyright 2024 Contributors to the Veraison project. +// Copyright 2023-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package arm_cca +package cca import _ "embed" From 21d4ba1696b9ffb61f2f180d255b36754f9f2d9e Mon Sep 17 00:00:00 2001 From: Kallal Mukherjee Date: Wed, 8 Oct 2025 09:45:45 +0000 Subject: [PATCH 2/3] fix(vts): fix shebang position and variable quoting in init-kvstores.sh - Move shebang to first line to fix SC1128 error - Add proper quoting to variable in sqlite3 command to fix SC2086 error Addresses shellcheck violations found during bash script review. Signed-off-by: Kallal Mukherjee --- vts/test-harness/init-kvstores.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vts/test-harness/init-kvstores.sh b/vts/test-harness/init-kvstores.sh index 29001a7d..1ab4ff6e 100755 --- a/vts/test-harness/init-kvstores.sh +++ b/vts/test-harness/init-kvstores.sh @@ -1,7 +1,6 @@ +#!/bin/bash # Copyright 2022-2023 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -# -#!/bin/bash set -eux set -o pipefail @@ -9,5 +8,5 @@ set -o pipefail for t in en ta po do echo "CREATE TABLE kvstore ( key text NOT NULL, vals text NOT NULL );" | \ - sqlite3 $t-store.sql + sqlite3 "${t}-store.sql" done From 68618dcafcbed22b7f6a48cf3f4aab1a404fee09 Mon Sep 17 00:00:00 2001 From: Kallal Mukherjee Date: Fri, 10 Oct 2025 17:43:00 +0000 Subject: [PATCH 3/3] revert: maintain ARM_CCA scheme naming per reviewer feedback - Renamed scheme/cca back to scheme/arm-cca - Reverted package name from 'cca' to 'arm_cca' - Restored SchemeName constant to 'ARM_CCA' - Updated import paths and references throughout codebase - Addressed @yogeshbdeshpande review feedback that ARM CCA is a specific scheme and the name should reflect the implementation Signed-off-by: Kallal Mukherjee --- builtin/schemes.gen.go | 2 +- deployments/rpm/veraison-services.spec.template | 2 +- .../data/results/cca.end-to-end.json | 2 +- integration-tests/data/results/cca.good.json | 2 +- .../data/results/cca.verify-challenge.json | 2 +- integration-tests/utils/generators.py | 2 +- scheme/Makefile | 2 +- scheme/README.md | 2 +- scheme/{cca => arm-cca}/Makefile | 2 +- scheme/{cca => arm-cca}/README.md | 0 scheme/{cca => arm-cca}/corim_extractor.go | 4 ++-- scheme/{cca => arm-cca}/endorsement_handler.go | 4 ++-- .../{cca => arm-cca}/endorsement_handler_test.go | 4 ++-- scheme/{cca => arm-cca}/evidence_handler.go | 2 +- scheme/{cca => arm-cca}/evidence_handler_test.go | 4 ++-- scheme/{cca => arm-cca}/platform.go | 4 ++-- scheme/{cca => arm-cca}/plugin/Makefile | 0 scheme/{cca => arm-cca}/plugin/combined/Makefile | 4 ++-- scheme/{cca => arm-cca}/plugin/combined/main.go | 2 +- .../plugin/endorsement-handler}/Makefile | 5 ++--- .../plugin/endorsement-handler/main.go | 2 +- .../plugin/evidence-handler}/Makefile | 4 ++-- .../plugin/evidence-handler/main.go | 2 +- .../plugin/store-handler}/Makefile | 4 ++-- .../{cca => arm-cca}/plugin/store-handler/main.go | 2 +- scheme/{cca => arm-cca}/realm.go | 4 ++-- scheme/{cca => arm-cca}/scheme.go | 4 ++-- scheme/{cca => arm-cca}/store_handler.go | 2 +- scheme/{cca => arm-cca}/store_handler_test.go | 14 +++++++------- .../test/corim/build-test-vectors.sh | 0 .../test/corim/src/comidCcaRealm.json | 0 .../test/corim/src/comidCcaRealmInvalidClass.json | 0 .../corim/src/comidCcaRealmInvalidInstance.json | 0 .../test/corim/src/comidCcaRealmNoClass.json | 0 .../test/corim/src/comidCcaRealmNoInstance.json | 0 .../test/corim/src/comidCcaRefValFour.json | 0 .../test/corim/src/comidCcaRefValOne.json | 0 .../{cca => arm-cca}/test/corim/src/corimCca.json | 0 .../test/corim/src/corimCcaNoProfile.json | 0 .../test/corim/src/corimCcaRealm.json | 0 .../corim/unsignedCorimCcaComidCcaRefValFour.cbor | Bin .../corim/unsignedCorimCcaComidCcaRefValOne.cbor | Bin ...signedCorimCcaNoProfileComidCcaRefValFour.cbor | Bin ...nsignedCorimCcaNoProfileComidCcaRefValOne.cbor | Bin .../corim/unsignedCorimCcaRealmComidCcaRealm.cbor | Bin ...nedCorimCcaRealmComidCcaRealmInvalidClass.cbor | Bin ...CorimCcaRealmComidCcaRealmInvalidInstance.cbor | Bin ...unsignedCorimCcaRealmComidCcaRealmNoClass.cbor | Bin ...ignedCorimCcaRealmComidCcaRealmNoInstance.cbor | Bin .../{cca => arm-cca}/test/evidence/cca-token.cbor | Bin .../{cca => arm-cca}/test/evidence/cca-token.json | 0 .../test/evidence/extracted-claims.json | 0 .../{cca => arm-cca}/test/evidence/extracted.json | 0 .../test/platform/endorsements.json | 0 .../platform/invalid-key-ta-endorsements.json | 0 .../test/platform/mismatch-cfg-endorsements.json | 0 .../platform/mismatch-refval-endorsements.json | 0 .../test/platform/mult-endorsements.json | 0 .../test/platform/refval-endorsements.json | 0 .../test/platform/ta-endorsements.json | 0 .../test/platform/ta-integ-endorsements.json | 0 .../test/realm/match-endorsements.json | 0 .../test/realm/no-realm-endorsements.json | 0 .../test/realm/no-rem-endorsements.json | 0 .../test/realm/no-rpv-endorsements.json | 0 .../test/realm/rim-mismatch-endorsements.json | 0 scheme/{cca => arm-cca}/test_vectors.go | 4 ++-- 67 files changed, 46 insertions(+), 47 deletions(-) rename scheme/{cca => arm-cca}/Makefile (84%) rename scheme/{cca => arm-cca}/README.md (100%) rename scheme/{cca => arm-cca}/corim_extractor.go (93%) rename scheme/{cca => arm-cca}/endorsement_handler.go (93%) rename scheme/{cca => arm-cca}/endorsement_handler_test.go (97%) rename scheme/{cca => arm-cca}/evidence_handler.go (99%) rename scheme/{cca => arm-cca}/evidence_handler_test.go (98%) rename scheme/{cca => arm-cca}/platform.go (96%) rename scheme/{cca => arm-cca}/plugin/Makefile (100%) rename scheme/{cca => arm-cca}/plugin/combined/Makefile (72%) rename scheme/{cca => arm-cca}/plugin/combined/main.go (88%) rename scheme/{cca/plugin/store-handler => arm-cca/plugin/endorsement-handler}/Makefile (68%) rename scheme/{cca => arm-cca}/plugin/endorsement-handler/main.go (84%) rename scheme/{cca/plugin/endorsement-handler => arm-cca/plugin/evidence-handler}/Makefile (69%) rename scheme/{cca => arm-cca}/plugin/evidence-handler/main.go (84%) rename scheme/{cca/plugin/evidence-handler => arm-cca/plugin/store-handler}/Makefile (69%) rename scheme/{cca => arm-cca}/plugin/store-handler/main.go (84%) rename scheme/{cca => arm-cca}/realm.go (98%) rename scheme/{cca => arm-cca}/scheme.go (92%) rename scheme/{cca => arm-cca}/store_handler.go (99%) rename scheme/{cca => arm-cca}/store_handler_test.go (80%) rename scheme/{cca => arm-cca}/test/corim/build-test-vectors.sh (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRealm.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRealmInvalidClass.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRealmInvalidInstance.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRealmNoClass.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRealmNoInstance.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRefValFour.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/comidCcaRefValOne.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/corimCca.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/corimCcaNoProfile.json (100%) rename scheme/{cca => arm-cca}/test/corim/src/corimCcaRealm.json (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor (100%) rename scheme/{cca => arm-cca}/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor (100%) rename scheme/{cca => arm-cca}/test/evidence/cca-token.cbor (100%) rename scheme/{cca => arm-cca}/test/evidence/cca-token.json (100%) rename scheme/{cca => arm-cca}/test/evidence/extracted-claims.json (100%) rename scheme/{cca => arm-cca}/test/evidence/extracted.json (100%) rename scheme/{cca => arm-cca}/test/platform/endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/invalid-key-ta-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/mismatch-cfg-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/mismatch-refval-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/mult-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/refval-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/ta-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/platform/ta-integ-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/realm/match-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/realm/no-realm-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/realm/no-rem-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/realm/no-rpv-endorsements.json (100%) rename scheme/{cca => arm-cca}/test/realm/rim-mismatch-endorsements.json (100%) rename scheme/{cca => arm-cca}/test_vectors.go (93%) diff --git a/builtin/schemes.gen.go b/builtin/schemes.gen.go index 12fcad4a..b9ba786e 100644 --- a/builtin/schemes.gen.go +++ b/builtin/schemes.gen.go @@ -5,7 +5,7 @@ import ( scheme1 "github.com/veraison/services/scheme/parsec-cca" scheme2 "github.com/veraison/services/scheme/riot" - scheme3 "github.com/veraison/services/scheme/cca" + scheme3 "github.com/veraison/services/scheme/arm-cca" scheme4 "github.com/veraison/services/scheme/tpm-enacttrust" scheme5 "github.com/veraison/services/scheme/parsec-tpm" scheme6 "github.com/veraison/services/scheme/psa-iot" diff --git a/deployments/rpm/veraison-services.spec.template b/deployments/rpm/veraison-services.spec.template index 72a837b0..a0ffac90 100644 --- a/deployments/rpm/veraison-services.spec.template +++ b/deployments/rpm/veraison-services.spec.template @@ -88,7 +88,7 @@ cp -a $DEPLOYMENT_DEST/* %{buildroot}/ %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/evcli %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/pocli %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/veraison -%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/cca.plugin +%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/arm-cca.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-cca.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-tpm.plugin %attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/psa.plugin diff --git a/integration-tests/data/results/cca.end-to-end.json b/integration-tests/data/results/cca.end-to-end.json index 0ff5259c..2a85600a 100644 --- a/integration-tests/data/results/cca.end-to-end.json +++ b/integration-tests/data/results/cca.end-to-end.json @@ -48,7 +48,7 @@ ] } }, - "CCA_REALM": { + "ARM_CCA_REALM": { "ear.status": "affirming", "ear.trustworthiness-vector": { "configuration": 0, diff --git a/integration-tests/data/results/cca.good.json b/integration-tests/data/results/cca.good.json index 70a8703c..7ea34b94 100644 --- a/integration-tests/data/results/cca.good.json +++ b/integration-tests/data/results/cca.good.json @@ -49,7 +49,7 @@ ] } }, - "CCA_REALM": { + "ARM_CCA_REALM": { "ear.appraisal-policy-id": "policy:CCA", "ear.status": "warning", "ear.trustworthiness-vector": { diff --git a/integration-tests/data/results/cca.verify-challenge.json b/integration-tests/data/results/cca.verify-challenge.json index c25d176a..8feeef7c 100644 --- a/integration-tests/data/results/cca.verify-challenge.json +++ b/integration-tests/data/results/cca.verify-challenge.json @@ -48,7 +48,7 @@ ] } }, - "CCA_REALM": { + "ARM_CCA_REALM": { "ear.status": "warning", "ear.trustworthiness-vector": { "configuration": 0, diff --git a/integration-tests/utils/generators.py b/integration-tests/utils/generators.py index 83a2368a..d61463b3 100644 --- a/integration-tests/utils/generators.py +++ b/integration-tests/utils/generators.py @@ -97,7 +97,7 @@ def generate_expected_result_from_response(response, scheme, expected): elif scheme == 'cca' and nonce: update_json( infile, - {"CCA_REALM": {'ear.veraison.annotated-evidence': {f'cca-realm-challenge': nonce}}}, + {"ARM_CCA_REALM": {'ear.veraison.annotated-evidence': {f'cca-realm-challenge': nonce}}}, outfile, ) else: diff --git a/scheme/Makefile b/scheme/Makefile index c06acc38..c3336e19 100644 --- a/scheme/Makefile +++ b/scheme/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 SUBDIR := common -SUBDIR += cca +SUBDIR += arm-cca SUBDIR += riot SUBDIR += psa-iot SUBDIR += tpm-enacttrust diff --git a/scheme/README.md b/scheme/README.md index 878bbcf8..deb2a94b 100644 --- a/scheme/README.md +++ b/scheme/README.md @@ -12,7 +12,7 @@ schemes. Currently the following schemes are implemented: -- `cca` Confidential Compute Architecture attestation. +- `arm-cca` ARM Confidential Compute Architecture attestation. - `psa-iot`: Arm Platform Security Architecture attestation. - `riot`: [RIoT based DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible attestation (note: this does not implement any specific DICE architecture). diff --git a/scheme/cca/Makefile b/scheme/arm-cca/Makefile similarity index 84% rename from scheme/cca/Makefile rename to scheme/arm-cca/Makefile index 891a9939..5e974738 100644 --- a/scheme/cca/Makefile +++ b/scheme/arm-cca/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 .DEFAULT_GOAL := test -GOPKG := github.com/veraison/services/scheme/cca +GOPKG := github.com/veraison/services/scheme/arm-cca SRCS := $(wildcard *.go) SUBDIR += plugin diff --git a/scheme/cca/README.md b/scheme/arm-cca/README.md similarity index 100% rename from scheme/cca/README.md rename to scheme/arm-cca/README.md diff --git a/scheme/cca/corim_extractor.go b/scheme/arm-cca/corim_extractor.go similarity index 93% rename from scheme/cca/corim_extractor.go rename to scheme/arm-cca/corim_extractor.go index d1ee9524..50565c8c 100644 --- a/scheme/cca/corim_extractor.go +++ b/scheme/arm-cca/corim_extractor.go @@ -1,6 +1,6 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "fmt" diff --git a/scheme/cca/endorsement_handler.go b/scheme/arm-cca/endorsement_handler.go similarity index 93% rename from scheme/cca/endorsement_handler.go rename to scheme/arm-cca/endorsement_handler.go index 882f9f10..a51a5ea1 100644 --- a/scheme/cca/endorsement_handler.go +++ b/scheme/arm-cca/endorsement_handler.go @@ -1,6 +1,6 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "mime" diff --git a/scheme/cca/endorsement_handler_test.go b/scheme/arm-cca/endorsement_handler_test.go similarity index 97% rename from scheme/cca/endorsement_handler_test.go rename to scheme/arm-cca/endorsement_handler_test.go index 1a5f106d..7b94c888 100644 --- a/scheme/cca/endorsement_handler_test.go +++ b/scheme/arm-cca/endorsement_handler_test.go @@ -1,6 +1,6 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "testing" diff --git a/scheme/cca/evidence_handler.go b/scheme/arm-cca/evidence_handler.go similarity index 99% rename from scheme/cca/evidence_handler.go rename to scheme/arm-cca/evidence_handler.go index 7b9374dd..0df93b71 100644 --- a/scheme/cca/evidence_handler.go +++ b/scheme/arm-cca/evidence_handler.go @@ -1,7 +1,7 @@ // Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "bytes" diff --git a/scheme/cca/evidence_handler_test.go b/scheme/arm-cca/evidence_handler_test.go similarity index 98% rename from scheme/cca/evidence_handler_test.go rename to scheme/arm-cca/evidence_handler_test.go index 5cb35cbb..f37e4b98 100644 --- a/scheme/cca/evidence_handler_test.go +++ b/scheme/arm-cca/evidence_handler_test.go @@ -1,7 +1,7 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "encoding/json" diff --git a/scheme/cca/platform.go b/scheme/arm-cca/platform.go similarity index 96% rename from scheme/cca/platform.go rename to scheme/arm-cca/platform.go index 37efb5f6..85bb0284 100644 --- a/scheme/cca/platform.go +++ b/scheme/arm-cca/platform.go @@ -1,7 +1,7 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "fmt" diff --git a/scheme/cca/plugin/Makefile b/scheme/arm-cca/plugin/Makefile similarity index 100% rename from scheme/cca/plugin/Makefile rename to scheme/arm-cca/plugin/Makefile diff --git a/scheme/cca/plugin/combined/Makefile b/scheme/arm-cca/plugin/combined/Makefile similarity index 72% rename from scheme/cca/plugin/combined/Makefile rename to scheme/arm-cca/plugin/combined/Makefile index 87b5ea7b..ec6dd9bc 100644 --- a/scheme/cca/plugin/combined/Makefile +++ b/scheme/arm-cca/plugin/combined/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/cca.plugin -GOPKG := github.com/veraison/services/scheme/cca +PLUGIN := ../../../bin/arm-cca.plugin +GOPKG := github.com/veraison/services/scheme/arm-cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/cca/plugin/combined/main.go b/scheme/arm-cca/plugin/combined/main.go similarity index 88% rename from scheme/cca/plugin/combined/main.go rename to scheme/arm-cca/plugin/combined/main.go index b9841b9a..b3edf9ae 100644 --- a/scheme/cca/plugin/combined/main.go +++ b/scheme/arm-cca/plugin/combined/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/cca" + scheme "github.com/veraison/services/scheme/arm-cca" ) func main() { diff --git a/scheme/cca/plugin/store-handler/Makefile b/scheme/arm-cca/plugin/endorsement-handler/Makefile similarity index 68% rename from scheme/cca/plugin/store-handler/Makefile rename to scheme/arm-cca/plugin/endorsement-handler/Makefile index 17ec1b51..d319feaa 100644 --- a/scheme/cca/plugin/store-handler/Makefile +++ b/scheme/arm-cca/plugin/endorsement-handler/Makefile @@ -1,9 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/cca-store-handler.plugin -GOPKG := github.com/veraison/services/scheme/cca -SRCS := main.go +PLUGIN := ../../../bin/arm-cca-endorsement-handler.plugin +GOPKG := github.com/veraison/services/scheme/arm-cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/cca/plugin/endorsement-handler/main.go b/scheme/arm-cca/plugin/endorsement-handler/main.go similarity index 84% rename from scheme/cca/plugin/endorsement-handler/main.go rename to scheme/arm-cca/plugin/endorsement-handler/main.go index 2767b919..3520cd06 100644 --- a/scheme/cca/plugin/endorsement-handler/main.go +++ b/scheme/arm-cca/plugin/endorsement-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/cca" + scheme "github.com/veraison/services/scheme/arm-cca" ) func main() { diff --git a/scheme/cca/plugin/endorsement-handler/Makefile b/scheme/arm-cca/plugin/evidence-handler/Makefile similarity index 69% rename from scheme/cca/plugin/endorsement-handler/Makefile rename to scheme/arm-cca/plugin/evidence-handler/Makefile index 7a68f1ef..337da3f0 100644 --- a/scheme/cca/plugin/endorsement-handler/Makefile +++ b/scheme/arm-cca/plugin/evidence-handler/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/cca-endorsement-handler.plugin -GOPKG := github.com/veraison/services/scheme/cca +PLUGIN := ../../../bin/arm-cca-evidence-handler.plugin +GOPKG := github.com/veraison/services/scheme/arm-cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/cca/plugin/evidence-handler/main.go b/scheme/arm-cca/plugin/evidence-handler/main.go similarity index 84% rename from scheme/cca/plugin/evidence-handler/main.go rename to scheme/arm-cca/plugin/evidence-handler/main.go index 5ee2e266..9669bebb 100644 --- a/scheme/cca/plugin/evidence-handler/main.go +++ b/scheme/arm-cca/plugin/evidence-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/cca" + scheme "github.com/veraison/services/scheme/arm-cca" ) func main() { diff --git a/scheme/cca/plugin/evidence-handler/Makefile b/scheme/arm-cca/plugin/store-handler/Makefile similarity index 69% rename from scheme/cca/plugin/evidence-handler/Makefile rename to scheme/arm-cca/plugin/store-handler/Makefile index 9c89a9b5..274844c6 100644 --- a/scheme/cca/plugin/evidence-handler/Makefile +++ b/scheme/arm-cca/plugin/store-handler/Makefile @@ -1,8 +1,8 @@ # Copyright 2022-2024 Contributors to the Veraison project. # SPDX-License-Identifier: Apache-2.0 -PLUGIN := ../../../bin/cca-evidence-handler.plugin -GOPKG := github.com/veraison/services/scheme/cca +PLUGIN := ../../../bin/arm-cca-store-handler.plugin +GOPKG := github.com/veraison/services/scheme/arm-cca SRCS := main.go include ../../../../mk/common.mk diff --git a/scheme/cca/plugin/store-handler/main.go b/scheme/arm-cca/plugin/store-handler/main.go similarity index 84% rename from scheme/cca/plugin/store-handler/main.go rename to scheme/arm-cca/plugin/store-handler/main.go index 4712df55..1cbf2d6e 100644 --- a/scheme/cca/plugin/store-handler/main.go +++ b/scheme/arm-cca/plugin/store-handler/main.go @@ -5,7 +5,7 @@ package main import ( "github.com/veraison/services/handler" "github.com/veraison/services/plugin" - scheme "github.com/veraison/services/scheme/cca" + scheme "github.com/veraison/services/scheme/arm-cca" ) func main() { diff --git a/scheme/cca/realm.go b/scheme/arm-cca/realm.go similarity index 98% rename from scheme/cca/realm.go rename to scheme/arm-cca/realm.go index b3fc831f..95fb8b83 100644 --- a/scheme/cca/realm.go +++ b/scheme/arm-cca/realm.go @@ -1,7 +1,7 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "bytes" diff --git a/scheme/cca/scheme.go b/scheme/arm-cca/scheme.go similarity index 92% rename from scheme/cca/scheme.go rename to scheme/arm-cca/scheme.go index 58e55c95..6e4c65a5 100644 --- a/scheme/cca/scheme.go +++ b/scheme/arm-cca/scheme.go @@ -1,8 +1,8 @@ // Copyright 2024-2025 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca -const SchemeName = "CCA" +const SchemeName = "ARM_CCA" var ( EndorsementMediaTypes = []string{ diff --git a/scheme/cca/store_handler.go b/scheme/arm-cca/store_handler.go similarity index 99% rename from scheme/cca/store_handler.go rename to scheme/arm-cca/store_handler.go index de156c2e..b6952a67 100644 --- a/scheme/cca/store_handler.go +++ b/scheme/arm-cca/store_handler.go @@ -1,7 +1,7 @@ // Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "fmt" diff --git a/scheme/cca/store_handler_test.go b/scheme/arm-cca/store_handler_test.go similarity index 80% rename from scheme/cca/store_handler_test.go rename to scheme/arm-cca/store_handler_test.go index 65b811a5..9da923a8 100644 --- a/scheme/cca/store_handler_test.go +++ b/scheme/arm-cca/store_handler_test.go @@ -1,7 +1,7 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import ( "encoding/json" @@ -36,7 +36,7 @@ func Test_GetTrustAnchorIDs_ok(t *testing.T) { Nonce: testNonce, } - expectedTaID := []string{"CCA://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/AQICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC"} + expectedTaID := []string{"ARM_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://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI" + expectedKey := "ARM_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://1/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + expectedKey := "ARM_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://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=", - "CCA://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==", + "ARM_CCA://1/AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA=", + "ARM_CCA://1/Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw==", } evidenceBytes, err := os.ReadFile("test/evidence/extracted-claims.json") require.NoError(t, err) diff --git a/scheme/cca/test/corim/build-test-vectors.sh b/scheme/arm-cca/test/corim/build-test-vectors.sh similarity index 100% rename from scheme/cca/test/corim/build-test-vectors.sh rename to scheme/arm-cca/test/corim/build-test-vectors.sh diff --git a/scheme/cca/test/corim/src/comidCcaRealm.json b/scheme/arm-cca/test/corim/src/comidCcaRealm.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRealm.json rename to scheme/arm-cca/test/corim/src/comidCcaRealm.json diff --git a/scheme/cca/test/corim/src/comidCcaRealmInvalidClass.json b/scheme/arm-cca/test/corim/src/comidCcaRealmInvalidClass.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRealmInvalidClass.json rename to scheme/arm-cca/test/corim/src/comidCcaRealmInvalidClass.json diff --git a/scheme/cca/test/corim/src/comidCcaRealmInvalidInstance.json b/scheme/arm-cca/test/corim/src/comidCcaRealmInvalidInstance.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRealmInvalidInstance.json rename to scheme/arm-cca/test/corim/src/comidCcaRealmInvalidInstance.json diff --git a/scheme/cca/test/corim/src/comidCcaRealmNoClass.json b/scheme/arm-cca/test/corim/src/comidCcaRealmNoClass.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRealmNoClass.json rename to scheme/arm-cca/test/corim/src/comidCcaRealmNoClass.json diff --git a/scheme/cca/test/corim/src/comidCcaRealmNoInstance.json b/scheme/arm-cca/test/corim/src/comidCcaRealmNoInstance.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRealmNoInstance.json rename to scheme/arm-cca/test/corim/src/comidCcaRealmNoInstance.json diff --git a/scheme/cca/test/corim/src/comidCcaRefValFour.json b/scheme/arm-cca/test/corim/src/comidCcaRefValFour.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRefValFour.json rename to scheme/arm-cca/test/corim/src/comidCcaRefValFour.json diff --git a/scheme/cca/test/corim/src/comidCcaRefValOne.json b/scheme/arm-cca/test/corim/src/comidCcaRefValOne.json similarity index 100% rename from scheme/cca/test/corim/src/comidCcaRefValOne.json rename to scheme/arm-cca/test/corim/src/comidCcaRefValOne.json diff --git a/scheme/cca/test/corim/src/corimCca.json b/scheme/arm-cca/test/corim/src/corimCca.json similarity index 100% rename from scheme/cca/test/corim/src/corimCca.json rename to scheme/arm-cca/test/corim/src/corimCca.json diff --git a/scheme/cca/test/corim/src/corimCcaNoProfile.json b/scheme/arm-cca/test/corim/src/corimCcaNoProfile.json similarity index 100% rename from scheme/cca/test/corim/src/corimCcaNoProfile.json rename to scheme/arm-cca/test/corim/src/corimCcaNoProfile.json diff --git a/scheme/cca/test/corim/src/corimCcaRealm.json b/scheme/arm-cca/test/corim/src/corimCcaRealm.json similarity index 100% rename from scheme/cca/test/corim/src/corimCcaRealm.json rename to scheme/arm-cca/test/corim/src/corimCcaRealm.json diff --git a/scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValFour.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaComidCcaRefValOne.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValFour.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaNoProfileComidCcaRefValOne.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealm.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidClass.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmInvalidInstance.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoClass.cbor diff --git a/scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor b/scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor similarity index 100% rename from scheme/cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor rename to scheme/arm-cca/test/corim/unsignedCorimCcaRealmComidCcaRealmNoInstance.cbor diff --git a/scheme/cca/test/evidence/cca-token.cbor b/scheme/arm-cca/test/evidence/cca-token.cbor similarity index 100% rename from scheme/cca/test/evidence/cca-token.cbor rename to scheme/arm-cca/test/evidence/cca-token.cbor diff --git a/scheme/cca/test/evidence/cca-token.json b/scheme/arm-cca/test/evidence/cca-token.json similarity index 100% rename from scheme/cca/test/evidence/cca-token.json rename to scheme/arm-cca/test/evidence/cca-token.json diff --git a/scheme/cca/test/evidence/extracted-claims.json b/scheme/arm-cca/test/evidence/extracted-claims.json similarity index 100% rename from scheme/cca/test/evidence/extracted-claims.json rename to scheme/arm-cca/test/evidence/extracted-claims.json diff --git a/scheme/cca/test/evidence/extracted.json b/scheme/arm-cca/test/evidence/extracted.json similarity index 100% rename from scheme/cca/test/evidence/extracted.json rename to scheme/arm-cca/test/evidence/extracted.json diff --git a/scheme/cca/test/platform/endorsements.json b/scheme/arm-cca/test/platform/endorsements.json similarity index 100% rename from scheme/cca/test/platform/endorsements.json rename to scheme/arm-cca/test/platform/endorsements.json diff --git a/scheme/cca/test/platform/invalid-key-ta-endorsements.json b/scheme/arm-cca/test/platform/invalid-key-ta-endorsements.json similarity index 100% rename from scheme/cca/test/platform/invalid-key-ta-endorsements.json rename to scheme/arm-cca/test/platform/invalid-key-ta-endorsements.json diff --git a/scheme/cca/test/platform/mismatch-cfg-endorsements.json b/scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json similarity index 100% rename from scheme/cca/test/platform/mismatch-cfg-endorsements.json rename to scheme/arm-cca/test/platform/mismatch-cfg-endorsements.json diff --git a/scheme/cca/test/platform/mismatch-refval-endorsements.json b/scheme/arm-cca/test/platform/mismatch-refval-endorsements.json similarity index 100% rename from scheme/cca/test/platform/mismatch-refval-endorsements.json rename to scheme/arm-cca/test/platform/mismatch-refval-endorsements.json diff --git a/scheme/cca/test/platform/mult-endorsements.json b/scheme/arm-cca/test/platform/mult-endorsements.json similarity index 100% rename from scheme/cca/test/platform/mult-endorsements.json rename to scheme/arm-cca/test/platform/mult-endorsements.json diff --git a/scheme/cca/test/platform/refval-endorsements.json b/scheme/arm-cca/test/platform/refval-endorsements.json similarity index 100% rename from scheme/cca/test/platform/refval-endorsements.json rename to scheme/arm-cca/test/platform/refval-endorsements.json diff --git a/scheme/cca/test/platform/ta-endorsements.json b/scheme/arm-cca/test/platform/ta-endorsements.json similarity index 100% rename from scheme/cca/test/platform/ta-endorsements.json rename to scheme/arm-cca/test/platform/ta-endorsements.json diff --git a/scheme/cca/test/platform/ta-integ-endorsements.json b/scheme/arm-cca/test/platform/ta-integ-endorsements.json similarity index 100% rename from scheme/cca/test/platform/ta-integ-endorsements.json rename to scheme/arm-cca/test/platform/ta-integ-endorsements.json diff --git a/scheme/cca/test/realm/match-endorsements.json b/scheme/arm-cca/test/realm/match-endorsements.json similarity index 100% rename from scheme/cca/test/realm/match-endorsements.json rename to scheme/arm-cca/test/realm/match-endorsements.json diff --git a/scheme/cca/test/realm/no-realm-endorsements.json b/scheme/arm-cca/test/realm/no-realm-endorsements.json similarity index 100% rename from scheme/cca/test/realm/no-realm-endorsements.json rename to scheme/arm-cca/test/realm/no-realm-endorsements.json diff --git a/scheme/cca/test/realm/no-rem-endorsements.json b/scheme/arm-cca/test/realm/no-rem-endorsements.json similarity index 100% rename from scheme/cca/test/realm/no-rem-endorsements.json rename to scheme/arm-cca/test/realm/no-rem-endorsements.json diff --git a/scheme/cca/test/realm/no-rpv-endorsements.json b/scheme/arm-cca/test/realm/no-rpv-endorsements.json similarity index 100% rename from scheme/cca/test/realm/no-rpv-endorsements.json rename to scheme/arm-cca/test/realm/no-rpv-endorsements.json diff --git a/scheme/cca/test/realm/rim-mismatch-endorsements.json b/scheme/arm-cca/test/realm/rim-mismatch-endorsements.json similarity index 100% rename from scheme/cca/test/realm/rim-mismatch-endorsements.json rename to scheme/arm-cca/test/realm/rim-mismatch-endorsements.json diff --git a/scheme/cca/test_vectors.go b/scheme/arm-cca/test_vectors.go similarity index 93% rename from scheme/cca/test_vectors.go rename to scheme/arm-cca/test_vectors.go index f504eabc..dd2b0ec8 100644 --- a/scheme/cca/test_vectors.go +++ b/scheme/arm-cca/test_vectors.go @@ -1,7 +1,7 @@ -// Copyright 2023-2024 Contributors to the Veraison project. +// Copyright 2022-2024 Contributors to the Veraison project. // SPDX-License-Identifier: Apache-2.0 -package cca +package arm_cca import _ "embed"