| Message ID | 1542127401-7107-7-git-send-email-philippe.reynes@softathome.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,V3,1/7] rsa: use new openssl API to create signature | expand |
Hi Philippe, Sorry, If my explanation wasn't clear in my previous email but as your series is still not merged you should have squash this commit... On Tue, 13 Nov 2018 at 21:37, Philippe Reynes <philippe.reynes@softathome.com> wrote: > > This update the its file used in vboot test to respect the new > node style name defined in doc/uImage.FIT (for example: replace > kernel@1 by kernel and fdt@1 by fdt-1) > > Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Please don't do that next time, you are able to keep the "Reviewed-by" on patch already review or slightly modified. Here, you introduce a new patch in your serie and Simon didn't review it, so you should not add a "Reviewed-by' on this commit ! > Reviewed-by: Clément Péron <peron.clem@gmail.com> Also I don't gave you my "Reviewed-by" tag, only made a comment about the its format, so you should not add my tag on all your patches. Please could you repost a v4 where This patch is squashed with the commit introducing these files. Only the Simon Glass Reviewed-by tags are present. Thanks for your contribution, Clément > --- > test/py/tests/test_vboot.py | 2 +- > test/py/tests/vboot/sign-configs-sha1-pss.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha1.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha256-pss.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha256.its | 18 +++++++++--------- > test/py/tests/vboot/sign-images-sha1-pss.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha1.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha256-pss.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha256.its | 16 ++++++++-------- > 9 files changed, 69 insertions(+), 69 deletions(-) > > Changelog: > v3: > - new patch in the serie (feedback from Clément Péron) > > diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py > index a3a3879..1e6ae7a 100644 > --- a/test/py/tests/test_vboot.py > +++ b/test/py/tests/test_vboot.py > @@ -204,7 +204,7 @@ def test_vboot(u_boot_console): > fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign' > dtc_args = '-I dts -O dtb -i %s' % tmpdir > dtb = '%ssandbox-u-boot.dtb' % tmpdir > - sig_node = '/configurations/conf@1/signature@1' > + sig_node = '/configurations/conf-1/signature' > > # Create an RSA key pair > public_exponent = 65537 > diff --git a/test/py/tests/vboot/sign-configs-sha1-pss.its b/test/py/tests/vboot/sign-configs-sha1-pss.its > index 3c3ab20..72a5637 100644 > --- a/test/py/tests/vboot/sign-configs-sha1-pss.its > +++ b/test/py/tests/vboot/sign-configs-sha1-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > diff --git a/test/py/tests/vboot/sign-configs-sha1.its b/test/py/tests/vboot/sign-configs-sha1.its > index db2ed79..d8bc1fa 100644 > --- a/test/py/tests/vboot/sign-configs-sha1.its > +++ b/test/py/tests/vboot/sign-configs-sha1.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > sign-images = "fdt", "kernel"; > diff --git a/test/py/tests/vboot/sign-configs-sha256-pss.its b/test/py/tests/vboot/sign-configs-sha256-pss.its > index 8e33510..7bdcc7e 100644 > --- a/test/py/tests/vboot/sign-configs-sha256-pss.its > +++ b/test/py/tests/vboot/sign-configs-sha256-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > diff --git a/test/py/tests/vboot/sign-configs-sha256.its b/test/py/tests/vboot/sign-configs-sha256.its > index 1b3432e..f5591aa 100644 > --- a/test/py/tests/vboot/sign-configs-sha256.its > +++ b/test/py/tests/vboot/sign-configs-sha256.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > sign-images = "fdt", "kernel"; > diff --git a/test/py/tests/vboot/sign-images-sha1-pss.its b/test/py/tests/vboot/sign-images-sha1-pss.its > index d19c4d7..ded7ae4 100644 > --- a/test/py/tests/vboot/sign-images-sha1-pss.its > +++ b/test/py/tests/vboot/sign-images-sha1-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,20 +14,20 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > @@ -35,10 +35,10 @@ > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha1.its b/test/py/tests/vboot/sign-images-sha1.its > index f69326a..18c759e 100644 > --- a/test/py/tests/vboot/sign-images-sha1.its > +++ b/test/py/tests/vboot/sign-images-sha1.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,29 +14,29 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha256-pss.its b/test/py/tests/vboot/sign-images-sha256-pss.its > index 43612f8..34850cc 100644 > --- a/test/py/tests/vboot/sign-images-sha256-pss.its > +++ b/test/py/tests/vboot/sign-images-sha256-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,20 +14,20 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > @@ -35,10 +35,10 @@ > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha256.its b/test/py/tests/vboot/sign-images-sha256.its > index e6aa9fc..bb0f8ee 100644 > --- a/test/py/tests/vboot/sign-images-sha256.its > +++ b/test/py/tests/vboot/sign-images-sha256.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,29 +14,29 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > -- > 2.7.4 >
Hi Clément, You're right, I've done several mistake on the tag for the serie 3. I shouldn't add a reviewed by simon on the new patch, and sorry, I've understood that you provide a reviewed by on the whole serie. I've send a v4 with clean tag. Regards, Philippe ----- Mail original ----- De: "Clément Péron" <peron.clem@gmail.com> À: "philippe reynes" <philippe.reynes@softathome.com> Cc: sjg@chromium.org, "joe hershberger" <joe.hershberger@ni.com>, "michal simek" <michal.simek@xilinx.com>, "yamada masahiro" <yamada.masahiro@socionext.com>, "Marek Vasut" <marex@denx.de>, "Adam Ford" <aford173@gmail.com>, "woods technical" <woods.technical@gmail.com>, "Teddy Reed V" <teddy.reed@gmail.com>, "jun nie" <jun.nie@linaro.org>, "Kelvin Cheung" <keguang.zhang@gmail.com>, "peng fan" <peng.fan@nxp.com>, "andre przywara" <andre.przywara@arm.com>, "Philipp Tomsich" <philipp.tomsich@theobroma-systems.com>, "Bin Chen" <bin.chen@linaro.org>, jsg@jsg.id.au, nomble@palism.com, "paul burton" <paul.burton@mips.com>, "Alex Kiernan" <alex.kiernan@gmail.com>, "u-boot" <u-boot@lists.denx.de> Envoyé: Mercredi 14 Novembre 2018 13:32:32 Objet: Re: [PATCH V3 7/7] test: vboot: clean its file Hi Philippe, Sorry, If my explanation wasn't clear in my previous email but as your series is still not merged you should have squash this commit... On Tue, 13 Nov 2018 at 21:37, Philippe Reynes <philippe.reynes@softathome.com> wrote: > > This update the its file used in vboot test to respect the new > node style name defined in doc/uImage.FIT (for example: replace > kernel@1 by kernel and fdt@1 by fdt-1) > > Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Please don't do that next time, you are able to keep the "Reviewed-by" on patch already review or slightly modified. Here, you introduce a new patch in your serie and Simon didn't review it, so you should not add a "Reviewed-by' on this commit ! > Reviewed-by: Clément Péron <peron.clem@gmail.com> Also I don't gave you my "Reviewed-by" tag, only made a comment about the its format, so you should not add my tag on all your patches. Please could you repost a v4 where This patch is squashed with the commit introducing these files. Only the Simon Glass Reviewed-by tags are present. Thanks for your contribution, Clément > --- > test/py/tests/test_vboot.py | 2 +- > test/py/tests/vboot/sign-configs-sha1-pss.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha1.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha256-pss.its | 18 +++++++++--------- > test/py/tests/vboot/sign-configs-sha256.its | 18 +++++++++--------- > test/py/tests/vboot/sign-images-sha1-pss.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha1.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha256-pss.its | 16 ++++++++-------- > test/py/tests/vboot/sign-images-sha256.its | 16 ++++++++-------- > 9 files changed, 69 insertions(+), 69 deletions(-) > > Changelog: > v3: > - new patch in the serie (feedback from Clément Péron) > > diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py > index a3a3879..1e6ae7a 100644 > --- a/test/py/tests/test_vboot.py > +++ b/test/py/tests/test_vboot.py > @@ -204,7 +204,7 @@ def test_vboot(u_boot_console): > fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign' > dtc_args = '-I dts -O dtb -i %s' % tmpdir > dtb = '%ssandbox-u-boot.dtb' % tmpdir > - sig_node = '/configurations/conf@1/signature@1' > + sig_node = '/configurations/conf-1/signature' > > # Create an RSA key pair > public_exponent = 65537 > diff --git a/test/py/tests/vboot/sign-configs-sha1-pss.its b/test/py/tests/vboot/sign-configs-sha1-pss.its > index 3c3ab20..72a5637 100644 > --- a/test/py/tests/vboot/sign-configs-sha1-pss.its > +++ b/test/py/tests/vboot/sign-configs-sha1-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > diff --git a/test/py/tests/vboot/sign-configs-sha1.its b/test/py/tests/vboot/sign-configs-sha1.its > index db2ed79..d8bc1fa 100644 > --- a/test/py/tests/vboot/sign-configs-sha1.its > +++ b/test/py/tests/vboot/sign-configs-sha1.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha1"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > sign-images = "fdt", "kernel"; > diff --git a/test/py/tests/vboot/sign-configs-sha256-pss.its b/test/py/tests/vboot/sign-configs-sha256-pss.its > index 8e33510..7bdcc7e 100644 > --- a/test/py/tests/vboot/sign-configs-sha256-pss.its > +++ b/test/py/tests/vboot/sign-configs-sha256-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > diff --git a/test/py/tests/vboot/sign-configs-sha256.its b/test/py/tests/vboot/sign-configs-sha256.its > index 1b3432e..f5591aa 100644 > --- a/test/py/tests/vboot/sign-configs-sha256.its > +++ b/test/py/tests/vboot/sign-configs-sha256.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,28 +14,28 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - hash@1 { > + hash-1 { > algo = "sha256"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > - signature@1 { > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > sign-images = "fdt", "kernel"; > diff --git a/test/py/tests/vboot/sign-images-sha1-pss.its b/test/py/tests/vboot/sign-images-sha1-pss.its > index d19c4d7..ded7ae4 100644 > --- a/test/py/tests/vboot/sign-images-sha1-pss.its > +++ b/test/py/tests/vboot/sign-images-sha1-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,20 +14,20 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > @@ -35,10 +35,10 @@ > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha1.its b/test/py/tests/vboot/sign-images-sha1.its > index f69326a..18c759e 100644 > --- a/test/py/tests/vboot/sign-images-sha1.its > +++ b/test/py/tests/vboot/sign-images-sha1.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,29 +14,29 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha1,rsa2048"; > key-name-hint = "dev"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha256-pss.its b/test/py/tests/vboot/sign-images-sha256-pss.its > index 43612f8..34850cc 100644 > --- a/test/py/tests/vboot/sign-images-sha256-pss.its > +++ b/test/py/tests/vboot/sign-images-sha256-pss.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,20 +14,20 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > padding = "pss"; > key-name-hint = "dev"; > @@ -35,10 +35,10 @@ > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > diff --git a/test/py/tests/vboot/sign-images-sha256.its b/test/py/tests/vboot/sign-images-sha256.its > index e6aa9fc..bb0f8ee 100644 > --- a/test/py/tests/vboot/sign-images-sha256.its > +++ b/test/py/tests/vboot/sign-images-sha256.its > @@ -5,7 +5,7 @@ > #address-cells = <1>; > > images { > - kernel@1 { > + kernel { > data = /incbin/("test-kernel.bin"); > type = "kernel_noload"; > arch = "sandbox"; > @@ -14,29 +14,29 @@ > load = <0x4>; > entry = <0x8>; > kernel-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > }; > }; > - fdt@1 { > + fdt-1 { > description = "snow"; > data = /incbin/("sandbox-kernel.dtb"); > type = "flat_dt"; > arch = "sandbox"; > compression = "none"; > fdt-version = <1>; > - signature@1 { > + signature { > algo = "sha256,rsa2048"; > key-name-hint = "dev"; > }; > }; > }; > configurations { > - default = "conf@1"; > - conf@1 { > - kernel = "kernel@1"; > - fdt = "fdt@1"; > + default = "conf-1"; > + conf-1 { > + kernel = "kernel"; > + fdt = "fdt-1"; > }; > }; > }; > -- > 2.7.4 >
diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index a3a3879..1e6ae7a 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -204,7 +204,7 @@ def test_vboot(u_boot_console): fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign' dtc_args = '-I dts -O dtb -i %s' % tmpdir dtb = '%ssandbox-u-boot.dtb' % tmpdir - sig_node = '/configurations/conf@1/signature@1' + sig_node = '/configurations/conf-1/signature' # Create an RSA key pair public_exponent = 65537 diff --git a/test/py/tests/vboot/sign-configs-sha1-pss.its b/test/py/tests/vboot/sign-configs-sha1-pss.its index 3c3ab20..72a5637 100644 --- a/test/py/tests/vboot/sign-configs-sha1-pss.its +++ b/test/py/tests/vboot/sign-configs-sha1-pss.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,28 +14,28 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature { algo = "sha1,rsa2048"; padding = "pss"; key-name-hint = "dev"; diff --git a/test/py/tests/vboot/sign-configs-sha1.its b/test/py/tests/vboot/sign-configs-sha1.its index db2ed79..d8bc1fa 100644 --- a/test/py/tests/vboot/sign-configs-sha1.its +++ b/test/py/tests/vboot/sign-configs-sha1.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,28 +14,28 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; sign-images = "fdt", "kernel"; diff --git a/test/py/tests/vboot/sign-configs-sha256-pss.its b/test/py/tests/vboot/sign-configs-sha256-pss.its index 8e33510..7bdcc7e 100644 --- a/test/py/tests/vboot/sign-configs-sha256-pss.its +++ b/test/py/tests/vboot/sign-configs-sha256-pss.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,28 +14,28 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - hash@1 { + hash-1 { algo = "sha256"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - hash@1 { + hash-1 { algo = "sha256"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature { algo = "sha256,rsa2048"; padding = "pss"; key-name-hint = "dev"; diff --git a/test/py/tests/vboot/sign-configs-sha256.its b/test/py/tests/vboot/sign-configs-sha256.its index 1b3432e..f5591aa 100644 --- a/test/py/tests/vboot/sign-configs-sha256.its +++ b/test/py/tests/vboot/sign-configs-sha256.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,28 +14,28 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - hash@1 { + hash-1 { algo = "sha256"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - hash@1 { + hash-1 { algo = "sha256"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature { algo = "sha256,rsa2048"; key-name-hint = "dev"; sign-images = "fdt", "kernel"; diff --git a/test/py/tests/vboot/sign-images-sha1-pss.its b/test/py/tests/vboot/sign-images-sha1-pss.its index d19c4d7..ded7ae4 100644 --- a/test/py/tests/vboot/sign-images-sha1-pss.its +++ b/test/py/tests/vboot/sign-images-sha1-pss.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,20 +14,20 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; padding = "pss"; key-name-hint = "dev"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; padding = "pss"; key-name-hint = "dev"; @@ -35,10 +35,10 @@ }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/test/py/tests/vboot/sign-images-sha1.its b/test/py/tests/vboot/sign-images-sha1.its index f69326a..18c759e 100644 --- a/test/py/tests/vboot/sign-images-sha1.its +++ b/test/py/tests/vboot/sign-images-sha1.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,29 +14,29 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/test/py/tests/vboot/sign-images-sha256-pss.its b/test/py/tests/vboot/sign-images-sha256-pss.its index 43612f8..34850cc 100644 --- a/test/py/tests/vboot/sign-images-sha256-pss.its +++ b/test/py/tests/vboot/sign-images-sha256-pss.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,20 +14,20 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - signature@1 { + signature { algo = "sha256,rsa2048"; padding = "pss"; key-name-hint = "dev"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - signature@1 { + signature { algo = "sha256,rsa2048"; padding = "pss"; key-name-hint = "dev"; @@ -35,10 +35,10 @@ }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/test/py/tests/vboot/sign-images-sha256.its b/test/py/tests/vboot/sign-images-sha256.its index e6aa9fc..bb0f8ee 100644 --- a/test/py/tests/vboot/sign-images-sha256.its +++ b/test/py/tests/vboot/sign-images-sha256.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,29 +14,29 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - signature@1 { + signature { algo = "sha256,rsa2048"; key-name-hint = "dev"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - signature@1 { + signature { algo = "sha256,rsa2048"; key-name-hint = "dev"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; }; }; };