diff options
| author | Sean Anderson <sean.anderson@seco.com> | 2022-12-12 14:12:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-31 13:35:19 -0500 |
| commit | bcc85b96b5ffbbce19a89747138feb873d918915 (patch) | |
| tree | 9a4c733db8ec3b99444a5ff9177aeb709459ad07 /test/py | |
| parent | c4f5738e690487dc59c8234782e792e57dac9a22 (diff) | |
| download | u-boot-bcc85b96b5ffbbce19a89747138feb873d918915.tar.gz u-boot-bcc85b96b5ffbbce19a89747138feb873d918915.tar.bz2 u-boot-bcc85b96b5ffbbce19a89747138feb873d918915.zip | |
cmd: source: Support specifying config name
As discussed previously [1,2], the source command is not safe to use with
verified boot unless there is a key with required = "images" (which has its
own problems). This is because if such a key is absent, signatures are
verified but not required. It is assumed that configuration nodes will
provide the signature. Because the source command does not use
configurations to determine the image to source, effectively no
verification takes place.
To address this, allow specifying configuration nodes. We use the same
syntax as the bootm command (helpfully provided for us by fit_parse_conf).
By default, we first try the default config and then the default image. To
force using a config, # must be present in the command (e.g. `source
$loadaddr#my-conf`). For convenience, the config may be omitted, just like
the address may be (e.g. `source \#`). This also works for images
(`source :` behaves exactly like `source` currently does).
[1] https://lore.kernel.org/u-boot/7d711133-d513-5bcb-52f2-a9dbaa9eeded@prevas.dk/
[2] https://lore.kernel.org/u-boot/042dcb34-f85f-351e-1b0e-513f89005fdd@gmail.com/
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/tests/test_source.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/test/py/tests/test_source.py b/test/py/tests/test_source.py index e5ffdfe3fc..bbc311df6d 100644 --- a/test/py/tests/test_source.py +++ b/test/py/tests/test_source.py @@ -18,11 +18,20 @@ def test_source(u_boot_console): util.run_and_log(cons, (mkimage, '-f', its, fit)) cons.run_command(f'host load hostfs - $loadaddr {fit}') - assert '1' in cons.run_command('source') + assert '2' in cons.run_command('source') + assert '1' in cons.run_command('source :') assert '1' in cons.run_command('source :script-1') assert '2' in cons.run_command('source :script-2') assert 'Fail' in cons.run_command('source :not-a-script || echo Fail') + assert '2' in cons.run_command('source \\#') + assert '1' in cons.run_command('source \\#conf-1') + assert '2' in cons.run_command('source \\#conf-2') cons.run_command('fdt addr $loadaddr') + cons.run_command('fdt rm /configurations default') + assert '1' in cons.run_command('source') + assert 'Fail' in cons.run_command('source \\# || echo Fail') + cons.run_command('fdt rm /images default') assert 'Fail' in cons.run_command('source || echo Fail') + assert 'Fail' in cons.run_command('source \\# || echo Fail') |