From fa7e2ad2fe8a48bbab8cb1d85db890a8d5e3cc35 Mon Sep 17 00:00:00 2001
From: nedmsmith <ned.smith@intel.com>
Date: Mon, 6 Jan 2025 11:00:46 -0800
Subject: [PATCH] updated to reflect v1.1 changes

Defined evidence triples to not depend on corim triples but rather use corim building blocks.
---
 ce-start.cddl                                |  2 +-
 concise-evidence.cddl                        | 35 +++++++++++++++++---
 examples/ce-coswid-ee1.diag                  |  4 +--
 examples/ce-coswid.diag                      |  4 +--
 examples/{ce-domain-dep.diag => ce-dep.diag} |  4 +--
 examples/ce-identity.diag                    |  4 +--
 examples/ce-indirect.diag                    |  4 +--
 examples/{ce-domain-mem.diag => ce-mem.diag} |  4 +--
 8 files changed, 43 insertions(+), 18 deletions(-)
 rename examples/{ce-domain-dep.diag => ce-dep.diag} (85%)
 rename examples/{ce-domain-mem.diag => ce-mem.diag} (98%)

diff --git a/ce-start.cddl b/ce-start.cddl
index 7d7ee9c..8cd1dc3 100644
--- 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
index aa619c6..6dd2d05 100644
--- 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
index 3934474..ad8f653 100644
--- 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 @@
       ]
     ]
   }
-}
+})
\ No newline at end of file
diff --git a/examples/ce-coswid.diag b/examples/ce-coswid.diag
index bf54819..4c7edf5 100644
--- 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 @@
       ]
     ]
   }
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/examples/ce-domain-dep.diag b/examples/ce-dep.diag
similarity index 85%
rename from examples/ce-domain-dep.diag
rename to examples/ce-dep.diag
index d39710e..7d824a2 100644
--- a/examples/ce-domain-dep.diag
+++ b/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" ]]
     ]
   }
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/examples/ce-identity.diag b/examples/ce-identity.diag
index a77cbc9..b87aea4 100644
--- 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 @@
       ]
     ]
   }
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/examples/ce-indirect.diag b/examples/ce-indirect.diag
index d23884c..8b640b1 100644
--- 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')
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/examples/ce-domain-mem.diag b/examples/ce-mem.diag
similarity index 98%
rename from examples/ce-domain-mem.diag
rename to examples/ce-mem.diag
index 58162f6..ca07fde 100644
--- a/examples/ce-domain-mem.diag
+++ b/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 @@
       ]
     ]
   }
-}
\ No newline at end of file
+})
\ No newline at end of file