u-boot.git/tools/image-host.c, branch v2020.10

mkimage: fit: include image cipher in configuration signature

2020-08-07T15:47:18Z

This patch addresses issue #2 for signed configurations. -----8<----- Including the image cipher properties in the configuration signature prevents an attacker from modifying cipher, key or iv properties. Signed-off-by: Patrick Oppenlander Reviewed-by: Philippe Reynes

mkimage: fit: don't cipher ciphered data

2020-08-07T15:47:18Z

Previously, mkimage -F could be run multiple times causing already ciphered image data to be ciphered again. Signed-off-by: Patrick Oppenlander Reviewed-by: Philippe Reynes

mkimage: fit: handle FDT_ERR_NOSPACE when ciphering

2020-08-07T15:47:18Z

Also replace fdt_delprop/fdt_setprop with fdt_setprop as fdt_setprop can replace an existing property value. Signed-off-by: Patrick Oppenlander Reviewed-by: Philippe Reynes

mkimage: fit: only process one cipher node

2020-08-07T15:47:18Z

Previously mkimage would process any node matching the regex cipher.* and apply the ciphers to the image data in the order they appeared in the FDT. This meant that data could be inadvertently ciphered multiple times. Switch to processing a single cipher node which exactly matches FIT_CIPHER_NODENAME. Signed-off-by: Patrick Oppenlander Reviewed-by: Philippe Reynes

libfdt: split fdt_region declarations out to

2020-04-26T20:24:08Z

fdt_region APIs are not part of libfdt. They are U-Boot extension for the verified boot. Split the declarations related to fdt_region out of . This allows to become a simple wrapper file, like Linux does. Signed-off-by: Masahiro Yamada

tools: image-host.c: use correct output format

2020-04-24T14:51:32Z

When building on a 32bit host the following warning occurs: tools/image-host.c: In function ‘fit_image_read_data’: tools/image-host.c:310:42: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘ssize_t’ {aka ‘int’} [-Wformat=] printf("Can't read all file %s (read %ld bytes, expexted %ld)\n", ~~^ %d filename, n, sbuf.st_size); ~ n is of type ssize_t so we should use %zd for printing. Fixes: 7298e422504e ("mkimage: fit: add support to encrypt image with aes") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass

image: Use constants for 'required' and 'key-name-hint'

2020-04-01T13:45:09Z

These are used in multiple places so update them to use a shared #define. Signed-off-by: Simon Glass Reviewed-by: Philippe Reynes

fit_check_sign: Allow selecting the configuration to verify

2020-04-01T13:45:09Z

This tool always verifies the default configuration. It is useful to be able to verify a specific one. Add a command-line flag for this and plumb the logic through. Signed-off-by: Simon Glass

image: Be a little more verbose when checking signatures

2020-04-01T13:45:09Z

It is useful to be a little more specific about what is being checked. Update a few messages to help with this. Signed-off-by: Simon Glass

tools: image-host.c: remove uboot_aes.h

2020-02-25T16:29:39Z

The include uboot_aes.h is not useful and it breaks the compilation on android, so we remove it. Signed-off-by: Philippe Reynes Reported-by: Praneeth Bajjuri