Merge branch 'main' into cond-series-wording

ietf-rats-wg · Oct 24, 2024 · 9834a8c · 9834a8c
2 parents 5c19de3 + 866e582
commit 9834a8c
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 125 deletions.
diff --git a/cddl/cose-sign1-corim.cddl b/cddl/cose-sign1-corim.cddl
@@ -1,6 +1,6 @@
 COSE-Sign1-corim = [
   protected: bstr .cbor protected-corim-header-map
   unprotected: unprotected-corim-header-map
-  payload: bstr .cbor tagged-corim-map
+  payload: bstr .cbor (tagged-corim-map / corim-map)
   signature: bstr
 ]
diff --git a/cddl/examples/comid-3.diag b/cddl/examples/comid-3.diag
@@ -28,9 +28,41 @@
               / hash-alg-id / 6, / sha-256-32 /
               / hash-value /  h'ABCDEF00' ]]
             }
+          },
+            / measurement-map / {
+            / comid.mkey / 0: "my_element",
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [[
+              / hash-alg-id / 6, / sha-256-32 /
+              / hash-value /  h'00FEDCBA' ]]
+            }
+          },
+            / measurement-map / {
+            / comid.mkey / 0: 111( h'5502C001' ),
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [[
+              / hash-alg-id / 6, / sha-256-32 /
+              / hash-value /  h'00FEDCBA' ]]
+            }
+          },
+            / measurement-map / {
+            / comid.mkey / 0: 37( h'67b28b6c34cc40a19117ab5b05911e38' ),
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [[
+              / hash-alg-id / 6, / sha-256-32 /
+              / hash-value /  h'00FEDCBA' ]]
+            }
+          },
+            / measurement-map / {
+            / anonymous mkey /
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [[
+              / hash-alg-id / 6, / sha-256-32 /
+              / hash-value /  h'11223344' ]]
+            }
           }
         ]
       ]
     ]
   }
-}
+}
diff --git a/cddl/measured-element-type-choice.cddl b/cddl/measured-element-type-choice.cddl
@@ -1,3 +1,4 @@
 $measured-element-type-choice /= tagged-oid-type
 $measured-element-type-choice /= tagged-uuid-type
 $measured-element-type-choice /= uint
+$measured-element-type-choice /= tstr