Skip to content

Commit fd23c00

Browse files
abhiraj-kuabhiraj-ku
committed
fix(scheme): align PSA/CCA with CoRIM profiles
Migrate PSA-IoT and ARM-CCA scheme handling to latest profile APIs and string measurement keys. Regenerate PSA and ARM-CCA CoRIM test vectors and update negative cases to match new profile validation behavior. Signed-off-by: Abhishek kumar <abhirajabhi312@gmail.com>
1 parent dbf3c3c commit fd23c00

106 files changed

Lines changed: 1324 additions & 1225 deletions

File tree

Some content is hidden

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

‎deployments/docker/src/builder.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN go mod download &&\
6060
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 &&\
6161
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1 &&\
6262
go install github.com/mitchellh/protoc-gen-go-json@v1.1.0 &&\
63-
go install github.com/veraison/cocli@v1.0.0-alpha0 &&\
63+
go install github.com/veraison/cocli@v1.0.0-alpha0.0.20260313151307-405ce39d50b6 &&\
6464
go install github.com/veraison/evcli/v2@1685bf5 &&\
6565
go install github.com/veraison/pocli@v0.2.0 &&\
6666
go install github.com/go-delve/delve/cmd/dlv@v1.24.0 &&\

‎deployments/native/deployment.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ function init_sqlite_stores() {
231231

232232
function init_clients() {
233233
_init_client evcli github.com/veraison/evcli/v2@v2.1.0
234-
_init_client cocli github.com/veraison/cocli@8ebd64c1
234+
_init_client cocli github.com/veraison/cocli@v1.0.0-alpha0.0.20260313151307-405ce39d50b6
235235
_init_client pocli github.com/veraison/pocli@2fa24ea3
236236
_init_client corim-store github.com/veraison/corim-store/cmd/corim-store@9e4ba68b
237237
}

‎end-to-end/input/src/comid-cca-refval.json‎

Lines changed: 50 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,84 +21,95 @@
2121
"environment": {
2222
"class": {
2323
"id": {
24-
"type": "psa.impl-id",
24+
"type": "bytes",
2525
"value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
26-
},
27-
"vendor": "ACME",
28-
"model": "RoadRunner"
26+
}
2927
}
3028
},
3129
"measurements": [
3230
{
3331
"key": {
34-
"type": "psa.refval-id",
35-
"value": {
36-
"label": "BL",
37-
"version": "3.4.2",
38-
"signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
39-
}
32+
"type": "string",
33+
"value": "cca.software-component"
4034
},
4135
"value": {
36+
"cryptokeys": [
37+
{
38+
"type": "bytes",
39+
"value": "01234567890123456789012345678901"
40+
}
41+
],
4242
"digests": [
43-
"sha-256;BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
44-
]
43+
"sha-256:BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
44+
],
45+
"name": "BL"
4546
}
4647
},
4748
{
4849
"key": {
49-
"type": "psa.refval-id",
50-
"value": {
51-
"label": "M1",
52-
"version": "1.2.0",
53-
"signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
54-
}
50+
"type": "string",
51+
"value": "cca.software-component"
5552
},
5653
"value": {
54+
"cryptokeys": [
55+
{
56+
"type": "bytes",
57+
"value": "01234567890123456789012345678901"
58+
}
59+
],
5760
"digests": [
58-
"sha-256;CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
59-
]
61+
"sha-256:CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
62+
],
63+
"name": "M1"
6064
}
6165
},
6266
{
6367
"key": {
64-
"type": "psa.refval-id",
65-
"value": {
66-
"label": "M2",
67-
"version": "1.2.3",
68-
"signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
69-
}
68+
"type": "string",
69+
"value": "cca.software-component"
7070
},
7171
"value": {
72+
"cryptokeys": [
73+
{
74+
"type": "bytes",
75+
"value": "01234567890123456789012345678901"
76+
}
77+
],
7278
"digests": [
73-
"sha-256;DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
74-
]
79+
"sha-256:DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
80+
],
81+
"name": "M2"
7582
}
7683
},
7784
{
7885
"key": {
79-
"type": "psa.refval-id",
80-
"value": {
81-
"label": "M3",
82-
"version": "1.0.0",
83-
"signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
84-
}
86+
"type": "string",
87+
"value": "cca.software-component"
8588
},
8689
"value": {
90+
"cryptokeys": [
91+
{
92+
"type": "bytes",
93+
"value": "01234567890123456789012345678901"
94+
}
95+
],
8796
"digests": [
88-
"sha-256;EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
89-
]
97+
"sha-256:EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
98+
],
99+
"name": "M3"
90100
}
91101
},
92102
{
93103
"key": {
94-
"type": "cca.platform-config-id",
95-
"value": "cfg v1.0.0"
104+
"type": "string",
105+
"value": "cca.platform-config"
96106
},
97107
"value": {
98108
"raw-value": {
99109
"type": "bytes",
100110
"value": "AQID"
101-
}
111+
},
112+
"raw-value-mask": "AQID"
102113
}
103114
}
104115
]

‎end-to-end/input/src/comid-cca-ta.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
"environment": {
2222
"class": {
2323
"id": {
24-
"type": "psa.impl-id",
24+
"type": "bytes",
2525
"value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
26-
},
27-
"vendor": "ACME",
28-
"model": "RoadRunner"
26+
}
2927
},
3028
"instance": {
3129
"type": "ueid",

‎end-to-end/input/src/comid-psa-refval.json‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"environment": {
2222
"class": {
2323
"id": {
24-
"type": "psa.impl-id",
24+
"type": "bytes",
2525
"value": "YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDE="
2626
},
2727
"vendor": "ACME",
@@ -31,46 +31,52 @@
3131
"measurements": [
3232
{
3333
"key": {
34-
"type": "psa.refval-id",
35-
"value": {
36-
"label": "BL",
37-
"version": "2.1.0",
38-
"signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
39-
}
34+
"type": "string",
35+
"value": "psa.software-component"
4036
},
4137
"value": {
4238
"digests": [
43-
"sha-256;h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc="
39+
"sha-256:h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc="
40+
],
41+
"cryptokeys": [
42+
{
43+
"type": "bytes",
44+
"value": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
45+
}
4446
]
4547
}
4648
},
4749
{
4850
"key": {
49-
"type": "psa.refval-id",
50-
"value": {
51-
"label": "PRoT",
52-
"version": "1.3.5",
53-
"signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
54-
}
51+
"type": "string",
52+
"value": "psa.software-component"
5553
},
5654
"value": {
5755
"digests": [
58-
"sha-256;AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8="
56+
"sha-256:AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8="
57+
],
58+
"cryptokeys": [
59+
{
60+
"type": "bytes",
61+
"value": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
62+
}
5963
]
6064
}
6165
},
6266
{
6367
"key": {
64-
"type": "psa.refval-id",
65-
"value": {
66-
"label": "ARoT",
67-
"version": "0.1.4",
68-
"signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
69-
}
68+
"type": "string",
69+
"value": "psa.software-component"
7070
},
7171
"value": {
7272
"digests": [
73-
"sha-256;o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg="
73+
"sha-256:o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg="
74+
],
75+
"cryptokeys": [
76+
{
77+
"type": "bytes",
78+
"value": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs="
79+
}
7480
]
7581
}
7682
}

‎end-to-end/input/src/comid-psa-ta.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
"environment": {
2222
"class": {
2323
"id": {
24-
"type": "psa.impl-id",
24+
"type": "bytes",
2525
"value": "YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDE="
26-
},
27-
"vendor": "ACME",
28-
"model": "RoadRunner"
26+
}
2927
},
3028
"instance": {
3129
"type": "ueid",

‎end-to-end/input/src/corim-psa.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"corim-id": "00000000-0000-0001-p5a1-000000000001",
3-
"profile": "http://arm.com/psa/iot/1"
3+
"profile": "tag:arm.com,2025:psa#1.0.0"
44
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/tbaehler/gin-keycloak v1.6.1
4141
github.com/veraison/ccatoken v1.3.2-0.20250512122414-b26aba0635c4
4242
github.com/veraison/cmw v0.2.0
43-
github.com/veraison/corim v1.1.3-0.20260214081209-effcd0f48c8a
43+
github.com/veraison/corim v1.1.3-0.20260309101151-2fa49d7c02e3
4444
github.com/veraison/corim-store v0.0.0-20260220100808-e966b3eab910
4545
github.com/veraison/dice v0.0.1
4646
github.com/veraison/ear v1.1.4-0.20260213122616-3034258cda59

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,8 +1255,8 @@ github.com/veraison/ccatoken v1.3.2-0.20250512122414-b26aba0635c4 h1:t2GQueIc1Sr
12551255
github.com/veraison/ccatoken v1.3.2-0.20250512122414-b26aba0635c4/go.mod h1:vMqdbW4H/8A3oT+24qssuIK3Aefy06XqzTELGg+gWAg=
12561256
github.com/veraison/cmw v0.2.0 h1:BWEvwZnD4nn5osq6XwQpTRcGxwV+Su4t6ytdAbVXAJY=
12571257
github.com/veraison/cmw v0.2.0/go.mod h1:OiYKk1t6/Fmmg30ZpSMzi4nKr5kt3374sNTkgxC5BDs=
1258-
github.com/veraison/corim v1.1.3-0.20260214081209-effcd0f48c8a h1:Y19AyrbBpuyQZ/Sa/Hyh6bo5FrO6FMeR6g3jjnjLMBE=
1259-
github.com/veraison/corim v1.1.3-0.20260214081209-effcd0f48c8a/go.mod h1:96PQ0lk+O9bzutKTDz66G2DaARYUp1BeR06EYwEwSH0=
1258+
github.com/veraison/corim v1.1.3-0.20260309101151-2fa49d7c02e3 h1:yFF+d5ekY8g1nTAuV3lEvVI4dGdQMcoYp8blegIrrSQ=
1259+
github.com/veraison/corim v1.1.3-0.20260309101151-2fa49d7c02e3/go.mod h1:96PQ0lk+O9bzutKTDz66G2DaARYUp1BeR06EYwEwSH0=
12601260
github.com/veraison/corim-store v0.0.0-20260220100808-e966b3eab910 h1:hg09D27B9qkrN6zFQEs6wEG0qiTk451ExGMnSAq2tXY=
12611261
github.com/veraison/corim-store v0.0.0-20260220100808-e966b3eab910/go.mod h1:/SqPJwSHexrxsNtiAJ/JqNgvC6+yihOyRlrTJO+0GnY=
12621262
github.com/veraison/dice v0.0.1 h1:dOm7ByDN/r4WlDsGkEUXzdPMXgTvAPTAksQ8+BwBrD4=

‎integration-tests/data/claims/cca.good.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"cca-platform-token": {
33
"cca-platform-challenge": "5QHHS9edCpI1N1heeR7DUBI+gaqXUB34EkQCITSCxVM=",
4-
"cca-platform-profile": "http://arm.com/CCA-SSD/1.0.0",
4+
"cca-platform-profile": "tag:arm.com,2023:cca_platform#1.0.0",
55
"cca-platform-implementation-id": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
66
"cca-platform-instance-id": "AQICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC",
77
"cca-platform-config": "AQID",

0 commit comments

Comments
 (0)