]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
image-host: Fix error value paths and emit error messages to stderr.
authorHugo Cornelis <hugo.cornelis@essensium.com>
Thu, 21 Mar 2024 11:22:22 +0000 (12:22 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 12 Apr 2024 14:53:31 +0000 (08:53 -0600)
A recent refactoring in image-host.c messed up the return values of
the function that reads the encryptiong keys.  This patch fixes this
and also makes sure that error output goes to stderr instead of to
stdout.

Signed-off-by: Hugo Cornelis <hugo.cornelis@essensium.com>
tools/image-host.c

index b2a0f2e6d16eca04f4d8d13741851d277b7ef38b..7bfc0cb6b1823b30bae3ce918fb247956633565f 100644 (file)
@@ -346,17 +346,17 @@ static int fit_image_read_key_iv_data(const char *keydir, const char *key_iv_nam
                                      unsigned char *key_iv_data, int expected_size)
 {
        char filename[PATH_MAX];
-       int ret = -1;
+       int ret;
 
        ret = snprintf(filename, sizeof(filename), "%s/%s%s",
                       keydir, key_iv_name, ".bin");
        if (ret >= sizeof(filename)) {
-               printf("Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n");
-               ret = -1;
+               fprintf(stderr, "Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n");
+               return -1;
        }
        if (ret < 0) {
-               printf("Can't format the key or IV filename when setting up the cipher: snprintf error\n");
-               ret = -1;
+               fprintf(stderr, "Can't format the key or IV filename when setting up the cipher: snprintf error\n");
+               return -1;
        }
 
        ret = fit_image_read_data(filename, key_iv_data, expected_size);