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

remove extra b64u wrapping for JSON in CBOR #17

Merged
merged 1 commit into from
Feb 3, 2025
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
10 changes: 5 additions & 5 deletions cddl/eat-plug.cddl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
mc-cbor = bstr .cbor measured-component
mc-json = tstr .json measured-component
mc-cbor = bytes .cbor measured-component
mc-json = text .json measured-component

; EAT CBOR (`.feature "cbor"`)
$measurements-body-cbor /= mc-cbor ; native
$measurements-body-cbor /= tstr .b64u mc-json ; tunnel
$measurements-body-cbor /= mc-cbor ; native
$measurements-body-cbor /= mc-json ; tunnel

; EAT JSON (`.feature "json"`)
$measurements-body-json /= mc-json ; native
$measurements-body-json /= tstr .b64u mc-cbor ; tunnel
$measurements-body-json /= text .b64u mc-cbor ; tunnel
2 changes: 1 addition & 1 deletion draft-ietf-rats-eat-measured-component.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Note the use of the "native" and "tunnel" formats from {{fig-eat-plug}}, and how
| `content-type` (CoAP C-F equivalent) | `content-format` |
|--|--|
| `application/measured-component+cbor` | `mc-cbor` |
| `application/measured-component+json` | `tstr .b64u mc-json` |
| `application/measured-component+json` | `mc-json` |
{: #tab-mf-cbor title="measurement-format for EAT CWT"}

## `measurements-format` for JSON EAT
Expand Down