From c855513a44e9d4c43236e52baa1e7ffb9d692f52 Mon Sep 17 00:00:00 2001 From: Yogesh Deshpande Date: Mon, 7 Oct 2024 18:51:23 +0100 Subject: [PATCH 1/3] fix(comid)! Revert "fix(comid): bring ValueTriple into alignment with rev05" This reverts commit b015c203eea7f5ca4a6aeee0d8fa9d4802ddd3fe. --- cmd/testcases/psa-refval.cbor | Bin 538 -> 417 bytes cmd/testcases/signed-corim-invalid.cbor | Bin 166 -> 166 bytes .../signed-corim-valid-with-cots.cbor | Bin 2349 -> 2349 bytes cmd/testcases/signed-corim-valid.cbor | Bin 918 -> 799 bytes cmd/testcases/src/psa-refval.yaml | 88 +++++++----------- cmd/testcases/src/signed-corim-valid.yaml | 84 +++++++---------- cmd/testcases/src/test-comid.yaml | 88 +++++++----------- cmd/testcases/test-comid.cbor | Bin 538 -> 417 bytes cmd/testcases/test-coswid.cbor | Bin 377 -> 377 bytes cmd/testcases/test-cots.cbor | Bin 1943 -> 1943 bytes 10 files changed, 108 insertions(+), 152 deletions(-) diff --git a/cmd/testcases/psa-refval.cbor b/cmd/testcases/psa-refval.cbor index e37b711cb6beda921d18a320c0cc29817e076932..928a9ac0c5baba0347d8fce477a646a14a326dd4 100644 GIT binary patch delta 86 zcmbQmvXFU#7i(kFLWaeYI~k29^E0vuH7{bg$rQPmG0Dk?CDlmJP|sjupUT9&>Wqsf lhcjwS?9`m>&Bz1fd}7oPf~ZV!49X8-Ni_hfHJR9_3;?Z&8s-21 delta 112 zcmZ3;Jd0(57i)9VLWac?qjhI7?d9}*@aO905^anc>n+a diff --git a/cmd/testcases/signed-corim-invalid.cbor b/cmd/testcases/signed-corim-invalid.cbor index 53fff8fad1da85902d9c27cc916f97ddeca585bf..06847a2d781fcaec03fb4cdf00661d2875ee1718 100644 GIT binary patch delta 96 zcmV-m0H6P+0j2?vArJwg0Kpnz&PV_O!5V2)XMm9*Fh!t2pjbd85kWOoIuaDJv%H5T z(v3yiK``+iD8makm=FgaCRV8yR)$h BD;59% diff --git a/cmd/testcases/signed-corim-valid-with-cots.cbor b/cmd/testcases/signed-corim-valid-with-cots.cbor index 69bd669e1b5c24a860b943c51402998b817ee3a7..c8a9b8f2eab6ea96c8914c2b8f48fc9f27a8c0e1 100644 GIT binary patch delta 72 zcmV-O0Js0G60H)j?Fc|cPmfg-UiQGdp#U?VfVe?WwaTb(%Vl5!&8wTCCg(B+`9pTf eljeCr6`)c*g<0;@Lf_*ZQajLmzx1Oa1^BjMfCBSUV`KG e;khD}?~i(51Fj9rGtM8AOw8jEh%hvB?pfX~!6cUe diff --git a/cmd/testcases/signed-corim-valid.cbor b/cmd/testcases/signed-corim-valid.cbor index 2923cdd50479600449eaa3a9eb2c1f96c6c98545..1a9d42ed461ac3cef3491d22b47220e78ee73c3c 100644 GIT binary patch delta 308 zcmbQnKA&xZVm;#`#)DFsA?Xba2c;6vc`z_6VkmKR_H|Y8DM?W%&P>nC%u83uPOW6T zp-_@hQc_TCrLUiuoSUkbT9KGrkdwL~lBr@D3z{LUjf;WmbCA_BH8L_}!VK192#5)P z@x|?|laTbplN{$KKeYM7*ci#U_$K48B@=Hr2{tw@WLV6U6_lTt5>%R(ms&JAkV!|V zc@e`+rpU#NNlrd2sYZH+dIppGnN%i6GO9B!nykvCG5G_d>EuqPI4*|N)I42xC#J?l zll7TZC%Vg;alE*?|I%CXP()2TKO|FG*~;B i=k&J5{@vg0kYAd!)9&5}wm*H7O!^nzy*Q7za4!Hwvv)KA delta 337 zcmbQwHjRCPqASB9#v2MH86_nJ#a8AE{j+~maF+_aEkF=GnIl!-r$ z7#B@WW7J?}xXBc`c(M(nHhYqj4@kjeRz@9OrmUd+#FU`Yyu8$+MU%HPnojO#)L?;0 z^B_x4e#02Y%+$DOawU`NS7w>3H7D|ZsbMJCZo8#nS>slNlTvYalV)wW rRjL#DzIpQgg?wtOH*=bw`nhYt?`M@2j7M(o-o&2Nwf)ncwJ8?>`$>X| diff --git a/cmd/testcases/src/psa-refval.yaml b/cmd/testcases/src/psa-refval.yaml index 9a5d71e..0fae32a 100644 --- a/cmd/testcases/src/psa-refval.yaml +++ b/cmd/testcases/src/psa-refval.yaml @@ -22,55 +22,39 @@ # acme-implementation-id-000000001 1: ACME 2: RoadRunner - - 0: - tag: 601 - value: - 1: BL - 4: 2.1.0 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= - - - 0: - 0: - tag: 600 - value: !!binary |- - YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDEK - # acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: PRoT - 4: 1.3.5 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= - - - 0: - 0: - tag: 600 - value: !!binary |- - YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDEK - # acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: ARoT - 4: 0.1.4 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= + - - 0: + tag: 601 + value: + 1: BL + 4: 2.1.0 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= + - 0: + tag: 601 + value: + 1: PRoT + 4: 1.3.5 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= + - 0: + tag: 601 + value: + 1: ARoT + 4: 0.1.4 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= diff --git a/cmd/testcases/src/signed-corim-valid.yaml b/cmd/testcases/src/signed-corim-valid.yaml index 513f2ae..1a8c4a6 100644 --- a/cmd/testcases/src/signed-corim-valid.yaml +++ b/cmd/testcases/src/signed-corim-valid.yaml @@ -25,54 +25,42 @@ value: acme-implementation-id-000000001 1: ACME 2: RoadRunner - - 0: - tag: 601 - value: - 1: BL - 4: 2.1.0 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= - - - 0: - 0: - tag: 600 - value: acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: PRoT - 4: 1.3.5 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= - - - 0: - 0: - tag: 600 - value: acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: ARoT - 4: 0.1.4 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= + - - 0: + tag: 601 + value: + 1: BL + 4: 2.1.0 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= + - 0: + tag: 601 + value: + 1: PRoT + 4: 1.3.5 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= + - 0: + tag: 601 + value: + 1: ARoT + 4: 0.1.4 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= 2: - 0: tag: 32 diff --git a/cmd/testcases/src/test-comid.yaml b/cmd/testcases/src/test-comid.yaml index 9a5d71e..0fae32a 100644 --- a/cmd/testcases/src/test-comid.yaml +++ b/cmd/testcases/src/test-comid.yaml @@ -22,55 +22,39 @@ # acme-implementation-id-000000001 1: ACME 2: RoadRunner - - 0: - tag: 601 - value: - 1: BL - 4: 2.1.0 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= - - - 0: - 0: - tag: 600 - value: !!binary |- - YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDEK - # acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: PRoT - 4: 1.3.5 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= - - - 0: - 0: - tag: 600 - value: !!binary |- - YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDEK - # acme-implementation-id-000000001 - 1: ACME - 2: RoadRunner - - 0: - tag: 601 - value: - 1: ARoT - 4: 0.1.4 - 5: !!binary |- - rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= - 1: - 2: - - - 1 - - !!binary |- - o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= + - - 0: + tag: 601 + value: + 1: BL + 4: 2.1.0 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc= + - 0: + tag: 601 + value: + 1: PRoT + 4: 1.3.5 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8= + - 0: + tag: 601 + value: + 1: ARoT + 4: 0.1.4 + 5: !!binary |- + rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs= + 1: + 2: + - - 1 + - !!binary |- + o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg= diff --git a/cmd/testcases/test-comid.cbor b/cmd/testcases/test-comid.cbor index 42a79e38bb812fa3ceafc4f2550c66982ded5263..ddb69dcc2cfb54984edf332a5aa81e9df1e62c44 100644 GIT binary patch delta 35 rcmbQmvXGf|3Clu;#)g8V7fVRw6&0nVmZT<^E6G2=ppfYtmi8~5LFV_EHG@Pmc@^_h)~P3!=y5euaN From 3678b52fdeda91e1bb64fb188c41ba8e413a6d5e Mon Sep 17 00:00:00 2001 From: Yogesh Deshpande Date: Mon, 7 Oct 2024 19:16:16 +0100 Subject: [PATCH 2/3] chore: Move to latest of CoRIM package Signed-off-by: Yogesh Deshpande Moving to latest CoRIM Signed-off-by: Yogesh Deshpande --- go.mod | 4 ++-- go.sum | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a89a68c..1a993d3 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/spf13/viper v1.9.0 github.com/stretchr/testify v1.9.0 github.com/veraison/apiclient v0.3.1-0.20240807160142-9141ad363e45 - github.com/veraison/corim v1.1.3-0.20240814105452-be7ec4829479 - github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7 + github.com/veraison/corim v1.1.3-0.20241003171039-fe09de9f3764 + github.com/veraison/go-cose v1.3.0 github.com/veraison/swid v1.1.1-0.20230911094910-8ffdd07a22ca ) diff --git a/go.sum b/go.sum index 7d9b580..08f1972 100644 --- a/go.sum +++ b/go.sum @@ -323,10 +323,16 @@ github.com/veraison/apiclient v0.3.1-0.20240807160142-9141ad363e45 h1:o+gCzGtusX github.com/veraison/apiclient v0.3.1-0.20240807160142-9141ad363e45/go.mod h1:LCXFZ3D/tJ3HLAOHUg8bnAKGvgTl53e1ntwdwjVbQ5A= github.com/veraison/corim v1.1.3-0.20240814105452-be7ec4829479 h1:dcKW+Nugh2Cs/ihz6xAmmTfi4v5flaLTg6MiZ8gN3N8= github.com/veraison/corim v1.1.3-0.20240814105452-be7ec4829479/go.mod h1:sYmwruIqD5+83OcvMg6WUDTTWq8AWM6QbVQhbE9VFQM= +github.com/veraison/corim v1.1.3-0.20241003171039-fe09de9f3764 h1:48GvCJSVsBDaqIiK0m+h4D9rhAwLlzias+F5oLId/Fg= +github.com/veraison/corim v1.1.3-0.20241003171039-fe09de9f3764/go.mod h1:Wj3a6bSo7+3peVGjwGayHDALILh4PHMngDhgBYUbVLk= github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff h1:r6I2eJL/z8dp5flsQIKHMeDjyV6UO8If3MaVBLvTjF4= github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff/go.mod h1:+kxt8iuFiVvKRs2VQ1Ho7bbAScXAB/kHFFuP5Biw19I= github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7 h1:KcKzBthSrSZIUEWBjVvkuk/DE3PyYFbXZxhx5byGFtc= github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8= +github.com/veraison/go-cose v1.2.1 h1:Gj4x20D0YP79J2+cK3anjGEMwIkg2xX+TKVVGUXwNAc= +github.com/veraison/go-cose v1.2.1/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8= +github.com/veraison/go-cose v1.3.0 h1:2/H5w8kdSpQJyVtIhx8gmwPJ2uSz1PkyWFx0idbd7rk= +github.com/veraison/go-cose v1.3.0/go.mod h1:df09OV91aHoQWLmy1KsDdYiagtXgyAwAl8vFeFn1gMc= github.com/veraison/swid v1.1.1-0.20230911094910-8ffdd07a22ca h1:osmCKwWO/xM68Kz+rIXio1DNzEY2NdJOpGpoy5r8NlE= github.com/veraison/swid v1.1.1-0.20230911094910-8ffdd07a22ca/go.mod h1:d5jt76uMNbTfQ+f2qU4Lt8RvWOTsv6PFgstIM1QdMH0= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= From 1a7ad1fcdaba179927756d1c957c4a2a36d133d8 Mon Sep 17 00:00:00 2001 From: Yogesh Deshpande Date: Tue, 8 Oct 2024 20:07:00 +0100 Subject: [PATCH 3/3] Tidied up go.sum Signed-off-by: Yogesh Deshpande --- go.sum | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.sum b/go.sum index 08f1972..95dd6cc 100644 --- a/go.sum +++ b/go.sum @@ -321,16 +321,10 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/veraison/apiclient v0.3.1-0.20240807160142-9141ad363e45 h1:o+gCzGtusXZOOXuJavzvpraSk8ify4U60Aq9r/4vOho= github.com/veraison/apiclient v0.3.1-0.20240807160142-9141ad363e45/go.mod h1:LCXFZ3D/tJ3HLAOHUg8bnAKGvgTl53e1ntwdwjVbQ5A= -github.com/veraison/corim v1.1.3-0.20240814105452-be7ec4829479 h1:dcKW+Nugh2Cs/ihz6xAmmTfi4v5flaLTg6MiZ8gN3N8= -github.com/veraison/corim v1.1.3-0.20240814105452-be7ec4829479/go.mod h1:sYmwruIqD5+83OcvMg6WUDTTWq8AWM6QbVQhbE9VFQM= github.com/veraison/corim v1.1.3-0.20241003171039-fe09de9f3764 h1:48GvCJSVsBDaqIiK0m+h4D9rhAwLlzias+F5oLId/Fg= github.com/veraison/corim v1.1.3-0.20241003171039-fe09de9f3764/go.mod h1:Wj3a6bSo7+3peVGjwGayHDALILh4PHMngDhgBYUbVLk= github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff h1:r6I2eJL/z8dp5flsQIKHMeDjyV6UO8If3MaVBLvTjF4= github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff/go.mod h1:+kxt8iuFiVvKRs2VQ1Ho7bbAScXAB/kHFFuP5Biw19I= -github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7 h1:KcKzBthSrSZIUEWBjVvkuk/DE3PyYFbXZxhx5byGFtc= -github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8= -github.com/veraison/go-cose v1.2.1 h1:Gj4x20D0YP79J2+cK3anjGEMwIkg2xX+TKVVGUXwNAc= -github.com/veraison/go-cose v1.2.1/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8= github.com/veraison/go-cose v1.3.0 h1:2/H5w8kdSpQJyVtIhx8gmwPJ2uSz1PkyWFx0idbd7rk= github.com/veraison/go-cose v1.3.0/go.mod h1:df09OV91aHoQWLmy1KsDdYiagtXgyAwAl8vFeFn1gMc= github.com/veraison/swid v1.1.1-0.20230911094910-8ffdd07a22ca h1:osmCKwWO/xM68Kz+rIXio1DNzEY2NdJOpGpoy5r8NlE=