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

Cond ref series triple branch #49

Merged
merged 33 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8009771
cond-ref-series-triple-branch
nedmsmith Feb 1, 2023
7369ec4
Update conditional-reference-series-triple-record.cddl
nedmsmith Feb 1, 2023
57864d3
Update draft-ietf-rats-corim.md
nedmsmith Feb 1, 2023
dc26b12
Update draft-ietf-rats-corim.md
nedmsmith Feb 7, 2023
2a8e7ce
Update draft-ietf-rats-corim.md
nedmsmith Feb 7, 2023
85aa4d5
Update draft-ietf-rats-corim.md
nedmsmith Feb 7, 2023
bbb983e
Update draft-ietf-rats-corim.md
nedmsmith Feb 7, 2023
169c35c
Update draft-ietf-rats-corim.md
nedmsmith Feb 8, 2023
82d5952
Update conditional-reference-series-triple-record.cddl
nedmsmith Feb 8, 2023
4e21802
Update comid-4.diag
nedmsmith Feb 8, 2023
e664e41
Update draft-ietf-rats-corim.md
nedmsmith Feb 8, 2023
bd52bbb
Update draft-ietf-rats-corim.md
nedmsmith Feb 8, 2023
2bf9700
Update draft-ietf-rats-corim.md
nedmsmith Feb 8, 2023
bedb48c
Update comid-frags.mk
nedmsmith Mar 3, 2023
e08bdbe
Delete concise-swid-tag.cddl
nedmsmith Mar 3, 2023
79b9dac
Create conditional-endorsement-series-triple-record.cddl
nedmsmith Mar 3, 2023
3d71d24
Create conditional-endorsement-triple-record.cddl
nedmsmith Mar 3, 2023
011a277
Delete conditional-reference-series-triple-record.cddl
nedmsmith Mar 3, 2023
e46f51e
Create conditional-series-record.cddl
nedmsmith Mar 3, 2023
ebf6f66
Update corim-frags.mk
nedmsmith Mar 3, 2023
c482712
Delete comid-4.diag
nedmsmith Mar 3, 2023
937c26c
Create comid-cend.diag
nedmsmith Mar 3, 2023
d9d4fc3
Create comid-series.diag
nedmsmith Mar 3, 2023
47eba1b
Create stateful-environment-record.cddl
nedmsmith Mar 3, 2023
d9fb28b
Update triples-map.cddl
nedmsmith Mar 3, 2023
c663f7d
Update draft-ietf-rats-corim.md
nedmsmith Mar 3, 2023
6b2409a
Update comid-cend.diag
nedmsmith Mar 3, 2023
9cd3767
Update comid-series.diag
nedmsmith Mar 3, 2023
fabbdd8
Update cddl/conditional-endorsement-series-triple-record.cddl
nedmsmith Mar 3, 2023
cbe7efb
Update cddl/triples-map.cddl
nedmsmith Mar 3, 2023
df93cb3
Update draft-ietf-rats-corim.md
nedmsmith Mar 3, 2023
3dc1aa9
Update cddl/conditional-series-record.cddl
nedmsmith Mar 3, 2023
90b779f
Update cddl/triples-map.cddl
thomas-fossati Mar 3, 2023
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
5 changes: 4 additions & 1 deletion cddl/comid-frags.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ COMID_FRAGS += class-map.cddl
COMID_FRAGS += comid-entity-map.cddl
COMID_FRAGS += comid-role-type-choice.cddl
COMID_FRAGS += concise-mid-tag.cddl
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not related to this PR, just noting this duplicates L1

COMID_FRAGS += conditional-reference-series-triple-record.cddl
COMID_FRAGS += conditional-endorsement-series-triple-record.cddl
COMID_FRAGS += conditional-endorsement-triple-record.cddl
COMID_FRAGS += conditional-series-record.cddl
COMID_FRAGS += coswid-triple-record.cddl
COMID_FRAGS += crypto-key-type-choice.cddl
COMID_FRAGS += domain-dependency-triple-record.cddl
Expand All @@ -29,6 +31,7 @@ COMID_FRAGS += non-empty.cddl
COMID_FRAGS += oid.cddl
COMID_FRAGS += raw-value.cddl
COMID_FRAGS += reference-triple-record.cddl
COMID_FRAGS += stateful-environment-record.cddl
COMID_FRAGS += svn-type-choice.cddl
COMID_FRAGS += tag-id-type-choice.cddl
COMID_FRAGS += tag-identity-map.cddl
Expand Down
279 changes: 0 additions & 279 deletions cddl/concise-swid-tag.cddl

This file was deleted.

5 changes: 5 additions & 0 deletions cddl/conditional-endorsement-series-triple-record.cddl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
conditional-endorsement-series-triple-record = [
stateful-environment-record
; order matters: the first matching record wins and halts matching
[ + conditional-series-record ]
]
5 changes: 5 additions & 0 deletions cddl/conditional-endorsement-triple-record.cddl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
conditional-endorsement-triple-record = [
stateful-environment-record,
; endorsed values
measurement-values-map
]
19 changes: 0 additions & 19 deletions cddl/conditional-reference-series-triple-record.cddl

This file was deleted.

6 changes: 6 additions & 0 deletions cddl/conditional-series-record.cddl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
conditional-series-record = [
; reference values to be matched against evidence
refv: measurement-values-map
; endorsed values that apply in case revf matches
endv: measurement-values-map
]
5 changes: 4 additions & 1 deletion cddl/corim-frags.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ CORIM_FRAGS += comid-entity-map.cddl
CORIM_FRAGS += comid-role-type-choice.cddl
CORIM_FRAGS += concise-mid-tag.cddl
CORIM_FRAGS += concise-tag-type-choice.cddl
CORIM_FRAGS += conditional-reference-series-triple-record.cddl
CORIM_FRAGS += conditional-endorsement-series-triple-record.cddl
CORIM_FRAGS += conditional-endorsement-triple-record.cddl
CORIM_FRAGS += conditional-series-record.cddl
CORIM_FRAGS += corim-entity-map.cddl
CORIM_FRAGS += corim-id-type-choice.cddl
CORIM_FRAGS += corim-locator-map.cddl
Expand Down Expand Up @@ -42,6 +44,7 @@ CORIM_FRAGS += protected-corim-header-map.cddl
CORIM_FRAGS += raw-value.cddl
CORIM_FRAGS += reference-triple-record.cddl
CORIM_FRAGS += signed-corim.cddl
CORIM_FRAGS += stateful-environment-record.cddl
CORIM_FRAGS += svn-type-choice.cddl
CORIM_FRAGS += tag-id-type-choice.cddl
CORIM_FRAGS += tag-identity-map.cddl
Expand Down
Loading