Inconcistencies, markdown usage

check-cddl.sh

@@ -0,0 +1,3 @@
+kdrfc -3 draft-ietf-sacm-coswid.md
+LANG=C xpath draft-ietf-sacm-coswid.xml "//sourcecode[@type='CDDL']/text()" >.extracted.cddl
+cddl .extracted.cddl g

concise-swid-tag.cddl

@@ -38,7 +38,7 @@ global-attributes = (
   * any-attribute,
 )
 
-hash-entry = [ 
+hash-entry = [
   hash-alg-id: int,
   hash-value: bytes,
 ]
@@ -68,7 +68,7 @@ link-entry = {
   rel => $rel,
   ? media-type => text,
   ? use => $use,
-  * $$link-extension
+  * $$link-extension,
   global-attributes,
 }
 
@@ -172,7 +172,7 @@ evidence-entry = {
   resource-collection,
   ? date => integer-time,
   ? device-id => text,
-  * $$evidence-extension, 
+  * $$evidence-extension,
   global-attributes,
 }
 

draft-ietf-sacm-coswid.md

@@ -54,7 +54,6 @@ author:
 normative:
   BCP26: RFC8126
   BCP178: RFC6648
-  RFC2119:
   RFC3629:
   RFC3986:
   RFC5198:
@@ -473,7 +472,7 @@ The CDDL for the global-attributes follows:
 
 ~~~ CDDL
 global-attributes = (
-  ? lang,
+  ? lang => text,
   * any-attribute,
 )
 
@@ -768,21 +767,22 @@ filesystem-item = (
   ? location => text,
   fs-name => text,
   ? root => text,
-  global-attributes,
 )
 
 file-entry = {
   filesystem-item,
-  ? size => integer,
+  ? size => uint,
   ? file-version => text,
   ? hash => hash-entry,
   * $$file-extension,
+  global-attributes,
 }
 
 directory-entry = {
   filesystem-item,
-  path-elements => { path-elements-group },
+  ? path-elements => { path-elements-group },
   * $$directory-extension,
+  global-attributes,
 }
 
 process-entry = {
@@ -887,7 +887,7 @@ The CDDL for the evidence-entry map follows:
 ~~~ CDDL
 evidence-entry = {
   resource-collection,
-  ? date => time,
+  ? date => integer-time,
   ? device-id => text,
   * $$evidence-extension,
   global-attributes,
@@ -917,10 +917,9 @@ In order to create a valid CoSWID document the structure of the corresponding CB
 adhere to the following CDDL specification.
 
 ~~~ CDDL
-<CODE BEGINS>
 {::include concise-swid-tag.cddl}
-<CODE ENDS>
 ~~~
+{: markers="true"}
 
 {: #semantics-tag-type}
 # Determining the Type of CoSWID
@@ -1519,18 +1518,16 @@ The ISO-19770-2:2015 XML schema uses XML DSIG to support cryptographic signature
 Signing CoSWID tags follows the procedues defined in CBOR Object Signing and Encryption {{RFC8152}}. A CoSWID tg MUST be wrapped in a COSE Single Signer Data Object (COSE_Sign1) that contains a single signature and MUST be signed by the tag creator. The following CDDL specification defines a restrictive subset of COSE header parameters that MUST be used in the protected header.
 
 ~~~~ CDDL
-<CODE BEGINS>
 {::include signed-coswid.cddl}
-<CODE ENDS>
 ~~~~
+{: markers="true"}
 
 The COSE_Sign structure that allows for more than one signature to be applied to a CoSWID tag MAY be used. The corresponding usage scenarios are domain-specific and require well-specified application guidance.
 
 ~~~~ CDDL
-<CODE BEGINS>
 {::include signed-coswid_sign.cddl}
-<CODE ENDS>
 ~~~~
+{: markers="true"}
 
 Additionally, the COSE Header counter signature MAY be used as an attribute in the unprotected header map of the COSE envelope of a CoSWID. The application of counter signing enables second parties to provide a signature on a signature allowing for a proof that a signature existed at a given time (i.e., a timestamp).