Skip to content

Commit

Permalink
Merge pull request #454 from ietf-rats-wg/unsuit
Browse files Browse the repository at this point in the history
Remove suit manifests; get ready to publish draft 26
  • Loading branch information
gmandyam committed May 5, 2024
2 parents 45891cb + aa22f36 commit d7be8b1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 20 deletions.
1 change: 0 additions & 1 deletion cddl/CDDL-FRAGS.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ CBOR_EXTERNAL_CDDL_FRAGS += external/cwt.cddl
CBOR_EXTERNAL_CDDL_FRAGS += external/concise-swid-tag.cddl
CBOR_EXTERNAL_CDDL_FRAGS += external/coswid-tag-stub.cddl
CBOR_EXTERNAL_CDDL_FRAGS += external/cose-stub.cddl
CBOR_EXTERNAL_CDDL_FRAGS += external/draft-ietf-suit-manifest.cddl
# TODO: remove this or such...
CBOR_EXTERNAL_CDDL_FRAGS += external/uccs.cddl

Expand Down
5 changes: 0 additions & 5 deletions cddl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,3 @@ external/concise-swid-tag.cddl: ; (cd external ; $(curl) -O $(COSWID_REPO_URL)/c
CLEANFILES += external/concise-swid-tag.cddl


# ---- Pull in the SUIT Manifest CDDL
SUIT_REPO := suit-wg/manifest-spec/master
SUIT_REPO_URL := $(join $(GITHUB), $(SUIT_REPO))
external/draft-ietf-suit-manifest.cddl: ; (cd external; $(curl) -O $(SUIT_REPO_URL)/draft-ietf-suit-manifest.cddl )
CLEANFILES += external/draft-ietf-suit-manifest.cddl
7 changes: 0 additions & 7 deletions cddl/manifests.cddl
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,3 @@ manifest-format = [
$manifest-body-cbor /= bytes .cbor untagged-coswid
$manifest-body-json /= base64-url-text


; A SUIT manifest is always CBOR, so the same is done for it as is
; done for a CoSWID.

$manifest-body-cbor /= bytes .cbor SUIT_Envelope
$manifest-body-json /= base64-url-text

14 changes: 7 additions & 7 deletions draft-ietf-rats-eat.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ normative:
target: https://pen.iana.org/pen/PenApplication.page
title: Private Enterprise Number (PEN) Request

SUIT.Manifest: I-D.ietf-suit-manifest

IANA.cbor-tags:


Expand Down Expand Up @@ -936,8 +934,6 @@ In some cases EAT submodules may be used instead of the array structure in this
A CoSWID manifest MUST be a payload CoSWID, not an evidence CoSWID.
These are defined in {{RFC9393}}.

A Software Updates for Internet of Things (SUIT) Manifest {{SUIT.Manifest}} may be used.

This claim is extensible for use of manifest formats beyond those mentioned in this document.
No particular manifest format is preferred.
For manifest interoperability, an EAT profile as defined in {{profiles}}, should be used to specify which manifest format(s) are allowed.
Expand Down Expand Up @@ -1447,7 +1443,7 @@ A profile may constrain the definition of claims that are defined in this docume
For example, a profile may require the EAT nonce be a certain length or the "location" claim always include the altitude.

Some claims are "pluggable" in that they allow different formats for their content.
The "manifests" claim ({{manifests}}) along with the measurement and "measurements" ({{measurements}}) claims are examples of this, allowing the use of CoSWID, SUIT Manifest and other formats.
The "manifests" claim ({{manifests}}) along with the measurement and "measurements" ({{measurements}}) claims are examples of this, allowing the use of CoSWID and other formats.
A profile should specify which formats are allowed to be sent, with the assumption that the corresponding CoAP content types have been registered.
A profile should require the receiver to accept all formats that are allowed to be sent.

Expand Down Expand Up @@ -2545,8 +2541,12 @@ The following is a list of known changes since the immediately previous drafts.
non-authoritative. It is meant to help reviewers see the significant
differences. A comprehensive history is available via the IETF Datatracker's record for this document.

## From draft-ietf-rats-eat-25
- Change SUIT Manifest reference back to normative
## From draft-ietf-rats-eat-24
The changes from draft-24, not draft 25, are listed here as draft-24 is what was accepted after IETF last call and draft-25 was kind of a false start.

- Address some small claim data type naming issues that came to light when IANA completed the registrations requested by this document. In particular, the CDDL type names are used.

- Remove all dependence on SUIT Manifest to break schedule interlock with RFC Editor. Use of SUIT-Manifest is peripheral to the core of EAT. It was mostly a content type pre-registration. The modification consisted of the removal of one sentence, a few more words and two lines of CDDL.

--- contributor

Expand Down

0 comments on commit d7be8b1

Please sign in to comment.