Merge pull request #46 from TrustedComputingGroup/fdamato/cwt_concise_evidence_serialize

Ned Smith · web-flow · commit dfa323d4cddb · 2025-02-17T08:12:23.000-08:00
Make Concise Evidence serialization inside CWT
diff --git a/cwt-eat.cddl b/cwt-eat.cddl
@@ -21,7 +21,7 @@ cwt-eat = {
   
 }
 
-$measurements-body-cbor /= concise-evidence-map
+$measurements-body-cbor /= bytes .cbor concise-evidence-map
 oid = tagged-oid-type
 
 ; EAT related CDDL
diff --git a/examples/cose-1.diag b/examples/cose-1.diag
@@ -11,7 +11,7 @@
       / eat-measurements /  273 : [
         / measurements-format / [
           10571, / Content Format ID - Concise Evidence /
-          / concise-evidence / {
+          / concise-evidence / <<{
             / ce.ev-triples / 0 : / ev-triples-map / {
               / ce.evidence-triples / 0 : [
                 / evidence-triple-record / [
@@ -33,7 +33,7 @@
                 ]
               ]
             }
-          }
+          }>>
         ]
       ]
   }>>,
diff --git a/examples/cose-cwt-x5chain.diag b/examples/cose-cwt-x5chain.diag
@@ -12,7 +12,7 @@
       / eat-measurements /  273 : [
         / measurements-format / [
           10571, / Content Format ID - Concise Evidence /
-          / concise-evidence / {
+          / concise-evidence / <<{
             / ce.ev-triples / 0 : / ev-triples-map / {
               / ce.evidence-triples / 0 : [
                 / evidence-triple-record / [
@@ -34,7 +34,7 @@
                 ]
               ]
             }
-          }
+          }>>
         ]
       ]
   }>>,
diff --git a/examples/cose-cwt-x5chain2.diag b/examples/cose-cwt-x5chain2.diag
@@ -16,7 +16,7 @@
       / eat-measurements /  273 : [
         / measurements-format / [
           10571, / Content Format ID - Concise Evidence /
-          / concise-evidence / {
+          / concise-evidence / <<{ 
             / ce.ev-triples / 0 : / ev-triples-map / {
               / ce.evidence-triples / 0 : [
                 / evidence-triple-record / [
@@ -38,7 +38,7 @@
                 ]
               ]
             }
-          }
+          }>>
         ]
       ]
   }>>,
diff --git a/examples/eat-1.diag b/examples/eat-1.diag
@@ -4,7 +4,7 @@
 	/ eat-measurements /  273 : [
 		/ measurements-format / [
 			10571,
-			/ concise-evidence / {
+			/ concise-evidence / <<{
 				/ ce.ev-triples / 0 : / ev-triples-map / {
 					/ ce.evidence-triples / 0 : [
 						/ evidence-triple-record / [
@@ -26,7 +26,7 @@
 						]
 					]
 				}
-			}
+			}>>
 		]
 	]
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ cwt-eat = {`
`21`	`21`
`22`	`22`	`}`
`23`	`23`
`24`		`-$measurements-body-cbor /= concise-evidence-map`
	`24`	`+$measurements-body-cbor /= bytes .cbor concise-evidence-map`
`25`	`25`	`oid = tagged-oid-type`
`26`	`26`
`27`	`27`	`; EAT related CDDL`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`/ eat-measurements / 273 : [`
`12`	`12`	`/ measurements-format / [`
`13`	`13`	`10571, / Content Format ID - Concise Evidence /`
`14`		`- / concise-evidence / {`
	`14`	`+ / concise-evidence / <<{`
`15`	`15`	`/ ce.ev-triples / 0 : / ev-triples-map / {`
`16`	`16`	`/ ce.evidence-triples / 0 : [`
`17`	`17`	`/ evidence-triple-record / [`
`@@ -33,7 +33,7 @@`
`33`	`33`	`]`
`34`	`34`	`]`
`35`	`35`	`}`
`36`		`- }`
	`36`	`+ }>>`
`37`	`37`	`]`
`38`	`38`	`]`
`39`	`39`	`}>>,`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/ eat-measurements / 273 : [`
`13`	`13`	`/ measurements-format / [`
`14`	`14`	`10571, / Content Format ID - Concise Evidence /`
`15`		`- / concise-evidence / {`
	`15`	`+ / concise-evidence / <<{`
`16`	`16`	`/ ce.ev-triples / 0 : / ev-triples-map / {`
`17`	`17`	`/ ce.evidence-triples / 0 : [`
`18`	`18`	`/ evidence-triple-record / [`
`@@ -34,7 +34,7 @@`
`34`	`34`	`]`
`35`	`35`	`]`
`36`	`36`	`}`
`37`		`- }`
	`37`	`+ }>>`
`38`	`38`	`]`
`39`	`39`	`]`
`40`	`40`	`}>>,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/ eat-measurements / 273 : [`
`17`	`17`	`/ measurements-format / [`
`18`	`18`	`10571, / Content Format ID - Concise Evidence /`
`19`		`- / concise-evidence / {`
	`19`	`+ / concise-evidence / <<{`
`20`	`20`	`/ ce.ev-triples / 0 : / ev-triples-map / {`
`21`	`21`	`/ ce.evidence-triples / 0 : [`
`22`	`22`	`/ evidence-triple-record / [`
`@@ -38,7 +38,7 @@`
`38`	`38`	`]`
`39`	`39`	`]`
`40`	`40`	`}`
`41`		`- }`
	`41`	`+ }>>`
`42`	`42`	`]`
`43`	`43`	`]`
`44`	`44`	`}>>,`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/ eat-measurements / 273 : [`
`5`	`5`	`/ measurements-format / [`
`6`	`6`	`10571,`
`7`		`- / concise-evidence / {`
	`7`	`+ / concise-evidence / <<{`
`8`	`8`	`/ ce.ev-triples / 0 : / ev-triples-map / {`
`9`	`9`	`/ ce.evidence-triples / 0 : [`
`10`	`10`	`/ evidence-triple-record / [`
`@@ -26,7 +26,7 @@`
`26`	`26`	`]`
`27`	`27`	`]`
`28`	`28`	`}`
`29`		`- }`
	`29`	`+ }>>`
`30`	`30`	`]`
`31`	`31`	`]`
`32`	`32`	`}`