doc: Add the U-Boot logo to the html doc

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

diff --git a/tools/image-host.c b/tools/image-host.c
index be2d59b7c0d919fa428547e34d79820be9e56865..88b329502ca3a56e6a1349f3312cfab2e4117143 100644 (file)
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -106,7 +106,7 @@ static int fit_image_process_hash(void *fit, const char *image_name,
  */
 static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
                int value_len, const char *comment, const char *region_prop,
-               int region_proplen)
+               int region_proplen, const char *cmdname)
 {
        int string_size;
        int ret;
@@ -128,8 +128,12 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
        }
        if (comment && !ret)
                ret = fdt_setprop_string(fit, noffset, "comment", comment);
-       if (!ret)
-               ret = fit_set_timestamp(fit, noffset, time(NULL));
+       if (!ret) {
+               time_t timestamp = imagetool_get_source_date(cmdname,
+                                                            time(NULL));
+
+               ret = fit_set_timestamp(fit, noffset, timestamp);
+       }
        if (region_prop && !ret) {
                uint32_t strdata[2];
 
@@ -153,6 +157,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
 {
        const char *node_name;
        char *algo_name;
+       const char *padding_name;
 
        node_name = fit_get_name(fit, noffset, NULL);
        if (fit_image_hash_get_algo(fit, noffset, &algo_name)) {
@@ -161,6 +166,8 @@ static int fit_image_setup_sig(struct image_sign_info *info,
                return -1;
        }
 
+       padding_name = fdt_getprop(fit, noffset, "padding", NULL);
+
        memset(info, '\0', sizeof(*info));
        info->keydir = keydir;
        info->keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL);
@@ -169,6 +176,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
        info->name = strdup(algo_name);
        info->checksum = image_get_checksum_algo(algo_name);
        info->crypto = image_get_crypto_algo(algo_name);
+       info->padding = image_get_padding_algo(padding_name);
        info->require_keys = require_keys;
        info->engine_id = engine_id;
        if (!info->checksum || !info->crypto) {
@@ -201,7 +209,8 @@ static int fit_image_setup_sig(struct image_sign_info *info,
 static int fit_image_process_sig(const char *keydir, void *keydest,
                void *fit, const char *image_name,
                int noffset, const void *data, size_t size,
-               const char *comment, int require_keys, const char *engine_id)
+               const char *comment, int require_keys, const char *engine_id,
+               const char *cmdname)
 {
        struct image_sign_info info;
        struct image_region region;
@@ -229,7 +238,7 @@ static int fit_image_process_sig(const char *keydir, void *keydest,
        }
 
        ret = fit_image_write_sig(fit, noffset, value, value_len, comment,
-                       NULL, 0);
+                       NULL, 0, cmdname);
        if (ret) {
                if (ret == -FDT_ERR_NOSPACE)
                        return -ENOSPC;
@@ -296,7 +305,7 @@ static int fit_image_process_sig(const char *keydir, void *keydest,
  */
 int fit_image_add_verification_data(const char *keydir, void *keydest,
                void *fit, int image_noffset, const char *comment,
-               int require_keys, const char *engine_id)
+               int require_keys, const char *engine_id, const char *cmdname)
 {
        const char *image_name;
        const void *data;
@@ -333,7 +342,7 @@ int fit_image_add_verification_data(const char *keydir, void *keydest,
                                strlen(FIT_SIG_NODENAME))) {
                        ret = fit_image_process_sig(keydir, keydest,
                                fit, image_name, noffset, data, size,
-                               comment, require_keys, engine_id);
+                               comment, require_keys, engine_id, cmdname);
                }
                if (ret)
                        return ret;
@@ -574,7 +583,7 @@ static int fit_config_get_data(void *fit, int conf_noffset, int noffset,
 static int fit_config_process_sig(const char *keydir, void *keydest,
                void *fit, const char *conf_name, int conf_noffset,
                int noffset, const char *comment, int require_keys,
-               const char *engine_id)
+               const char *engine_id, const char *cmdname)
 {
        struct image_sign_info info;
        const char *node_name;
@@ -609,7 +618,7 @@ static int fit_config_process_sig(const char *keydir, void *keydest,
        }
 
        ret = fit_image_write_sig(fit, noffset, value, value_len, comment,
-                               region_prop, region_proplen);
+                               region_prop, region_proplen, cmdname);
        if (ret) {
                if (ret == -FDT_ERR_NOSPACE)
                        return -ENOSPC;
@@ -638,7 +647,7 @@ static int fit_config_process_sig(const char *keydir, void *keydest,
 
 static int fit_config_add_verification_data(const char *keydir, void *keydest,
                void *fit, int conf_noffset, const char *comment,
-               int require_keys, const char *engine_id)
+               int require_keys, const char *engine_id, const char *cmdname)
 {
        const char *conf_name;
        int noffset;
@@ -657,7 +666,7 @@ static int fit_config_add_verification_data(const char *keydir, void *keydest,
                             strlen(FIT_SIG_NODENAME))) {
                        ret = fit_config_process_sig(keydir, keydest,
                                fit, conf_name, conf_noffset, noffset, comment,
-                               require_keys, engine_id);
+                               require_keys, engine_id, cmdname);
                }
                if (ret)
                        return ret;
@@ -668,7 +677,7 @@ static int fit_config_add_verification_data(const char *keydir, void *keydest,
 
 int fit_add_verification_data(const char *keydir, void *keydest, void *fit,
                              const char *comment, int require_keys,
-                             const char *engine_id)
+                             const char *engine_id, const char *cmdname)
 {
        int images_noffset, confs_noffset;
        int noffset;
@@ -691,7 +700,8 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit,
                 * i.e. component image node.
                 */
                ret = fit_image_add_verification_data(keydir, keydest,
-                               fit, noffset, comment, require_keys, engine_id);
+                               fit, noffset, comment, require_keys, engine_id,
+                               cmdname);
                if (ret)
                        return ret;
        }
@@ -715,7 +725,7 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit,
                ret = fit_config_add_verification_data(keydir, keydest,
                                                       fit, noffset, comment,
                                                       require_keys,
-                                                      engine_id);
+                                                      engine_id, cmdname);
                if (ret)
                        return ret;
        }