Skip to content

Commit

Permalink
fixed CDDL duplicate value: supplemental
Browse files Browse the repository at this point in the history
  • Loading branch information
david-waltermire committed Aug 27, 2019
1 parent db71a87 commit d4aa746
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
14 changes: 7 additions & 7 deletions concise-swid-tag.cddl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concise-swid-tag = {
entity => entity-entry / [ 2* entity-entry ],
? link => link-entry / [ 2* link-entry ],
? (( payload => payload-entry ) // ( evidence => evidence-entry )),
* $$coswid-extension
* $$coswid-extension
}

any-uri = text
Expand Down Expand Up @@ -63,15 +63,15 @@ link-entry = {
rel => $rel,
? media-type => text,
? use => $use,
* $$link-extension
* $$link-extension
}

$ownership /= shared
$ownership /= private
$ownership /= abandon
$ownership /= uint / text

$rel /= ancestor
$rel /= ancestor
$rel /= component
$rel /= feature
$rel /= installationmedia
Expand All @@ -81,7 +81,7 @@ $rel /= patches
$rel /= requires
$rel /= see-also
$rel /= supersedes
$rel /= supplemental
$rel /= supplements
$rel /= uint / text

$use /= optional
Expand Down Expand Up @@ -159,15 +159,15 @@ filesystem-item = (
payload-entry = {
global-attributes,
resource-collection,
* $$payload-extension
* $$payload-extension
}

evidence-entry = {
global-attributes,
resource-collection,
? date => time,
? device-id => text,
* $$evidence-extension
* $$evidence-extension
}

; "global map member" integer indexes
Expand Down Expand Up @@ -259,7 +259,7 @@ patches=7
requires=8
see-also=9
supersedes=10
supplemental=11
supplements=11

; "use" integer indexes
optional=1
Expand Down
9 changes: 4 additions & 5 deletions draft-ietf-sacm-coswid.md
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ $rel /= patches
$rel /= requires
$rel /= see-also
$rel /= supersedes
$rel /= supplemental
$rel /= supplements
$rel /= uint / text
ancestor=1
component=2
Expand All @@ -577,7 +577,7 @@ patches=7
requires=8
see-also=9
supersedes=10
supplemental=11
supplements=11

$use /= optional
$use /= required
Expand Down Expand Up @@ -978,7 +978,7 @@ The following table indicates the index value to use for the link-entry group's
| 8 | requires | The link references a prerequisite for installing this software. A patch SWID/CoSWID tag (see {{intro-lifecycle}}) can use this to represent base software or another patch that needs to be installed first.
| 9 | see-also | The link references other software that may be of interest that relates to this software.
| 10 | supersedes | The link references another software that this software replaces. A patch SWID/CoSWID tag (see {{intro-lifecycle}}) can use this to represent another patch that this patch incorporates or replaces.
| 11 | supplemental | The link references a SWID/CoSWID tag that this tag supplements. Used on supplemental SWID/CoSWID tags (see {{intro-lifecycle}}).
| 11 | supplements | The link references a SWID/CoSWID tag that this tag supplements. Used on supplemental SWID/CoSWID tags (see {{intro-lifecycle}}).
{: #tbl-indexed-link-rel-values title="Link Relationship Values"}

The values above are registered in the IANA "SWID/CoSWID Link Relationship Value" registry defined in section {{iana-link-rel}}. Additional values will likely be registered over time. Additionally, the index values 32768 through 65535 and the name prefix "x_" have been reserved for private use.
Expand Down Expand Up @@ -1267,7 +1267,7 @@ defined in {{SWID}}.
| 8 | requires | See {{indexed-link-rel}}
| 9 | see-also | See {{indexed-link-rel}}
| 10 | supersedes | See {{indexed-link-rel}}
| 11 | supplemental | See {{indexed-link-rel}}
| 11 | supplements | See {{indexed-link-rel}}
| 12-65535 | Unassigned |
{: #tbl-iana-link-rel-values title="CoSWID Link Relationship Inital Registrations"}

Expand Down Expand Up @@ -1660,4 +1660,3 @@ Additionally, the COSE Header counter signature MAY be used as an attribute in t

<!-- LocalWords: SWID verifier TPM filesystem discoverable
-->

0 comments on commit d4aa746

Please sign in to comment.