Use key => value directly in measurement-map

Rename "authorized-by" to "__authorities" since authorized-by is more of a policy concept. The authorities are just a matching condition, although there is more to discuss about delegation in Issue#244. Remove integrity-registers as a measurement value since the register name can be gived directly in the $measured-element-type-choice and reuse the digests codepoint. Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
ietf-rats-wg · Aug 22, 2024 · c587c4b · c587c4b
1 parent 5dc2a57
commit c587c4b
Show file tree

Hide file tree

Showing 23 changed files with 74 additions and 207 deletions.
diff --git a/cddl/corim-frags.mk b/cddl/corim-frags.mk
@@ -29,7 +29,6 @@ COMID_FRAGS += mac-addr-type-choice.cddl
 COMID_FRAGS += measured-element-type-choice.cddl
 COMID_FRAGS += measurement-map.cddl
 COMID_FRAGS += measurement-values-map.cddl
-COMID_FRAGS += mkeyvalue-pair.cddl
 COMID_FRAGS += non-empty.cddl
 COMID_FRAGS += oid.cddl
 COMID_FRAGS += raw-value.cddl
@@ -46,7 +45,6 @@ COMID_FRAGS += ueid.cddl
 COMID_FRAGS += uuid.cddl
 COMID_FRAGS += version-map.cddl
 COMID_FRAGS += digest.cddl
-COMID_FRAGS += integrity-registers.cddl
 COMID_FRAGS += concise-swid-tag.cddl
 
 COMID_EXAMPLES := $(wildcard examples/comid-*.diag)

diff --git a/cddl/examples/comid-1.diag b/cddl/examples/comid-1.diag
@@ -21,7 +21,7 @@
         }
       },
       / measurement-map / {
-        / comid.mval / 1 : {
+        0 : {
           / comid.ver / 0 : {
             / comid.version / 0 : "1.0.0",
             / comid.version-scheme / 1 : 16384 / semver /

diff --git a/cddl/examples/comid-2.diag b/cddl/examples/comid-2.diag
@@ -22,7 +22,7 @@
           }
         },
         / measurement-map / {
-          / comid.mval / 1 : {
+          0 : {
             / comid.digests / 2 : [ [
               / hash-alg-id / 1, / sha256 /
               / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
@@ -44,7 +44,7 @@
           }
         },
         / measurement-map / {
-          / comid.mval / 1 : {
+          0 : {
             / comid.digests / 2 : [ [
               / hash-alg-id / 1, / sha256 /
               / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
@@ -66,7 +66,7 @@
           }
         },
         / measurement-map / {
-          / comid.mval / 1 : {
+          0 : {
             / comid.digests / 2 : [ [
               / hash-alg-id / 1, / sha256 /
               / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
@@ -88,7 +88,7 @@
         }
       },
       / measurement-map / {
-        / comid.mval / 1 : {
+        0 : {
           / comid.svn / 1 : 552(1)
         }
       }

diff --git a/cddl/examples/comid-3.diag b/cddl/examples/comid-3.diag
@@ -21,8 +21,7 @@
           }
         },
         / measurement-map / {
-          / comid.mkey / 0: 700,
-          / comid.mval / 1 : {
+          700 : {
             / comid.digests / 2 : [[
             / hash-alg-id / 6, / sha-256-32 /
             / hash-value /  h'ABCDEF00' ]]

diff --git a/cddl/examples/comid-4.diag b/cddl/examples/comid-4.diag
@@ -17,7 +17,7 @@
           }
         },
         / measurement-map / {
-          / mval / 1 : {
+          0 : {
             / cryptokeys / 13 : [
               / tagged-pkix-base64-key-type / 554("base64_key_ACME_MAX"),
               / tagged-pkix-base64-cert-type / 555("base64_cert_ACME_MAX"),

diff --git a/cddl/examples/comid-6.diag b/cddl/examples/comid-6.diag
@@ -13,7 +13,7 @@
         / comid.instance / 1 : / tagged-pkix-base64-key-type / 554("base64_key_X")
       },
       / measurement-map / {
-        / comid.mval / 1 : {
+        0 : {
           / comid.ver / 0 : {
             / comid.version / 0 : "1.0.0",
             / comid.version-scheme / 1 : 16384 / semver /

diff --git a/cddl/examples/comid-cend.diag b/cddl/examples/comid-cend.diag
@@ -23,13 +23,13 @@
             }	
           },          	
           { / *** measurement-map *** /	
-            / mval / 1 : / measurement-values-map / {	
+            0 : / measurement-values-map / {	
               / ver / 0 : {	
                 / version / 0 : "1.0.0",	
                 / version-scheme / 1 : 16384 / semver /	
               }	
             },	
-            / authorized-by / 2 : [	
+            "__authorities" : [
               / tagged-pkix-base64-key-type / 554("base64_key_X")	
             ]	
           }	
@@ -47,7 +47,7 @@
           }
         },
           / measurement-map / {
-            / comid.mval / 1 : {
+            0 : {
               / comid.ver / 0 : {
                 / comid.version / 0 : "1.0.0",
                 / comid.version-scheme / 1 : 16384 / semver /
@@ -74,7 +74,7 @@
           }
         },
         / measurement-map / {
-          / comid.mval / 1 : {
+          0 : {
             / raw-value-group /
               / comid.raw-value / 4 : 560(h'0000000000000000'),
               / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'

diff --git a/cddl/examples/comid-design-cd.diag b/cddl/examples/comid-design-cd.diag
@@ -26,7 +26,7 @@
       },
       / measurement-map /
         {
-          / comid.mval / 1 : {
+          0 : {
             / raw-value-group /
               / comid.raw-value / 4 : 560(h'0000000000000000'),
               / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
@@ -45,7 +45,7 @@
           },
           / measurement-map /
            {
-            / comid.mval / 1 : {
+            0 : {
              / comid.digests / 2 : [
               [
                / hash-alg-id / 7, / SHA384 /
@@ -67,7 +67,7 @@
           },
           / measurement-map /
             {
-              / comid.mval / 1 : {
+              0 : {
                 / comid.digests / 2 : [
                  [
                    / hash-alg-id / 7, / SHA384 /
@@ -88,7 +88,7 @@
            },
            / measurement-map /
              {
-               / comid.mval / 1 : {
+               0 : {
                / raw-value-group /
                  / comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
                  / comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
@@ -107,7 +107,7 @@
              }
           },
           / measurement-map / {
-            / comid.mval / 1 : {
+            0 : {
               / raw-value-group /
                 / comid.raw-value / 4 : 560(h'0000000000000000'),
                 / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'

diff --git a/cddl/examples/comid-firmware-cd.diag b/cddl/examples/comid-firmware-cd.diag
@@ -22,7 +22,7 @@
           },
           / measurement-map /
             {
-              / comid.mval / 1 : {
+              1 : {
                 / comid.svn / 1 : 552(1),
                 / comid.digests / 2 : [
                   [
@@ -45,7 +45,7 @@
           },
           / measurement-map /
             {
-              / comid.mval / 1 : {
+              1 : {
                 / comid.svn / 1 : 552(1),
                 / comid.digests / 2 : [
                   [
@@ -68,7 +68,7 @@
            }
           },
           / measurement-map / {
-           / comid.mval / 1 : {
+           1 : {
             / raw-value-group /
              / comid.raw-value / 4 : 560(h'0000000000000000'),
              / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'

diff --git a/cddl/examples/comid-flags.diag b/cddl/examples/comid-flags.diag
@@ -29,7 +29,7 @@
            }
           },
           / measurement-map / {
-            / comid.mval / 1 : {
+            1 : {
               / comid.flags / 3 : { 
                 / configured / 0 : true,
                 / secure / 1 : true,

diff --git a/cddl/examples/comid-integrity-registers.diag b/cddl/examples/comid-integrity-registers.diag
diff --git a/cddl/examples/comid-opaque-instance-id.diag b/cddl/examples/comid-opaque-instance-id.diag
@@ -14,7 +14,7 @@
           h'9f71ec4d223f4f899d532ed6ff6ecbbb4a62cb386ba24c204c9371ce5e3b9291713fe96b9b413d8842968ebb1fa4cf1920d0c5e9f872776a1e826f2851ecdb47')
       },
       / measurement-map / {
-        / comid.mval / 1 : {
+        1 : {
           / comid.ver / 0 : {
             / comid.version / 0 : "1.0.0",
             / comid.version-scheme / 1 : 16384 / semver /

diff --git a/cddl/examples/comid-series.diag b/cddl/examples/comid-series.diag
@@ -22,13 +22,13 @@
             }
           },          
           { / *** measurement-map *** /
-            / mval / 1 : / measurement-values-map / {
+            1 : / measurement-values-map / {
               / ver / 0 : {
                 / version / 0 : "1.0.0",
                 / version-scheme / 1 : 16384 / semver /
               }
             },
-            / authorized-by / 2 : [
+            "__authorities" : [
               / tagged-pkix-base64-key-type / 554("base64_key_X")
             ]
           }

diff --git a/cddl/examples/corim-1.diag b/cddl/examples/corim-1.diag
@@ -26,7 +26,7 @@
                 }
               },
               / measurement-map / {
-                / comid.mval / 1 : {
+                1 : {
                   / comid.ver / 0 : {
                     / comid.version / 0 : "1.0.0",
                     / comid.version-scheme / 1 : 16384 / semver /

diff --git a/cddl/examples/corim-2.diag b/cddl/examples/corim-2.diag
@@ -27,7 +27,7 @@
                   }
                 },
                 / measurement-map / {
-                  / comid.mval / 1 : {
+                  1 : {
                     / comid.digests / 2 : [ [
                       / hash-alg-id / 1, / sha256 /
                       / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
@@ -49,7 +49,7 @@
                   }
                 },
                 / measurement-map / {
-                  / comid.mval / 1 : {
+                  1 : {
                     / comid.digests / 2 : [ [
                       / hash-alg-id / 1, / sha256 /
                       / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
@@ -71,7 +71,7 @@
                   }
                 },
                 / measurement-map / {
-                  / comid.mval / 1 : {
+                  1 : {
                     / comid.digests / 2 : [ [
                       / hash-alg-id / 1, / sha256 /
                       / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
@@ -93,7 +93,7 @@
                 }
               },
               / measurement-map / {
-                / comid.mval / 1 : {
+                1 : {
                   / comid.svn / 1 : 552(1)
                 }
               }

diff --git a/cddl/examples/corim-design-cd.diag b/cddl/examples/corim-design-cd.diag
@@ -31,7 +31,7 @@
           },
           / measurement-map /
            {
-            / comid.mval / 1 : {
+            1 : {
              / raw-value-group /
               / comid.raw-value / 4 : 560(h'0000000000000000'),
               / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
@@ -50,7 +50,7 @@
           },
           / measurement-map /
            {
-            / comid.mval / 1 : {
+            1 : {
              / comid.digests / 2 : [
               [
                / hash-alg-id / 7, / SHA384 /
@@ -72,7 +72,7 @@
           },
           / measurement-map /
            {
-            / comid.mval / 1 : {
+            1 : {
              / comid.digests / 2 : [
               [
                / hash-alg-id / 7, / SHA384 /
@@ -93,7 +93,7 @@
           },
           / measurement-map /
            {
-            / comid.mval / 1 : {
+            1 : {
              / raw-value-group /
               / comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
               / comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
@@ -112,7 +112,7 @@
            }
           },
           / measurement-map / {
-           / comid.mval / 1 : {
+           1 : {
             / raw-value-group /
              / comid.raw-value / 4 : 560(h'0000000000000000'),
              / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'

diff --git a/cddl/examples/corim-firmware-cd.diag b/cddl/examples/corim-firmware-cd.diag
@@ -26,7 +26,7 @@
           },
           / measurement-map /
             {
-              / comid.mval / 1 : {
+              1 : {
                 / comid.svn / 1 : 552(1),
                 / comid.digests / 2 : [
                   [
@@ -49,7 +49,7 @@
           },
           / measurement-map /
             {
-              / comid.mval / 1 : {
+              1 : {
                 / comid.svn / 1 : 552(1),
                 / comid.digests / 2 : [
                   [
@@ -72,7 +72,7 @@
            }
           },
           / measurement-map / {
-           / comid.mval / 1 : {
+           1 : {
             / raw-value-group /
              / comid.raw-value / 4 : 560(h'0000000000000000'),
              / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'