Skip to content

Commit a6c8ab4

Browse files
committed
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
1 parent 21d4ba1 commit a6c8ab4

File tree

67 files changed

+46
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+46
-47
lines changed

builtin/schemes.gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
scheme1 "github.com/veraison/services/scheme/parsec-cca"
77
scheme2 "github.com/veraison/services/scheme/riot"
8-
scheme3 "github.com/veraison/services/scheme/cca"
8+
scheme3 "github.com/veraison/services/scheme/arm-cca"
99
scheme4 "github.com/veraison/services/scheme/tpm-enacttrust"
1010
scheme5 "github.com/veraison/services/scheme/parsec-tpm"
1111
scheme6 "github.com/veraison/services/scheme/psa-iot"

deployments/rpm/veraison-services.spec.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ cp -a $DEPLOYMENT_DEST/* %{buildroot}/
8888
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/evcli
8989
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/pocli
9090
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/veraison
91-
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/cca.plugin
91+
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/arm-cca.plugin
9292
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-cca.plugin
9393
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/parsec-tpm.plugin
9494
%attr(0755, %{USERNAME}, %{GROUPNAME}) %{_bindir}/psa.plugin

integration-tests/data/results/cca.end-to-end.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
]
4949
}
5050
},
51-
"CCA_REALM": {
51+
"ARM_CCA_REALM": {
5252
"ear.status": "affirming",
5353
"ear.trustworthiness-vector": {
5454
"configuration": 0,

integration-tests/data/results/cca.good.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
]
5050
}
5151
},
52-
"CCA_REALM": {
52+
"ARM_CCA_REALM": {
5353
"ear.appraisal-policy-id": "policy:CCA",
5454
"ear.status": "warning",
5555
"ear.trustworthiness-vector": {

integration-tests/data/results/cca.verify-challenge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
]
4949
}
5050
},
51-
"CCA_REALM": {
51+
"ARM_CCA_REALM": {
5252
"ear.status": "warning",
5353
"ear.trustworthiness-vector": {
5454
"configuration": 0,

integration-tests/utils/generators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def generate_expected_result_from_response(response, scheme, expected):
9797
elif scheme == 'cca' and nonce:
9898
update_json(
9999
infile,
100-
{"CCA_REALM": {'ear.veraison.annotated-evidence': {f'cca-realm-challenge': nonce}}},
100+
{"ARM_CCA_REALM": {'ear.veraison.annotated-evidence': {f'cca-realm-challenge': nonce}}},
101101
outfile,
102102
)
103103
else:

scheme/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
SUBDIR := common
5-
SUBDIR += cca
5+
SUBDIR += arm-cca
66
SUBDIR += riot
77
SUBDIR += psa-iot
88
SUBDIR += tpm-enacttrust

scheme/README.md

Lines changed: 1 addition & 1 deletion

scheme/cca/Makefile renamed to scheme/arm-cca/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33
.DEFAULT_GOAL := test
44

5-
GOPKG := github.com/veraison/services/scheme/cca
5+
GOPKG := github.com/veraison/services/scheme/arm-cca
66
SRCS := $(wildcard *.go)
77

88
SUBDIR += plugin

0 commit comments

Comments
 (0)