-
Notifications
You must be signed in to change notification settings - Fork 6
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
Drop top level tagging requirement #337
Open
deeglaze
wants to merge
12
commits into
ietf-rats-wg:main
Choose a base branch
from
deeglaze:topleveltag
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
df8efb2
Drop top level tagging requirement
deeglaze 630b205
Update corim.cddl
nedmsmith fc033f8
Change tags and content type to match errata1
deeglaze d401fbf
Fix CoRIM examples with CDDL changes.
deeglaze ae65445
Create signed example in Makefile.
deeglaze e11242b
Remove signing from Makefile
deeglaze cfba300
Merge branch 'topleveltag' of https://github.com/deeglaze/draft-ietf-…
nedmsmith 89e5419
Update cbor-tags.txt
deeglaze 6e77393
Update corim-4.diag
deeglaze a4c2f02
Update payload-corim-4.diag
deeglaze 9dc0fa8
Update draft-ietf-rats-corim.md
deeglaze 67aaaa4
Update draft-ietf-rats-corim.md
deeglaze File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| corim = tagged-concise-rim-type-choice | ||
| corim = concise-rim-type-choice | ||
|
|
||
| $concise-rim-type-choice /= tagged-corim-map | ||
| $concise-rim-type-choice /= tagged-signed-corim | ||
| concise-rim-type-choice /= tagged-corim-map | ||
| concise-rim-type-choice /= signed-corim |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| COSE-Sign1-corim = [ | ||
| protected: bstr .cbor protected-corim-header-map | ||
| unprotected: unprotected-corim-header-map | ||
| payload: bstr .cbor (tagged-corim-map / corim-map) | ||
| payload: bstr .cbor tagged-corim-map | ||
| signature: bstr | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,47 @@ | ||
| / corim / 500( | ||
| / corim-map / 501({ | ||
| / corim.id / 0 : h'284e6c3e5d9f4f6b851f5a4247f243a7', | ||
| / corim.tags / 1 : [ | ||
| / concise-mid-tag / 506( << | ||
| / concise-mid-tag / { | ||
| / comid.tag-identity / 1 : { | ||
| / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f' | ||
| }, | ||
| / comid.entity / 2 : [ { | ||
| / comid.entity-name / 0 : "ACME Inc.", | ||
| / comid.reg-id / 1 : 32("https://acme.example"), | ||
| / comid.role / 2 : [ 0 ] / tag-creator / | ||
| } ], | ||
| / comid.triples / 4 : { | ||
| / comid.reference-triples / 0 : [ [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner", | ||
| / comid.layer / 3 : 1 | ||
| / tagged-corim-map / 501({ | ||
| / corim.id / 0 : h'284e6c3e5d9f4f6b851f5a4247f243a7', | ||
| / corim.tags / 1 : [ | ||
| / concise-mid-tag / 506( << | ||
| / concise-mid-tag / { | ||
| / comid.tag-identity / 1 : { | ||
| / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f' | ||
| }, | ||
| / comid.entity / 2 : [ { | ||
| / comid.entity-name / 0 : "ACME Inc.", | ||
| / comid.reg-id / 1 : 32("https://acme.example"), | ||
| / comid.role / 2 : [ 0 ] / tag-creator / | ||
| } ], | ||
| / comid.triples / 4 : { | ||
| / comid.reference-triples / 0 : [ [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner", | ||
| / comid.layer / 3 : 1 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.ver / 0 : { | ||
| / comid.version / 0 : "1.0.0", | ||
| / comid.version-scheme / 1 : 16384 / semver / | ||
| }, | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b' | ||
| ] ] | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.ver / 0 : { | ||
| / comid.version / 0 : "1.0.0", | ||
| / comid.version-scheme / 1 : 16384 / semver / | ||
| }, | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b' | ||
| ] ] | ||
| } | ||
| } | ||
| ] | ||
| ] ] | ||
| } | ||
| } | ||
| ] | ||
| ] ] | ||
| } | ||
| >> ) | ||
| ] | ||
| } | ||
| ) | ||
| } | ||
| >> ) | ||
| ] | ||
| } | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,115 +1,114 @@ | ||
| / corim / 500( | ||
| / corim-map / 501({ | ||
| / corim.id / 0 : h'284e6c3e5d9f4f6b851f5a4247f243a7', | ||
| / corim.tags / 1 : [ | ||
| / concise-mid-tag / 506( << | ||
| / concise-mid-tag / { | ||
| / comid.tag-identity / 1 : { | ||
| / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f' | ||
| }, | ||
| / comid.entity / 2 : [ { | ||
| / comid.entity-name / 0 : "ACME Inc.", | ||
| / comid.reg-id / 1 : 32("https://acme.example"), | ||
| / comid.role / 2 : [ 0 ] / tag-creator / | ||
| } ], | ||
| / comid.triples / 4 : { | ||
| / comid.reference-triples / 0 : [ | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner Firmware", | ||
| / comid.layer / 3 : 1 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b' | ||
| ] ] | ||
| } | ||
| } | ||
| ] | ||
| ], | ||
| / tagged-corim-map / 501({ | ||
| / corim.id / 0 : h'284e6c3e5d9f4f6b851f5a4247f243a7', | ||
| / corim.tags / 1 : [ | ||
| / concise-mid-tag / 506( << | ||
| / concise-mid-tag / { | ||
| / comid.tag-identity / 1 : { | ||
| / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f' | ||
| }, | ||
| / comid.entity / 2 : [ { | ||
| / comid.entity-name / 0 : "ACME Inc.", | ||
| / comid.reg-id / 1 : 32("https://acme.example"), | ||
| / comid.role / 2 : [ 0 ] / tag-creator / | ||
| } ], | ||
| / comid.triples / 4 : { | ||
| / comid.reference-triples / 0 : [ | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner Firmware", | ||
| / comid.layer / 3 : 1 | ||
| } | ||
| }, | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'a71b3e388d454a0581f352e58c832c5c' | ||
| ), | ||
| / comid.vendor / 1 : "WYLIE Inc.", | ||
| / comid.model / 2 : "WYLIE Coyote Trusted OS", | ||
| / comid.layer / 3 : 2, | ||
| / comid.index / 4 : 0 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0' | ||
| ] ] | ||
| } | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b' | ||
| ] ] | ||
| } | ||
| ] | ||
| ], | ||
| } | ||
| ] | ||
| ], | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'a71b3e388d454a0581f352e58c832c5c' | ||
| ), | ||
| / comid.vendor / 1 : "WYLIE Inc.", | ||
| / comid.model / 2 : "WYLIE Coyote Trusted OS", | ||
| / comid.layer / 3 : 2, | ||
| / comid.index / 4 : 0 | ||
| } | ||
| }, | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'a71b3e388d454a0581f352e58c832c5c' | ||
| ), | ||
| / comid.vendor / 1 : "WYLIE Inc.", | ||
| / comid.model / 2 : "WYLIE Coyote Trusted OS", | ||
| / comid.layer / 3 : 2, | ||
| / comid.index / 4 : 1 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0' | ||
| ] ] | ||
| } | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0' | ||
| ] ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| ], | ||
| / comid.endorsed-triples / 1 : [ [ | ||
| [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| h'a71b3e388d454a0581f352e58c832c5c' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner Root of Trust", | ||
| / comid.layer / 3 : 0 | ||
| / comid.vendor / 1 : "WYLIE Inc.", | ||
| / comid.model / 2 : "WYLIE Coyote Trusted OS", | ||
| / comid.layer / 3 : 2, | ||
| / comid.index / 4 : 1 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.svn / 1 : 552(1) | ||
| / comid.digests / 2 : [ [ | ||
| / hash-alg-id / 1, / sha256 / | ||
| / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0' | ||
| ] ] | ||
| } | ||
| } | ||
| ] | ||
| ] ] | ||
| } | ||
| ] | ||
| ], | ||
| / comid.endorsed-triples / 1 : [ [ | ||
| / environment-map / { | ||
| / comid.class / 0 : { | ||
| / comid.class-id / 0 : | ||
| / tagged-uuid-type / 37( | ||
| h'67b28b6c34cc40a19117ab5b05911e37' | ||
| ), | ||
| / comid.vendor / 1 : "ACME Inc.", | ||
| / comid.model / 2 : "ACME RoadRunner Root of Trust", | ||
| / comid.layer / 3 : 0 | ||
| } | ||
| }, | ||
| [ | ||
| / measurement-map / { | ||
| / comid.mval / 1 : { | ||
| / comid.svn / 1 : 552(1) | ||
| } | ||
| } | ||
| ] | ||
| ] ] | ||
| } | ||
| >> ) | ||
| ] | ||
| } | ||
| ) | ||
| } | ||
| >> ) | ||
| ] | ||
| } | ||
| ) | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This bit is important: we need complete, signed examples too.
Please make this conditional instead.
I suggest adding a check for the
opensslCLI incddl/tools.mkand then a correspondingifeq ($(strip $(openssl)),)here.(You probably need a check for
envsubsttoo.)Besides, add the autogenerated files to the
CLEANFILESvariable.PS: maybe this is worth a separate PR.