From c81113934c9493bd8951fbba20c72eedf5863417 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 15:46:00 -0800 Subject: [PATCH 01/14] Update Makefile Invoking corim make from top level to pick up Gemfile environment --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a58e0e4..231a128 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,12 @@ SHELL := /bin/bash -CORIM_DIR := draft-ietf-rats-corim/cddl/ +CORIM_DIR := draft-ietf-rats-corim/ +CORIM_FRAGS_DIR := draft-ietf-rats-corim/cddl/ CE_DIR := ./ -include $(CORIM_DIR)corim-frags.mk -CORIM_DEPS := $(addprefix $(CORIM_DIR), $(CORIM_FRAGS)) +include $(CORIM_FRAGS_DIR)corim-frags.mk +CORIM_DEPS := $(addprefix $(CORIM_FRAGS_DIR), $(CORIM_FRAGS)) include tools.mk include funcs.mk From cf380f3d19694997934edf14b073fab9fb71fb97 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 15:46:29 -0800 Subject: [PATCH 02/14] Update draft-ietf-rats-corim updated submodule --- draft-ietf-rats-corim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-rats-corim b/draft-ietf-rats-corim index 7af90a6..fe0d0d8 160000 --- a/draft-ietf-rats-corim +++ b/draft-ietf-rats-corim @@ -1 +1 @@ -Subproject commit 7af90a6577564336571b4d8b6c585137ed21c02d +Subproject commit fe0d0d88e557fbd55b8d6110f49767e1ff7bc246 From 979caa925672b09ada8afbc40d89ee47238c0224 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 15:53:34 -0800 Subject: [PATCH 03/14] moved comid-flags.diag to temporary To avoid build errors where flags-map cddl requires an older version of cddl and more work is needed to get Gemfiles to work. --- examples/{comid-flags.diag => fix-comid-flags.diag} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/{comid-flags.diag => fix-comid-flags.diag} (100%) diff --git a/examples/comid-flags.diag b/examples/fix-comid-flags.diag similarity index 100% rename from examples/comid-flags.diag rename to examples/fix-comid-flags.diag From 5e9086b4718790d9645264ff50a79ca2735c8c68 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 16:52:56 -0800 Subject: [PATCH 04/14] Update .gitignore added Gemfile.lock to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 827a0d4..ac5f378 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *-autogen.cddl draft-ietf-rats-corim +Gemfile.lock From e427e4af247ae8a8caa5d6ec992eab5b232ac1bf Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 16:53:37 -0800 Subject: [PATCH 05/14] Create Gemfile Gemfile that corim uses to make flags-map examples. --- Gemfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..db2498a --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gem 'json_pure' +gem 'cddl', ['>=0.9.1', '!=0.10.5' ] +gem 'cbor-diag', '=0.8.1' From 3ddbb01b861881e69b0e6bd683cec60ae6aebb88 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 21:21:32 -0800 Subject: [PATCH 06/14] Create comid-flags.diag added example diag file back --- examples/comid-flags.diag | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 examples/comid-flags.diag diff --git a/examples/comid-flags.diag b/examples/comid-flags.diag new file mode 100644 index 0000000..2d16cc8 --- /dev/null +++ b/examples/comid-flags.diag @@ -0,0 +1,52 @@ +/ concise-mid-tag / { + / tag-identity / 1 : { + / tag-id / 0 : h'1EACD596F4A34FB699BFAEB58E0A4E49' + }, + / entities / 2 : [ { + / entity-name / 0 : "OEM-A", + / reg-id / 1 : 32("https://oem-a.example"), + / role / 2 : [ 0 ] / tag-creator / + } ], + / comid.linked-tags / 3 : [ + / linked-tag-map / { + / linked-tag-id / 0 : h'1EACD596F4A34FB699BFAEB58E0A4E47', + / tag-rel / 1 : / comid.supplements / 0 + }, + / linked-tag-map / { + / linked-tag-id / 0 : h'AF1CD895BE784ADBB7E9ADD44A65ABF3', + / tag-rel / 1 : / comid.supplements / 0 + } + ], + / triples / 4 : { + / endorsed-triples / 1 : [ + [ + / environment-map / { + / class / 0 : { + / ** Firmware is valid (example) ** / + / comid.class-id / 0 : + / tagged-oid-type / 111(h'060C6086480186F84D010F046301'), / 2.16.840.1.113741.1.15.4.99.1 / + / vendor / 1 : "fwmfginc.example" + } + }, + / measurement-map / { + / mval / 1 : { + / flags / 3 : { + / configured / 0 : true, + / secure / 1 : true, + / not-recovery / 2 : true, + / debug / 3 : false, + / replay-protected / 4 : true, + / integrity-protected / 5 : true, + / runtime-meas / 6 : true, + / immutable / 7 : true, + / tcb / 8 : true + } + }, + / comid.authorized-by / 2 : [ + / tagged-pkix-base64-key-type / 554("base64_key_X") + ] + } + ] + ] + } +} \ No newline at end of file From 09ed81fab414545fe11efa1f68af0412a5f271ae Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Tue, 20 Feb 2024 21:22:02 -0800 Subject: [PATCH 07/14] Update .gitignore added .ruby-version to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ac5f378..a0d4b84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *-autogen.cddl draft-ietf-rats-corim Gemfile.lock +.ruby-version From 2ffe1a84315edd09e4afa86f87b3b1f8a6faf9ab Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Wed, 21 Feb 2024 09:13:13 -0800 Subject: [PATCH 08/14] Update makefile.yml Added install of a particular version 0.10.6 of cddl to yaml workflow --- .github/workflows/makefile.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index b87eb9b..9f6b1d5 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -11,7 +11,9 @@ jobs: with: submodules: recursive - name: install tools - run: gem install --user-install cbor-diag cddl + run: + gem install --user-install cbor-diag + gem install --user-install cddl -v 0.10.6 - name: set up PATH run: echo "$(gem env gempath | cut -d':' -f1)/bin" >> $GITHUB_PATH - name: assemble and test From c9c082471b8b9f3e3b2eb274118be1f0a7228510 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Wed, 21 Feb 2024 09:13:41 -0800 Subject: [PATCH 09/14] Update Gemfile Added v 0.10.6 as an acceptable cddl version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index db2498a..fdb2a76 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'json_pure' -gem 'cddl', ['>=0.9.1', '!=0.10.5' ] +gem 'cddl', ['>=0.9.1', '!=0.10.5', >='0.10.6' ] gem 'cbor-diag', '=0.8.1' From e92c818e9ee065e74174a06dab29fd36cf6c14df Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Wed, 21 Feb 2024 09:16:03 -0800 Subject: [PATCH 10/14] Update makefile.yml added | --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 9f6b1d5..843a0f9 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -11,7 +11,7 @@ jobs: with: submodules: recursive - name: install tools - run: + run: | gem install --user-install cbor-diag gem install --user-install cddl -v 0.10.6 - name: set up PATH From dd65ae1063687a85ce095f4dfd0ab4013e4ae3c9 Mon Sep 17 00:00:00 2001 From: Ned Smith Date: Wed, 21 Feb 2024 09:29:05 -0800 Subject: [PATCH 11/14] Update .github/workflows/makefile.yml Co-authored-by: Thomas Fossati --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 843a0f9..a931859 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -13,7 +13,7 @@ jobs: - name: install tools run: | gem install --user-install cbor-diag - gem install --user-install cddl -v 0.10.6 + gem install --user-install cddl -v 0.10.6 - name: set up PATH run: echo "$(gem env gempath | cut -d':' -f1)/bin" >> $GITHUB_PATH - name: assemble and test From f87c763441df9f9e7cdfc55b1a84145cc962f5bc Mon Sep 17 00:00:00 2001 From: Ned Smith Date: Wed, 21 Feb 2024 09:29:20 -0800 Subject: [PATCH 12/14] Update Gemfile Co-authored-by: Thomas Fossati --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fdb2a76..b8b0f08 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'json_pure' -gem 'cddl', ['>=0.9.1', '!=0.10.5', >='0.10.6' ] +gem 'cddl', [ '>=0.10.6' ] gem 'cbor-diag', '=0.8.1' From 16510b6c3fa5bbe8ee541bec58f79e93576af744 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Wed, 21 Feb 2024 09:49:36 -0800 Subject: [PATCH 13/14] Delete fix-comid-flags.diag remove temprary file --- examples/fix-comid-flags.diag | 52 ----------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 examples/fix-comid-flags.diag diff --git a/examples/fix-comid-flags.diag b/examples/fix-comid-flags.diag deleted file mode 100644 index 2d16cc8..0000000 --- a/examples/fix-comid-flags.diag +++ /dev/null @@ -1,52 +0,0 @@ -/ concise-mid-tag / { - / tag-identity / 1 : { - / tag-id / 0 : h'1EACD596F4A34FB699BFAEB58E0A4E49' - }, - / entities / 2 : [ { - / entity-name / 0 : "OEM-A", - / reg-id / 1 : 32("https://oem-a.example"), - / role / 2 : [ 0 ] / tag-creator / - } ], - / comid.linked-tags / 3 : [ - / linked-tag-map / { - / linked-tag-id / 0 : h'1EACD596F4A34FB699BFAEB58E0A4E47', - / tag-rel / 1 : / comid.supplements / 0 - }, - / linked-tag-map / { - / linked-tag-id / 0 : h'AF1CD895BE784ADBB7E9ADD44A65ABF3', - / tag-rel / 1 : / comid.supplements / 0 - } - ], - / triples / 4 : { - / endorsed-triples / 1 : [ - [ - / environment-map / { - / class / 0 : { - / ** Firmware is valid (example) ** / - / comid.class-id / 0 : - / tagged-oid-type / 111(h'060C6086480186F84D010F046301'), / 2.16.840.1.113741.1.15.4.99.1 / - / vendor / 1 : "fwmfginc.example" - } - }, - / measurement-map / { - / mval / 1 : { - / flags / 3 : { - / configured / 0 : true, - / secure / 1 : true, - / not-recovery / 2 : true, - / debug / 3 : false, - / replay-protected / 4 : true, - / integrity-protected / 5 : true, - / runtime-meas / 6 : true, - / immutable / 7 : true, - / tcb / 8 : true - } - }, - / comid.authorized-by / 2 : [ - / tagged-pkix-base64-key-type / 554("base64_key_X") - ] - } - ] - ] - } -} \ No newline at end of file From bcf9e6bf49910364974590305f55f8a1cf476fab Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Wed, 21 Feb 2024 10:08:25 -0800 Subject: [PATCH 14/14] Update .gitmodules changed gitmodules to merge rather than rebase --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6e5a8ce..2953ef3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,4 +2,4 @@ path = draft-ietf-rats-corim url = https://github.com/ietf-rats-wg/draft-ietf-rats-corim branch = main - update = rebase + update = merge