updated to reflect v1.1 changes

Defined evidence triples to not depend on corim triples but rather use corim building blocks.
TrustedComputingGroup · Jan 6, 2025 · fa7e2ad · fa7e2ad
1 parent 694f74f
commit fa7e2ad
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 18 deletions.
diff --git a/ce-start.cddl b/ce-start.cddl
@@ -1 +1 @@
-start = concise-evidence-map
+start = tagged-concise-evidence
diff --git a/concise-evidence.cddl b/concise-evidence.cddl
@@ -9,15 +9,40 @@ $evidence-id-type-choice /= tagged-uuid-type
 ; additional evidence identifier types may be added here
 
 ev-triples-map = non-empty< {
-  ? &(ce.evidence-triples: 0) => [ + reference-triple-record ]
-  ? &(ce.identity-triples: 1) => [ + identity-triple-record ]
-  ? &(ce.dependency-triples: 2) => [ + domain-dependency-triple-record ]
-  ? &(ce.domain-membership-triples: 3) => [ + domain-membership-triple-record ]
+  ? &(ce.evidence-triples: 0) => [ + evidence-triple-record ]
+  ? &(ce.identity-triples: 1) => [ + ev-identity-triple-record ]
+  ? &(ce.dependency-triples: 2) => [ + ev-dependency-triple-record ]
+  ? &(ce.domain-membership-triples: 3) => [ + ev-membership-triple-record ]
   ? &(ce.coswid-triples: 4) => [ + ev-coswid-triple-record ]
-  ? &(ce.attest-key-triples: 5) => [ + attest-key-triple-record ]
+  ? &(ce.attest-key-triples: 5) => [ + ev-attest-key-triple-record ]
   * $$ev-triples-map-extension
 } > 
 
+evidence-triple-record = [
+  environment-map
+  [ + measurement-map ]
+]
+
+ev-identity-triple-record = [
+  environment-map
+  [ + $crypto-key-type-choice ]
+]
+
+ev-attest-key-triple-record = [
+  environment-map
+  [ + $crypto-key-type-choice ]
+]
+
+ev-dependency-triple-record = [
+  $domain-type-choice
+  [ + $domain-type-choice ]
+]
+
+ev-membership-triple-record = [
+  $domain-type-choice
+  [ + environment-map ]
+]
+
 ev-coswid-triple-record = [ 
   environment-map, 
   [ + ev-coswid-evidence-map ]

diff --git a/examples/ce-coswid-ee1.diag b/examples/ce-coswid-ee1.diag
@@ -1,4 +1,4 @@
-/ concise-evidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.coswid-triples / 4 : [
       [ /** ev-coswid-triple-record **/
@@ -36,4 +36,4 @@
       ]
     ]
   }
-}
+})
diff --git a/examples/ce-coswid.diag b/examples/ce-coswid.diag
@@ -1,4 +1,4 @@
-/ concise-evidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.coswid-triples / 4 : [
       [ /** ev-coswid-triple-record **/
@@ -32,4 +32,4 @@
       ]
     ]
   }
-}
+})
diff --git a/examples/ce-domain-dep.diag → examples/ce-dep.diag b/examples/ce-domain-dep.diag → examples/ce-dep.diag
@@ -1,4 +1,4 @@
-/ concise-eviidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.dependency-triples / 2 : [
       [ 3, [ 2 ] ],
@@ -7,4 +7,4 @@
       [ 1, [ "XYZ_Root-of-trust" ]]
     ]
   }
-}
+})
diff --git a/examples/ce-identity.diag b/examples/ce-identity.diag
@@ -1,4 +1,4 @@
-/ concise-eviidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.identity-triples / 1 : [
      [
@@ -49,4 +49,4 @@
       ]
     ]
   }
-}
+})
diff --git a/examples/ce-indirect.diag b/examples/ce-indirect.diag
@@ -1,4 +1,4 @@
-/ concise-evidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.evidence-triples / 0 : [
       [ /** note: uses reference-triple-record schema **/
@@ -27,4 +27,4 @@
     ]
   },
   /ce.evidence-id / 1 : 37(h'67b28b6c34cc40a19117ab5b05911e37')
-}
+})
diff --git a/examples/ce-domain-mem.diag → examples/ce-mem.diag b/examples/ce-domain-mem.diag → examples/ce-mem.diag
@@ -1,4 +1,4 @@
-/ concise-evidence / {
+/ tagged-concise-evidence / 571({
   / ce.ev-triples / 0 : {
     / ce.domain-membership-triples / 3 : [
       [ / domain / "XYZ_Root-of-trust",
@@ -101,4 +101,4 @@
       ]
     ]
   }
-}
+})
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		start = concise-evidence-map
		start = tagged-concise-evidence