top-level MC as map

Fix #14

Signed-off-by: Thomas Fossati <[email protected]>

cddl/eat-ex1.diag

@@ -3,26 +3,26 @@
     [
       65000, / using a CoAP C-F from the experimental range /
       <<
-        [
-          / id / [
+        {
+          / id / 1: [
             / name / "boot loader X",
             / version / [
               "1.2.3rc2",
               16384 / semver /
             ]
           ],
-          / measurement / [
+          / measurement / 2: [
             / alg / "sha-256",
             / val / h'3996003d486fb91ffb056f7d03f2b2992b215b31db
                       e7af4b373431fc7d319da3'
           ],
-          / signers / [
+          / signers / 3: [
             h'492e9b676c21f6012b1ceeb9032feb4141a880797355f66750
               15ec59c51ca1ec',
             h'4277bb97ba7b51577a0d38151d3e08b40bdf946753f5b5bdeb
               814d6ff57a8a5e'
           ]
-        ]
+        }
       >>
     ]
   ]

cddl/ex1.diag

@@ -1,20 +1,20 @@
-[
-  / id / [
+{
+  / id / 1: [
     / name / "boot loader X",
     / version / [
       "1.2.3rc2",
       16384 / semver /
     ]
   ],
-  / measurement / [
+  / measurement / 2: [
     / alg / "sha-256",
     / val / h'3996003d486fb91ffb056f7d03f2b2992b215b31dbe7af4b37
               3431fc7d319da3'
   ],
-  / signers / [
+  / signers / 3: [
     h'492e9b676c21f6012b1ceeb9032feb4141a880797355f6675015ec59c5
       1ca1ec',
     h'4277bb97ba7b51577a0d38151d3e08b40bdf946753f5b5bdeb814d6ff5
       7a8a5e'
   ]
-]
+}

cddl/mc.cddl

@@ -1,7 +1,7 @@
 ;# import digest from RFCYYYY as corim
 
-measured-component = [
-  id:           component-id
-  measurement:  corim.digest
-  ? signers:    [ + signer-type ]
-]
+measured-component = {
+  &(id: 1) => component-id
+  &(measurement: 2) => corim.digest
+  ? &(signers: 3) => [ + signer-type ]
+}

cddl/measured-component.cddlc

@@ -1,8 +1,8 @@
-measured-component = [
-  id:           component-id
-  measurement:  corim.digest
-  ? signers:    [ + signer-type ]
-]
+measured-component = {
+  &(id: 1) => component-id
+  &(measurement: 2) =>  corim.digest
+  ? &(signers: 3) => [ + signer-type ]
+}
 
 signer-type = bytes
 

draft-ietf-rats-eat-measured-component.md

@@ -116,13 +116,13 @@ The data model is inspired by the "PSA software component" claim ({{Section 4.4.
 ~~~
 
 {:vspace}
-`id`
+`id (index 1)`
 : The measured component identifier encoded according to the format described in {{component-id}}.
 
-`measurement`
+`measurement (index 2)`
 : Digest value and algorithm, encoded using CoRIM digest format ({{Section 1.3.8 of -corim}}).
 
-`signers`
+`signers (index 3)`
 : One or more signing entities, see {{signer}}.
 
 ### Component Identifier {#component-id}