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

Drop top level tagging requirement #337

Merged
merged 21 commits into from
Jan 22, 2025
Merged

Drop top level tagging requirement #337

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
df8efb2
Drop top level tagging requirement
deeglaze Oct 23, 2024
630b205
Update corim.cddl
nedmsmith Oct 23, 2024
fc033f8
Change tags and content type to match errata1
deeglaze Dec 18, 2024
d401fbf
Fix CoRIM examples with CDDL changes.
deeglaze Dec 18, 2024
ae65445
Create signed example in Makefile.
deeglaze Dec 18, 2024
e11242b
Remove signing from Makefile
deeglaze Dec 18, 2024
cfba300
Merge branch 'topleveltag' of https://github.com/deeglaze/draft-ietf-…
nedmsmith Jan 7, 2025
7e53fda
Change tags and content type to match errata1
deeglaze Dec 18, 2024
2f9134d
Fix CoRIM examples with CDDL changes.
deeglaze Dec 18, 2024
f1c8825
Create signed example in Makefile.
deeglaze Dec 18, 2024
c32e13d
Remove signing from Makefile
deeglaze Dec 18, 2024
20c5222
Add rim+cose with CoAP registration and magic numbers
deeglaze Jan 21, 2025
ad14823
merged conflicts
nedmsmith Jan 21, 2025
28b18d6
Update draft-ietf-rats-corim.md
nedmsmith Jan 21, 2025
dd3a302
Update cddl/examples/payload-corim-4.diag
deeglaze Jan 22, 2025
7ed8759
Remove spurious cbor-tags addition.
deeglaze Jan 22, 2025
2012592
Update rim+cose application copypasta
deeglaze Jan 22, 2025
004c1f2
Update +cose magic number to #6.18, 4-elm array
deeglaze Jan 22, 2025
d23f325
Update draft-ietf-rats-corim.md
yogeshbdeshpande Jan 22, 2025
e216475
Update draft-ietf-rats-corim.md
yogeshbdeshpande Jan 22, 2025
efe9950
Merge branch 'main' into topleveltag
yogeshbdeshpande Jan 22, 2025
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
18 changes: 18 additions & 0 deletions cddl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,24 @@ CLEANFILES += $(3:.diag=.pretty)

endef # cddl_check_template

# Commented since CI doesn't have openssl
#examples/sig-structure.diag: examples/sig-structure.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
# payload="$$(cat examples/payload-corim-4.diag)" \
# protected="$$(cat examples/protected-header-map.diag)" \
# envsubst < examples/sig-structure.diag.tmpl > examples/sig-structure.diag

#examples/testkey.pem:
# openssl ecparam -name secp384r1 -genkey -noout -out examples/testkey.pem

#examples/corim-4.sig: examples/sig-structure.cbor examples/testkey.pem
# openssl dgst -sha384 -sign examples/testkey.pem -out examples/corim-4.sig examples/sig-structure.cbor

#examples/corim-4.diag: examples/corim-4.sig examples/corim-4.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
# payload="$$(cat examples/payload-corim-4.diag)" \
# protected="$$(cat examples/protected-header-map.diag)" \
# signature="h'$$(cat examples/corim-4.sig | xxd -p -c 128)'" \
# envsubst < examples/corim-4.diag.tmpl > examples/corim-4.diag

thomas-fossati marked this conversation as resolved.
Show resolved Hide resolved
include corim-frags.mk

$(eval $(call cddl_check_template,comid,$(COMID_FRAGS),$(COMID_EXAMPLES)))
Expand Down
3 changes: 1 addition & 2 deletions cddl/cbor-tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
tagged-concise-rim-type-choice = #6.500($concise-rim-type-choice)
tagged-corim-map = #6.501(corim-map)
tagged-signed-corim = #6.502(signed-corim)
tagged-concise-swid-tag = #6.505(bytes .cbor concise-swid-tag)
tagged-concise-mid-tag = #6.506(bytes .cbor concise-mid-tag)
tagged-concise-bom-tag = #6.508(bytes .cbor concise-bom-tag)
Expand All @@ -16,3 +14,4 @@ tagged-cert-thumbprint-type = #6.559(digest)
tagged-bytes = #6.560(bytes)
tagged-cert-path-thumbprint-type = #6.561(digest)
tagged-pkix-asn1der-cert-type = #6.562(bstr)

2 changes: 0 additions & 2 deletions cddl/corim-frags.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ CORIM_FRAGS += profile-type-choice.cddl
CORIM_FRAGS += protected-corim-header-map.cddl
CORIM_FRAGS += signed-corim.cddl
CORIM_FRAGS += tagged-corim-map.cddl
CORIM_FRAGS += tagged-concise-rim-type-choice.cddl
CORIM_FRAGS += tagged-signed-corim.cddl
CORIM_FRAGS += tagged-concise-swid-tag.cddl
CORIM_FRAGS += tagged-concise-mid-tag.cddl
CORIM_FRAGS += tagged-concise-bom-tag.cddl
Expand Down
6 changes: 3 additions & 3 deletions cddl/corim.cddl
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion cddl/cose-sign1-corim.cddl
View file
Open in desktop
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
]
90 changes: 44 additions & 46 deletions cddl/examples/corim-1.diag
View file
Open in desktop
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'
] ]
}
}
]
] ]
}
}
]
] ]
}
>> )
]
}
)
}
>> )
]
}
)
187 changes: 93 additions & 94 deletions cddl/examples/corim-2.diag
View file
Open in desktop
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)
}
}
]
] ]
}
>> )
]
}
)
}
>> )
]
}
)

Loading
Loading