From 69d78a370e2c4c3b921ca2cf3a394121141a0008 Mon Sep 17 00:00:00 2001
From: Yogesh Deshpande <yogesh.deshpande@arm.com>
Date: Tue, 18 Feb 2025 11:37:44 +0000
Subject: [PATCH 1/3] Add CoTL Example

Signed-off-by: Yogesh Deshpande <yogesh.deshpande@arm.com>
---
 Makefile                  |  1 +
 cddl/Makefile             |  2 ++
 cddl/corim-frags.mk       | 10 ++++++++++
 cddl/examples/cotl-1.diag | 21 +++++++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 cddl/examples/cotl-1.diag

diff --git a/Makefile b/Makefile
index 35a2c2c6..057130ed 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ endef # cddl_targets
 
 $(eval $(call cddl_targets,corim,$(CORIM_FRAGS)))
 $(eval $(call cddl_targets,comid,$(COMID_FRAGS)))
+$(eval $(call cddl_targets,cotl,$(COTL_FRAGS)))
 $(eval $(call cddl_targets,intrep,$(INTREP_FRAGS)))
 
 cddl/concise-swid-tag.cddl: ; $(MAKE) -C cddl $(notdir $@)
diff --git a/cddl/Makefile b/cddl/Makefile
index 86bd75c8..964ebe04 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -11,6 +11,7 @@ check:: cbor-tags-unique
 check:: check-intrep check-intrep-examples
 check:: check-corim check-corim-examples
 check:: check-comid check-comid-examples
+check:: check-cotl check-cotl-examples
 
 # $1: label
 # $2: cddl fragments
@@ -63,6 +64,7 @@ endef # cddl_check_template
 include corim-frags.mk
 
 $(eval $(call cddl_check_template,comid,$(COMID_FRAGS),$(COMID_EXAMPLES)))
+$(eval $(call cddl_check_template,cotl,$(COTL_FRAGS),$(COTL_EXAMPLES)))
 $(eval $(call cddl_check_template,corim,$(CORIM_FRAGS),$(CORIM_EXAMPLES)))
 $(eval $(call cddl_check_template,intrep,$(INTREP_FRAGS),$(INTREP_EXAMPLES)))
 
diff --git a/cddl/corim-frags.mk b/cddl/corim-frags.mk
index 597a18cd..653dbbfe 100644
--- a/cddl/corim-frags.mk
+++ b/cddl/corim-frags.mk
@@ -50,6 +50,16 @@ COMID_FRAGS += concise-swid-tag.cddl
 
 COMID_EXAMPLES := $(wildcard examples/comid-*.diag)
 
+COTL_FRAGS := concise-tl-tag.cddl
+COTL_FRAGS += validity-map.cddl
+COTL_FRAGS += version-map.cddl
+COTL_FRAGS += tag-id-type-choice.cddl
+COTL_FRAGS += tag-identity-map.cddl
+COTL_FRAGS += uuid.cddl
+COTL_FRAGS += concise-swid-tag.cddl
+
+COTL_EXAMPLES := $(wildcard examples/cotl-*.diag)
+
 CORIM_FRAGS := corim.cddl
 CORIM_FRAGS += concise-tl-tag.cddl
 CORIM_FRAGS += concise-tag-type-choice.cddl
diff --git a/cddl/examples/cotl-1.diag b/cddl/examples/cotl-1.diag
new file mode 100644
index 00000000..08c4ba79
--- /dev/null
+++ b/cddl/examples/cotl-1.diag
@@ -0,0 +1,21 @@
+/ concise-tl-tag / {
+  / cotl.tag-identity / 0 : {
+    / cotl.tag-id / 0 : h'3f06af63a93c11e4979700505690773a',
+    / cotl.tag-version / 1 : 1
+  },
+  / cotl.tags-list / 1 : [ {
+    / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773e'
+  },
+  {
+    / comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f',
+    / comid.tag-version / 1 : 5
+  },
+  {
+    / coswid.tag-id / 0 : h'3f06af63a93c11e4979700505690774f',
+    / coswid.tag-version / 1 : 2
+  }],
+  / cotl.tl-validity / 2 : {
+    / cotl.not-before / 0 : "2023-02-15T00:00:00Z",
+    / cotl.not-after / 1 : "2026-02-27T00:00:00Z"
+  }
+}

From e4f07b1ecf656db2f2445b1f4484b1a0c27ebdde Mon Sep 17 00:00:00 2001
From: Yogesh Deshpande <yogesh.deshpande@arm.com>
Date: Tue, 18 Feb 2025 14:24:57 +0000
Subject: [PATCH 2/3] Add tag-version-type.cddl to COTL_FRAGS

Signed-off-by: Yogesh Deshpande <yogesh.deshpande@arm.com>
---
 cddl/corim-frags.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cddl/corim-frags.mk b/cddl/corim-frags.mk
index 653dbbfe..138d9a55 100644
--- a/cddl/corim-frags.mk
+++ b/cddl/corim-frags.mk
@@ -56,6 +56,7 @@ COTL_FRAGS += version-map.cddl
 COTL_FRAGS += tag-id-type-choice.cddl
 COTL_FRAGS += tag-identity-map.cddl
 COTL_FRAGS += uuid.cddl
+COTL_FRAGS += tag-version-type.cddl
 COTL_FRAGS += concise-swid-tag.cddl
 
 COTL_EXAMPLES := $(wildcard examples/cotl-*.diag)

From b9b8a3edf3144aa95369ab1fc9dfc516a7a07209 Mon Sep 17 00:00:00 2001
From: Thomas Fossati <thomas.fossati@linaro.org>
Date: Wed, 19 Feb 2025 11:29:07 +0100
Subject: [PATCH 3/3] fix time

Signed-off-by: Thomas Fossati <thomas.fossati@linaro.org>
---
 cddl/examples/cotl-1.diag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cddl/examples/cotl-1.diag b/cddl/examples/cotl-1.diag
index 08c4ba79..2a3b044d 100644
--- a/cddl/examples/cotl-1.diag
+++ b/cddl/examples/cotl-1.diag
@@ -15,7 +15,7 @@
     / coswid.tag-version / 1 : 2
   }],
   / cotl.tl-validity / 2 : {
-    / cotl.not-before / 0 : "2023-02-15T00:00:00Z",
-    / cotl.not-after / 1 : "2026-02-27T00:00:00Z"
+    / cotl.not-before / 0 : 1(1234),
+    / cotl.not-after / 1 : 1(4567)
   }
 }