From d5ef987b89910070036ffd2a843c8ca2a41b0f9b Mon Sep 17 00:00:00 2001
From: Henk Birkholz <henk.birkholz@sit.fraunhofer.de>
Date: Thu, 18 Feb 2021 16:20:29 +0100
Subject: [PATCH 1/3] change date from time to #6.1(int) reduced the quantity
 of evidence or payload to one changed any-uri from text to uri

---
 concise-swid-tag.cddl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/concise-swid-tag.cddl b/concise-swid-tag.cddl
index 0c45141..a8a7883 100644
--- a/concise-swid-tag.cddl
+++ b/concise-swid-tag.cddl
@@ -17,11 +17,9 @@ concise-swid-tag = {
 }
 
 payload-or-evidence //= ( payload => payload-entry )
-payload-or-evidence //= ( payload => [ 2* payload-entry ] )
 payload-or-evidence //= ( evidence => evidence-entry )
-payload-or-evidence //= ( evidence => [ 2* evidence-entry ] )
 
-any-uri = text
+any-uri = uri
 label = text / int
 
 $version-scheme /= multipartnumeric
@@ -171,7 +169,7 @@ payload-entry = {
 
 evidence-entry = {
   resource-collection,
-  ? date => time,
+  ? date => #6.1(int),
   ? device-id => text,
   global-attributes,
   * $$evidence-extension, 

From 62a8cf1107eff56df53fd84f336655f556e479db Mon Sep 17 00:00:00 2001
From: Henk Birkholz <henk.birkholz@sit.fraunhofer.de>
Date: Thu, 18 Feb 2021 16:53:33 +0100
Subject: [PATCH 2/3] moved global-attributes to the end of maps so that the
 any-attribute is defined last

---
 concise-swid-tag.cddl     | 16 ++++++++--------
 draft-ietf-sacm-coswid.md | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/concise-swid-tag.cddl b/concise-swid-tag.cddl
index a8a7883..0ff4779 100644
--- a/concise-swid-tag.cddl
+++ b/concise-swid-tag.cddl
@@ -12,8 +12,8 @@ concise-swid-tag = {
   entity => entity-entry / [ 2* entity-entry ],
   ? link => link-entry / [ 2* link-entry ],
   ? payload-or-evidence,
-  global-attributes,
   * $$coswid-extension,
+  global-attributes,
 }
 
 payload-or-evidence //= ( payload => payload-entry )
@@ -48,8 +48,8 @@ entity-entry = {
   ? reg-id => any-uri,
   role => $role / [ 2* $role ],
   ? thumbprint => hash-entry,
-  global-attributes,
   * $$entity-extension,
+  global-attributes,
 }
 
 $role /= tag-creator
@@ -68,8 +68,8 @@ link-entry = {
   rel => $rel,
   ? media-type => text,
   ? use => $use,
-  global-attributes,
   * $$link-extension
+  global-attributes,
 }
 
 $ownership /= shared
@@ -111,8 +111,8 @@ software-meta-entry = {
   ? summary => text,
   ? unspsc-code => text,
   ? unspsc-version => text,
-  global-attributes,
   * $$software-meta-extension,
+  global-attributes,
 }
 
 path-elements-group = ( ? directory => directory-entry / [ 2* directory-entry ],
@@ -143,14 +143,14 @@ directory-entry = {
 process-entry = {
   process-name => text,
   ? pid => integer,
-  global-attributes,
   * $$process-extension,
+  global-attributes,
 }
 
 resource-entry = {
   type => text,
-  global-attributes,
   * $$resource-extension,
+  global-attributes,
 }
 
 filesystem-item = (
@@ -163,16 +163,16 @@ filesystem-item = (
 
 payload-entry = {
   resource-collection,
-  global-attributes,
   * $$payload-extension,
+  global-attributes,
 }
 
 evidence-entry = {
   resource-collection,
   ? date => #6.1(int),
   ? device-id => text,
-  global-attributes,
   * $$evidence-extension, 
+  global-attributes,
 }
 
 ; "global map member" integer indexes
diff --git a/draft-ietf-sacm-coswid.md b/draft-ietf-sacm-coswid.md
index 187d7e7..752e24e 100644
--- a/draft-ietf-sacm-coswid.md
+++ b/draft-ietf-sacm-coswid.md
@@ -359,8 +359,8 @@ concise-swid-tag = {
   entity => entity-entry / [ 2* entity-entry ],
   ? link => link-entry / [ 2* link-entry ],
   ? payload-or-evidence,
-  global-attributes,
   * $$coswid-extension,
+  global-attributes,
 }
 
 payload-or-evidence //= ( payload => payload-entry ] )
@@ -500,8 +500,8 @@ entity-entry = {
   ? reg-id => any-uri,
   role => $role / [ 2* $role ],
   ? thumbprint => hash-entry,
-  global-attributes,
   * $$entity-extension,
+  global-attributes,
 }
 
 entity-name = 31
@@ -561,8 +561,8 @@ link-entry = {
   rel => $rel,
   ? media-type => text,
   ? use => $use,
-  global-attributes,
   * $$link-extension,
+  global-attributes,
 }
 
 media = 10
@@ -664,8 +664,8 @@ software-meta-entry = {
   ? summary => text,
   ? unspsc-code => text,
   ? unspsc-version => text,
-  global-attributes,
   * $$software-meta-extension,
+  global-attributes,
 }
 
 activation-status = 43
@@ -785,14 +785,14 @@ directory-entry = {
 process-entry = {
   process-name => text,
   ? pid => integer,
-  global-attributes,
   * $$process-extension,
+  global-attributes,
 }
 
 resource-entry = {
   type => text,
-  global-attributes,
   * $$resource-extension,
+  global-attributes,
 }
 
 directory = 16
@@ -863,8 +863,8 @@ The CDDL for the payload-entry map follows:
 ~~~ CDDL
 payload-entry = {
   resource-collection,
-  global-attributes,
   * $$payload-extension,
+  global-attributes,
 }
 ~~~
 
@@ -886,8 +886,8 @@ evidence-entry = {
   resource-collection,
   ? date => time,
   ? device-id => text,
-  global-attributes,
   * $$evidence-extension,
+  global-attributes,
 }
 
 date = 35

From 4323e4ff1824fc46d09e728c24b539e22f6b3666 Mon Sep 17 00:00:00 2001
From: Henk Birkholz <henkbirkholz@users.noreply.github.com>
Date: Sun, 21 Feb 2021 20:17:47 +0100
Subject: [PATCH 3/3] Update concise-swid-tag.cddl

---
 concise-swid-tag.cddl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/concise-swid-tag.cddl b/concise-swid-tag.cddl
index 0ff4779..362caa4 100644
--- a/concise-swid-tag.cddl
+++ b/concise-swid-tag.cddl
@@ -169,7 +169,7 @@ payload-entry = {
 
 evidence-entry = {
   resource-collection,
-  ? date => #6.1(int),
+  ? date => integer-time,
   ? device-id => text,
   * $$evidence-extension, 
   global-attributes,