Skip to content

Commit

Permalink
Merge pull request #38 from TrustedComputingGroup/revert-temp-ev-triple
Browse files Browse the repository at this point in the history 
Revert temp ev triple
  • Loading branch information
@nedmsmith
nedmsmith authored Oct 4, 2024
2 parents 80cc70d + ea7893d commit 694f74f
Show file tree
Hide file tree
Showing 6 changed files with 236 additions and 131 deletions.
12 changes: 2 additions & 10 deletions concise-evidence.cddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ $evidence-id-type-choice /= tagged-uuid-type
; additional evidence identifier types may be added here

ev-triples-map = non-empty< {
;? &(ce.evidence-triples: 0) => [ + reference-triple-record ]
; temporary workaround to non-speccompliant reference-triple-record
? &(ce.evidence-triples: 0) => [ + ce.evidence-triple-record ]
? &(ce.evidence-triples: 0) => [ + reference-triple-record ]
? &(ce.identity-triples: 1) => [ + identity-triple-record ]
? &(ce.dependency-triples: 2) => [ + domain-dependency-triple-record ]
? &(ce.domain-membership-triples: 3) => [ + domain-membership-triple-record ]
Expand All @@ -29,10 +27,4 @@ ev-coswid-evidence-map = {
? &(ce.coswid-tag-id: 0) => concise-swid-tag-id
&(ce.coswid-evidence: 1) => evidence-entry
? &(ce.authorized-by: 2) => [ + $crypto-key-type-choice ] ; see comid schema
}

; temporary workaround
ce.evidence-triple-record = [
environment-map
[ + measurement-map ]
]
}
93 changes: 93 additions & 0 deletions examples/comid-aaa.diag
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/ concise-mid-tag / {
/ comid.tag-identity / 1 : {
/ comid.tag-id / 0 : h'1EACD596F4A34FB699BFAEB58E0A4E47'
},
/ comid.entities / 2 : [ {
/ comid.entity-name / 0 : "FPGA Designs-R-Us",
/ comid.reg-id / 1 : 32("https://fpgadesignsrus.example"),
/ comid.role / 2 : [ 0 ] / tag-creator /
} ],
/ comid.linked-tags / 3 : [
/ linked-tag-map / {
/ comid.linked-tag-id / 0 : h'97F5A7071C6F438F877A4A020780EBE9',
/ comid.tag-rel / 1 : / comid.supplements / 0
}
],
/ comid.triples / 4 : {
/ comid.reference-triples / 0 : [
[
/ environment-map / {
/ ** Layer 3 device state ** /
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-oid-type / 111(h'0607517B010F0401'), / 2.1.123.1.15.4.1 /
/ comid.vendor / 1 : "fpgadesignsrus.example",
/ 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")
]
}
]
],
[
/ environment-map / {
/ ** Layer 2 design (IO descriptor) hash ** /
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-oid-type / 111(h'0607517B010F0402'), / 2.1.123.1.15.4.2 /
/ comid.vendor / 1 : "fpgadesignsrus.example",
/ comid.layer / 3 : 2
}
},
[
/ 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.endorsed-triples / 1 : [
[
/ 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")
]
}
]
]
]
}
}
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
Loading

0 comments on commit 694f74f

Please sign in to comment.