image-fit: Make string of algo parameter constant

Modifications would be invalid.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c
index 9b1d38b20a020ecf2102e2c00357df40b4310094..495d7768f68dcad5fbbe277b6149eaea20f45772 100644 (file)
--- a/boot/image-fit-sig.c
+++ b/boot/image-fit-sig.c
@@ -67,7 +67,7 @@ static int fit_image_setup_verify(struct image_sign_info *info,
                                  const void *fit, int noffset,
                                  int required_keynode, char **err_msgp)
 {
-       char *algo_name;
+       const char *algo_name;
        const char *padding_name;
 
        if (fdt_totalsize(fit) > CONFIG_VAL(FIT_SIGNATURE_MAX_SIZE)) {

diff --git a/boot/image-fit.c b/boot/image-fit.c
index f6594e065c3be91aeea672ff2e765e8f6e5eb0a9..85a6f223c85a2196a62b46bf1efda60302213fa7 100644 (file)
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -191,7 +191,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
        const char *keyname;
        uint8_t *value;
        int value_len;
-       char *algo;
+       const char *algo;
        const char *padding;
        bool required;
        int ret, i;
@@ -1063,11 +1063,11 @@ int fit_image_get_data_and_size(const void *fit, int noffset,
  *     0, on success
  *     -1, on failure
  */
-int fit_image_hash_get_algo(const void *fit, int noffset, char **algo)
+int fit_image_hash_get_algo(const void *fit, int noffset, const char **algo)
 {
        int len;
 
-       *algo = (char *)fdt_getprop(fit, noffset, FIT_ALGO_PROP, &len);
+       *algo = (const char *)fdt_getprop(fit, noffset, FIT_ALGO_PROP, &len);
        if (*algo == NULL) {
                fit_get_debug(fit, noffset, FIT_ALGO_PROP, len);
                return -1;
@@ -1265,7 +1265,7 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data,
 {
        uint8_t value[FIT_MAX_HASH_LEN];
        int value_len;
-       char *algo;
+       const char *algo;
        uint8_t *fit_value;
        int fit_value_len;
        int ignore;

diff --git a/include/image.h b/include/image.h
index 1cdc70faee3e02a1933e81a4c30e61a681b5acf0..7be6f11f61a313b62f7a910429445977c525ffe2 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -1011,7 +1011,7 @@ int fit_image_get_data_size_unciphered(const void *fit, int noffset,
 int fit_image_get_data_and_size(const void *fit, int noffset,
                                const void **data, size_t *size);
 
-int fit_image_hash_get_algo(const void *fit, int noffset, char **algo);
+int fit_image_hash_get_algo(const void *fit, int noffset, const char **algo);
 int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value,
                                int *value_len);
 

diff --git a/tools/image-host.c b/tools/image-host.c
index 945571f584d39a3b0ff04984c1cf2141bd9d611a..5b814ce71578b43bf300661d429599bed20362bc 100644 (file)
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -63,7 +63,7 @@ static int fit_image_process_hash(void *fit, const char *image_name,
        uint8_t value[FIT_MAX_HASH_LEN];
        const char *node_name;
        int value_len;
-       char *algo;
+       const char *algo;
        int ret;
 
        node_name = fit_get_name(fit, noffset, NULL);
@@ -160,7 +160,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
                const char *engine_id)
 {
        const char *node_name;
-       char *algo_name;
+       const char *algo_name;
        const char *padding_name;
 
        node_name = fit_get_name(fit, noffset, NULL);