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.

Sign up for GitHub

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

Fixed measurement-map multiplicity on evidence #29

Merged
merged 6 commits into from
Sep 17, 2024
Merged

Fixed measurement-map multiplicity on evidence #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
707c75e
Fixed measurement-map multiplicity on evidence
nedmsmith Sep 16, 2024
1c32e13
Revert "Fixed measurement-map multiplicity on evidence"
nedmsmith Sep 16, 2024
8b3469a
Fixed measurement-map multiplicity on evidence
nedmsmith Sep 16, 2024
0bf75ab
removed concise-evidence submodule
nedmsmith Sep 16, 2024
41448e8
added concise-evidence submodule
nedmsmith Sep 16, 2024
dc18eb7
Fixed multiplicity in examples
nedmsmith Sep 17, 2024
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
2 changes: 0 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
[submodule "concise-evidence"]
path = concise-evidence
url = https://github.com/TrustedComputingGroup/concise-evidence
branch = main
update = merge
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $(drafts_html):: $(CDDL_DIR)$(1)-autogen.cddl
$(drafts_txt):: $(CDDL_DIR)$(1)-autogen.cddl

$(CDDL_DIR)$(1)-autogen.cddl: $(2)
$(MAKE) -C $(CDDL_DIR) check-$(1)
$(MAKE) -C $(CDDL_DIR)

endef # cddl_targets

Expand Down
10 changes: 6 additions & 4 deletions cddl/examples/ice-epoch1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
/ comid.index / 4 : 1
}
},
/ measurement-map / {
/ mval / 1 : {
/ epoch / -90 : 0("2023-06-09T00:00:00Z")
[
/ measurement-map / {
/ mval / 1 : {
/ epoch / -90 : 0("2023-06-09T00:00:00Z")
}
}
}
]
]
]
}
Expand Down
40 changes: 21 additions & 19 deletions cddl/examples/ice-isve.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@
/ tagged-oid-type / 111(h'6086480186F84D0102030501') / 2.16.840.1.113741.1.2.3.5.1 - <OID-for-SGX-ISVE-Identity> aka <OID-for-SGX-ISVE-TCB> /
}
},
/ measurement-map / {
/ mval / 1 : {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ isvprodid / -85 : 1,
/ isvsvn / -73 : 2,
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
] / not expected to match ref val /
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ isvprodid / -85 : 1,
/ isvsvn / -73 : 2,
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
] / not expected to match ref val /
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
22 changes: 12 additions & 10 deletions cddl/examples/ice-pckcert.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,18 @@
/ tagged-oid-type / 111(h'6086480186F84D0102030406') / 2.16.840.1.113741.1.2.3.4.6 - <OID-for-SGX-platform-TCB> /
}
},
/ measurement-map / {
/ mval / 1 : {
/ instance-id / -77 : 0,
/ pceid / -80 : "0000",
/ tcb-comp-svn / -125 : [ 10, 10, 2, 2, 2, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ instance-id / -77 : 0,
/ pceid / -80 : "0000",
/ tcb-comp-svn / -125 : [ 10, 10, 2, 2, 2, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
40 changes: 21 additions & 19 deletions cddl/examples/ice-qe.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,27 @@
/ model / 2 : "SGX QE TCB"
}
},
/ measurement-map / {
/ mval / 1 : {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ isvprodid / -85 : 1,
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
], / not expected to match ref val /
/ isvsvn / -73 : 2
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ isvprodid / -85 : 1,
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
], / not expected to match ref val /
/ isvsvn / -73 : 2
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
40 changes: 21 additions & 19 deletions cddl/examples/ice-qe2.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,27 @@
/ model / 2 : "SGX QE TCB"
}
},
/ measurement-map / {
/ mval / 1 : {
/ isvprodid / -85 : 1,
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ svn / -73 : 2,
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
] / not expected to match ref val /
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : {
/ isvprodid / -85 : 1,
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ svn / -73 : 2,
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
] / not expected to match ref val /
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
40 changes: 21 additions & 19 deletions cddl/examples/ice-seam.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@
/ model / 2 : "SGX QE TCB"
}
},
/ measurement-map / {
/ mval / 1 : / measurement-values-map extension / {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
],
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ isvprodid / -85 : 1,
/ isvsvn / -73 : 7
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
[
/ measurement-map / {
/ mval / 1 : / measurement-values-map extension / {
/ miscselect / -81 : h'00000000', / *** 4 bytes *** /
/ attributes / -82 : h'C0000000000000000000000000000000', / *** 16 bytes *** /
/ mrtee / -83 : [
/ alg-id / 1, / sha256 /
/ digest / h'B2F5EB1CB5529E7A6B6BC6787594057396E6B3F569CD50FD5DDB5E2CCB0E3C7B'
],
/ mrsigner / -84 : [
/ alg-id / 1, / sha256 /
/ digest / h'A314FC2DC663AE7A6B6BC6787594057396E6B3F569CD50FD5DDB4D1BBAFD2B6A'
],
/ isvprodid / -85 : 1,
/ isvsvn / -73 : 7
},
/ authorized-by / 2 : [
/ tagged-pkix-base64-key-type / 554("base64_key_X")
]
}
]
]
]
}
Expand Down
18 changes: 10 additions & 8 deletions cddl/examples/ice-sla1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@
/ comid.index / 4 : 2
}
},
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
[
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
]
]
]
}
}
}
]
]
]
}
Expand Down
18 changes: 10 additions & 8 deletions cddl/examples/ice-sla2.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
/ class-id / 0 : 560(h'0001') /** SPDM firmware **/
}
},
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
[
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
]
]
]
}
}
}
]
]
]
}
Expand Down
12 changes: 7 additions & 5 deletions cddl/examples/ice-sla3-indirect.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
/ comid.model / 2 : "MAX.example"
}
},
/ measurement-map / {
/ mval / 1 : {
/ comid.spdm-indirect / 12 : {
/ index / 0 : [ /digest/ 2, / svn / 1, / version / 0]
[
/ measurement-map / {
/ mval / 1 : {
/ comid.spdm-indirect / 12 : {
/ index / 0 : [ /digest/ 2, / svn / 1, / version / 0]
}
}
}
}
]
]
]
}
Expand Down
26 changes: 14 additions & 12 deletions cddl/examples/ice-sla3.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@
/ comid.model / 2 : "MAX.example"
}
},
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
]
],
/ comid.svn / 1 : 552(55),
/ version-map / 0 : {
/ comid.version / 0 : "1.3.0"
[
/ measurement-map / {
/ mval / 1 : {
/ comid.digests / 2 : [
/ digest / [
/ alg: / 7, / SHA384 /
/ val: / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
]
],
/ comid.svn / 1 : 552(55),
/ version-map / 0 : {
/ comid.version / 0 : "1.3.0"
}
}
}
}
]
]
]
}
Expand Down
Loading
Loading