revert intrep-ect.cddl

Signed-off-by: Thomas Fossati <[email protected]>
ietf-rats-wg · Dec 11, 2024 · e3e5bb2 · e3e5bb2
1 parent 4759649
commit e3e5bb2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/cddl/examples/intrep-1.diag b/cddl/examples/intrep-1.diag
@@ -1,4 +1,4 @@
 / ECT / {
-  / cmtype / 3 : 2
+  "cmtype" : 2
 }
 
diff --git a/cddl/examples/intrep-2.diag b/cddl/examples/intrep-2.diag
@@ -1,9 +1,9 @@
 / ECT / {
-  / environment-map / 0 : {
+  "environment" : {
     / class / 0 : {
       / class-id / 0 :
         / tagged-uuid-type / 37( h'67b28b6c34cc40a19117ab5b05911e37' )
     }
   },
-  / cmtype / 3 : 1
+  "cmtype" : 1
 }
diff --git a/cddl/examples/intrep-3.diag b/cddl/examples/intrep-3.diag
@@ -1,13 +1,13 @@
 / ECT / {
-  / environment-map / 0 : {
+  "environment" : {
     / class / 0 : {
       / class-id / 0 :
         / tagged-uuid-type / 37( h'67b28b6c34cc40a19117ab5b05911e37' )
     }
   },
-  / element-list / 1 : [
+  "element-list" : [
     / element-map / {
-      / element-claims / 1 : {
+      "element-claims" : {
         / ver / 0 : {
           / version / 0 : "1.0.0"
         },
@@ -28,5 +28,5 @@
       }
     }
   ],
-  / cmtype / 3 : 2
+  "cmtype" : 2
 }
diff --git a/cddl/intrep-ect.cddl b/cddl/intrep-ect.cddl
@@ -1,14 +1,14 @@
 ECT = {
-  ? &(environment: 0) => environment-map
-  ? &(element-list: 1) => [ + element-map ]
-  ? &(authority: 2) => [ + $crypto-key-type-choice ]
-  &(cmtype: 3) => uint .bits cm-type
-  ? &(profile: 4) => $profile-type-choice
+  ? environment: environment-map
+  ? element-list: [ + element-map ]
+  ? authority: [ + $crypto-key-type-choice ]
+  cmtype: cm-type
+  ? profile: $profile-type-choice
 }
 
 element-map = {
-  ? &(element-id: 0) => $measured-element-type-choice
-  &(element-claims: 1) => measurement-values-map
+  ? element-id: $measured-element-type-choice
+  element-claims: measurement-values-map
 }
 
 cm-type =  &(