Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created workaround for corim breaking change #37

Merged
merged 1 commit into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion concise-evidence.cddl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ $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 ]
;? &(ce.evidence-triples: 0) => [ + reference-triple-record ]
; temporary workaround to non-speccompliant reference-triple-record
? &(ce.evidence-triples: 0) => [ + ce.evidence-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 @@ -28,3 +30,9 @@ ev-coswid-evidence-map = {
&(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 ]
]
24 changes: 13 additions & 11 deletions examples/ce-indirect.diag
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,20 @@
/ comid.vendor / 1 : "xyzinc.example"
}
},
/ measurement-map / {
/ mval / 1 : {
/ spdm-indirect / 12 : / extends measurement-values-map / {
/ index / 0 : [ 1, 2, 3, 4, 5 ]
[
/ measurement-map / {
/ mval / 1 : {
/ spdm-indirect / 12 : / extends measurement-values-map / {
/ index / 0 : [ 1, 2, 3, 4, 5 ]
},
/ digests / 2 : [ [ 1, h'FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0'] ],
/ raw-value / 4 : 560(h'0123456789')
},
/ digests / 2 : [ [ 1, h'FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0'] ],
/ raw-value / 4 : 560(h'0123456789')
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
},
Expand Down
26 changes: 14 additions & 12 deletions examples/spdm-indirect.diag
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@
/ comid.vendor / 1 : "xyzinc.example"
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ digests / 2 : [ [ 1, h'FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0'] ],
/ raw-value / 4 : 560(h'0123456789'),
/ comid.spdm-indirect / 12 : {
/ spdm.index / 0 : [ 1, 2, 3, 4, 5 ]
}
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ comid.mval / 1 : {
/ digests / 2 : [ [ 1, h'FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0'] ],
/ raw-value / 4 : 560(h'0123456789'),
/ comid.spdm-indirect / 12 : {
/ spdm.index / 0 : [ 1, 2, 3, 4, 5 ]
}
},
/ comid.authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
Loading