From: Quentin Schulz <quentin.sch...@cherry.de>
key-name-hint property in u-boot-spl-pubkey-dtb binman entry may contain
a path instead of a filename due to user mistake.
Because we currently assume it is a filename instead of a path, binman
will find the full path to the key based on that path, and return the
dirname of the full path but keeps the path in key-name-hint instead of
stripping the directories from it.
This means mkimage will fail with the following error message if we have
key-name-hint set to keys/dev:
binman: Error 1 running 'fdt_add_pubkey -a sha256,rsa2048 -k
/home/qschulz/work/upstream/u-boot/keys -n keys/dev -r conf
/home/qschulz/work/upstream/u-boot/build/ringneck/u-boot-spl-dtbdhsfx3mf':
Couldn't open RSA certificate:
'/home/qschulz/work/upstream/u-boot/keys/keys/dev.crt': No such file or
directory
Let's make it a bit more obvious what the error is by erroring out in
binman if a path is provided in key-name-hint (it is named key-name-hint
and not key-path-hint after all).
Fixes: 5609843b57a4 ("binman: etype: Add u-boot-spl-pubkey-dtb etype")
Signed-off-by: Quentin Schulz <quentin.sch...@cherry.de>
---
tools/binman/etype/u_boot_spl_pubkey_dtb.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/binman/etype/u_boot_spl_pubkey_dtb.py
b/tools/binman/etype/u_boot_spl_pubkey_dtb.py
index
cb196061de28610eb785fb44c887982e3979659f..70c74b7638228f8093b85b144c6407dc92875be5
100644
--- a/tools/binman/etype/u_boot_spl_pubkey_dtb.py
+++ b/tools/binman/etype/u_boot_spl_pubkey_dtb.py
@@ -87,6 +87,8 @@ class Entry_u_boot_spl_pubkey_dtb(Entry_blob_dtb):
dir=tools.get_output_dir())\
as pubkey_tdb:
tools.write_file(pubkey_tdb.name, self.GetData())
+ if '/' in self._key_name_hint:
+ self.Raise(f"'{self._key_name_hint}' is a path and not a
filename")
keyname = tools.get_input_filename(self._key_name_hint + ".crt")
self.fdt_add_pubkey.run(pubkey_tdb.name,
os.path.dirname(keyname),
--
2.49.0
