| Message ID | 20211018054903.946546-1-hannu.lounento@vaisala.com |
|---|---|
| State | Accepted |
| Commit | 2289629f27f743003254d0a31ae9ed6175d1dd63 |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | image.h: make image_sign_info.fit point to const | expand |
On Sun, 17 Oct 2021 at 23:49, Hannu Lounento <hannu.lounento@vaisala.com> wrote: > > The data blob apparently does not need to be modified through the fit > field of the image_sign_info struct so make it point to const to avoid > the need to cast away constness in functions that assign a pointer to > const data to the field. > > fit_image_setup_verify already had to cast away constness as it assigned > a const void * argument to the field. The cast can now be removed. > > Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com> > --- > common/image-fit-sig.c | 2 +- > include/image.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sun, 17 Oct 2021 at 23:49, Hannu Lounento <hannu.lounento@vaisala.com> wrote: > > The data blob apparently does not need to be modified through the fit > field of the image_sign_info struct so make it point to const to avoid > the need to cast away constness in functions that assign a pointer to > const data to the field. > > fit_image_setup_verify already had to cast away constness as it assigned > a const void * argument to the field. The cast can now be removed. > > Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com> > --- > common/image-fit-sig.c | 2 +- > include/image.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c index 4edebbf2d32..63e5423c925 100644 --- a/common/image-fit-sig.c +++ b/common/image-fit-sig.c @@ -85,7 +85,7 @@ static int fit_image_setup_verify(struct image_sign_info *info, memset(info, '\0', sizeof(*info)); info->keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL); - info->fit = (void *)fit; + info->fit = fit; info->node_offset = noffset; info->name = algo_name; info->checksum = image_get_checksum_algo(algo_name); diff --git a/include/image.h b/include/image.h index 34d13ada84b..fd662e74b41 100644 --- a/include/image.h +++ b/include/image.h @@ -1159,7 +1159,7 @@ struct image_sign_info { const char *keydir; /* Directory conaining keys */ const char *keyname; /* Name of key to use */ const char *keyfile; /* Filename of private or public key */ - void *fit; /* Pointer to FIT blob */ + const void *fit; /* Pointer to FIT blob */ int node_offset; /* Offset of signature node */ const char *name; /* Algorithm name */ struct checksum_algo *checksum; /* Checksum algorithm information */
The data blob apparently does not need to be modified through the fit field of the image_sign_info struct so make it point to const to avoid the need to cast away constness in functions that assign a pointer to const data to the field. fit_image_setup_verify already had to cast away constness as it assigned a const void * argument to the field. The cast can now be removed. Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com> --- common/image-fit-sig.c | 2 +- include/image.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)