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

Allow mkey tstr #325

Merged
merged 3 commits into from
Oct 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
34 changes: 33 additions & 1 deletion cddl/examples/comid-3.diag
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,41 @@
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'ABCDEF00' ]]
}
},
/ measurement-map / {
/ comid.mkey / 0: "my_element",
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'00FEDCBA' ]]
}
},
/ measurement-map / {
/ comid.mkey / 0: 111( h'5502C001' ),
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'00FEDCBA' ]]
}
},
/ measurement-map / {
/ comid.mkey / 0: 37( h'67b28b6c34cc40a19117ab5b05911e38' ),
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'00FEDCBA' ]]
}
},
/ measurement-map / {
/ anonymous mkey /
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'11223344' ]]
}
}
]
]
]
}
}
}
1 change: 1 addition & 0 deletions cddl/measured-element-type-choice.cddl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
$measured-element-type-choice /= tagged-oid-type
$measured-element-type-choice /= tagged-uuid-type
$measured-element-type-choice /= uint
$measured-element-type-choice /= tstr
2 changes: 1 addition & 1 deletion draft-ietf-rats-corim.md
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ The following describes each member of the `measurement-map`:
###### Measurement Keys {#sec-comid-mkey}

Measurement keys are locally scoped extensible identifiers.
The initial types defined are OID, UUID, and uint.
The initial types defined are OID, UUID, uint, and tstr.
`mkey` may be necessary to disambiguate multiple measurements of the same type or to distinguish multiple measured elements within the same environment.
A single anonymous `measurement-map` is allowed within the same environment.
Two or more measurement-map entries within the same environment MUST populate `mkey`.
Expand Down