Skip to content

Commit

Permalink
[WIP] Regenerate CoMID CBOR Files
Browse files Browse the repository at this point in the history 
Signed-off-by: Yogesh Deshpande <[email protected]>
  • Loading branch information
@yogeshbdeshpande
yogeshbdeshpande committed Sep 30, 2024
1 parent e5da6a8 commit b38531e
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 104 deletions.
Binary file modified comid/testcases/comid-1.cbor
View file
Binary file not shown.
Binary file modified comid/testcases/comid-2.cbor
View file
Binary file not shown.
Binary file modified comid/testcases/comid-3.cbor
View file
Binary file not shown.
Binary file modified comid/testcases/comid-design-cd.cbor
View file
Binary file not shown.
Binary file modified comid/testcases/comid-firmware-cd.cbor
View file
Binary file not shown.
24 changes: 13 additions & 11 deletions comid/testcases/src/comid-1.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@
/ comid.layer / 3 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
]]
}
}
}
]
] ]
}
}
58 changes: 33 additions & 25 deletions comid/testcases/src/comid-2.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@
/ comid.layer / 3 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
}
]
],
[
/ environment-map / {
Expand All @@ -43,14 +45,16 @@
/ comid.index / 4 : 0
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
}
]
],
[
/ environment-map / {
Expand All @@ -65,14 +69,16 @@
/ comid.index / 4 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
}
]
]
],
/ comid.endorsed-triples / 1 : [ [
Expand All @@ -87,11 +93,13 @@
/ comid.layer / 3 : 0
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1)
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1)
}
}
}
]
] ]
}
}
16 changes: 9 additions & 7 deletions comid/testcases/src/comid-3.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
/ comid.model / 2 : "ACME RoadRunner Firmware"
}
},
/ measurement-map / {
/ comid.mkey / 0: 700,
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'ABCDEF00' ]]
[
/ measurement-map / {
/ comid.mkey / 0: 700,
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'ABCDEF00' ]]
}
}
}
]
]
]
}
Expand Down
78 changes: 44 additions & 34 deletions comid/testcases/src/comid-design-cd.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@
/ comid.layer / 3 : 2
}
},
/ measurement-map /
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
}
}
]
],
[
/ environment-map / {
Expand All @@ -43,17 +45,19 @@
/ comid.layer / 3 : 2
}
},
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'3FE18ECA4053879E017EF5EB7A3E5157659C5F9BB15B7D09959B8B8647822A4CC21C3AA6721CEF87F5BFA53495DB0833'
]
]
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'3FE18ECA4053879E017EF5EB7A3E5157659C5F9BB15B7D09959B8B8647822A4CC21C3AA6721CEF87F5BFA53495DB0833'
]
]
}
}
}
]
],
[
/ environment-map / {
Expand All @@ -65,17 +69,19 @@
/ comid.layer / 3 : 2
}
},
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'20FF681A0882E29B481953888936209CB53DF9C5AAEC606A2C24A0FB138595124B8E3F24A12771BC3854CC68B40361AD'
]
]
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'20FF681A0882E29B481953888936209CB53DF9C5AAEC606A2C24A0FB138595124B8E3F24A12771BC3854CC68B40361AD'
]
]
}
}
}
]
],
[
/ environment-map / {
Expand All @@ -86,14 +92,16 @@
/ comid.vendor / 1 : "fpgadesignsrus.example"
}
},
/ measurement-map /
{
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
/ comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
/ comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
}
}
}
]
]
],
/ comid.endorsed-triples / 1 : [
Expand All @@ -106,13 +114,15 @@
/ comid.vendor / 1 : "fpgadesignsrus.example"
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
[
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
}
}
}
]
]
]
}
Expand Down
60 changes: 33 additions & 27 deletions comid/testcases/src/comid-firmware-cd.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@
/ comid.index / 4 : 0
}
},
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1),
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'15E77D6F133252F1DB7044901313884F2977D2109B33C79F33E079BFC78865255C0FB733C240FDDA544B8215D7B8F815'
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1),
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'15E77D6F133252F1DB7044901313884F2977D2109B33C79F33E079BFC78865255C0FB733C240FDDA544B8215D7B8F815'
]
]
]
}
}
}
]
],
[
/ environment-map / {
Expand All @@ -43,18 +45,20 @@
/ comid.index / 4 : 0
}
},
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1),
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
[
/ measurement-map /
{
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1),
/ comid.digests / 2 : [
[
/ hash-alg-id / 7, / SHA384 /
/ hash-value / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
]
]
]
}
}
}
]
]
],
/ comid.endorsed-triples / 1 : [
Expand All @@ -67,13 +71,15 @@
/ comid.vendor / 1 : "fwmfginc.example"
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
}
}
[
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
}
}
]
]
]
}
Expand Down

0 comments on commit b38531e

Please sign in to comment.