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..138d9a55 100644 --- a/cddl/corim-frags.mk +++ b/cddl/corim-frags.mk @@ -50,6 +50,17 @@ 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 += tag-version-type.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..2a3b044d --- /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 : 1(1234), + / cotl.not-after / 1 : 1(4567) + } +}