Skip to content

Commit

Permalink
Add array brackets to examples
Browse files Browse the repository at this point in the history 
CoRIM schema updated to include array brackets around measurement-map for endorsements and reference values.
  • Loading branch information
@nedmsmith
nedmsmith committed Oct 3, 2024
1 parent 617d95b commit ea7893d
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 121 deletions.
128 changes: 69 additions & 59 deletions examples/comid-design.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,18 @@
/ comid.layer / 3 : 2
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
}
[
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
}
]
],
[
/ environment-map / {
Expand All @@ -99,19 +101,21 @@
/ 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'
]
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
}
}
]
],
[
/ environment-map / {
Expand All @@ -123,19 +127,21 @@
/ 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'
]
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_y")
]
}
}
]
],
[
/ environment-map / {
Expand All @@ -146,38 +152,42 @@
/ 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'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_z")
]
}
[
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
/ comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_z")
]
}
]
]
],
/ comid.endorsed-triples / 1 : [
[
/ environment-map / {
/ environment-map / {
/ ** Design is valid (example assertion) ** /
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-oid-type / 111(h'0607517B010F046302'), / 2.1.123.1.15.4.99.2 /
/ 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'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_z")
]
}
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-oid-type / 111(h'0607517B010F046302'), / 2.1.123.1.15.4.99.2 /
/ 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'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_fpgadesignsrus_key_z")
]
}
]
]
]
}
Expand Down
74 changes: 40 additions & 34 deletions examples/comid-domain-memb.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,22 @@
/ 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'
]
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
}
}
]
],
[
/ environment-map / {
Expand All @@ -79,20 +81,22 @@
/ 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.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
}
}
]
]
],
/ comid.endorsed-triples / 1 : [
Expand All @@ -105,16 +109,18 @@
/ 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'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
}
[
/ measurement-map / {
/ comid.mval / 1 : {
/ raw-value-group /
/ comid.raw-value / 4 : 560(h'0000000000000000'),
/ comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_intel_key_x")
]
}
]
]
]
}
Expand Down
38 changes: 20 additions & 18 deletions examples/comid-flags.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,26 @@
/ vendor / 1 : "fwmfginc.example"
}
},
/ measurement-map / {
/ mval / 1 : {
/ flags / 3 : {
/ configured / 0 : true,
/ secure / 1 : true,
/ not-recovery / 2 : true,
/ debug / 3 : false,
/ replay-protected / 4 : true,
/ integrity-protected / 5 : true,
/ runtime-meas / 6 : true,
/ immutable / 7 : true,
/ tcb / 8 : true
}
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ flags / 3 : {
/ configured / 0 : true,
/ secure / 1 : true,
/ not-recovery / 2 : true,
/ debug / 3 : false,
/ replay-protected / 4 : true,
/ integrity-protected / 5 : true,
/ runtime-meas / 6 : true,
/ immutable / 7 : true,
/ tcb / 8 : true
}
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
22 changes: 12 additions & 10 deletions examples/comid-spdmi.diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,18 @@
/ vendor / 1 : "fwmfginc.example"
}
},
/ measurement-map / {
/ mval / 1 : {
/ spdm-indirect / 12 : {
/ index / 0 : [ 1, 2, 3, 4, 5 ]
}
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ spdm-indirect / 12 : {
/ index / 0 : [ 1, 2, 3, 4, 5 ]
}
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down

0 comments on commit ea7893d

Please sign in to comment.