Merge git://git.denx.de/u-boot-samsung

[people/ms/u-boot.git] / tools / image-host.c

diff --git a/tools/image-host.c b/tools/image-host.c
index c60d4adb3dece07d85c34cfaec8355d773bfb45a..2c0030b5e23ef076c9fb48ce821982708486c873 100644 (file)
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -166,7 +166,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
        info->keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL);
        info->fit = fit;
        info->node_offset = noffset;
-       info->name = algo_name;
+       info->name = strdup(algo_name);
        info->checksum = image_get_checksum_algo(algo_name);
        info->crypto = image_get_crypto_algo(algo_name);
        info->require_keys = require_keys;
@@ -242,18 +242,19 @@ static int fit_image_process_sig(const char *keydir, void *keydest,
        /* Get keyname again, as FDT has changed and invalidated our pointer */
        info.keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL);
 
-       if (keydest)
-               ret = info.crypto->add_verify_data(&info, keydest);
-       else
-               return -1;
-
        /*
         * Write the public key into the supplied FDT file; this might fail
         * several times, since we try signing with successively increasing
         * size values
         */
-       if (keydest && ret)
-               return ret;
+       if (keydest) {
+               ret = info.crypto->add_verify_data(&info, keydest);
+               if (ret) {
+                       printf("Failed to add verification data for '%s' signature node in '%s' image node\n",
+                              node_name, image_name);
+                       return ret;
+               }
+       }
 
        return 0;
 }
@@ -625,10 +626,8 @@ static int fit_config_process_sig(const char *keydir, void *keydest,
        /* Write the public key into the supplied FDT file */
        if (keydest) {
                ret = info.crypto->add_verify_data(&info, keydest);
-               if (ret == -ENOSPC)
-                       return -ENOSPC;
                if (ret) {
-                       printf("Failed to add verification data for '%s' signature node in '%s' image node\n",
+                       printf("Failed to add verification data for '%s' signature node in '%s' configuration node\n",
                               node_name, conf_name);
                }
                return ret;