mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

image: Use constants for 'required' and 'key-name-hint'

Browse source 
These are used in multiple places so update them to use a shared #define.

Change-Id: I3cc304f04c56c9d1a22df46e68f601b5acd2b34e
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
Signed-off-by: Md Sadre Alam <quic_mdalam@quicinc.com>
This commit is contained in:
Simon Glass 2020-03-18 11:44:06 -06:00 • committed by Gerrit - the friendly Code Review server
parent f9b8402471
commit aea4f25d69
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/image-fit.c
View file

@ -264,7 +264,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
uint8_t *value; uint8_t *value;
int value_len; int value_len;
char *algo; char *algo;
int required; bool required;
int ret, i; int ret, i;
debug("%s %s node: '%s'\n", p, type, debug("%s %s node: '%s'\n", p, type,
@ -275,8 +275,8 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
return; return;
} }
printf("%s", algo); printf("%s", algo);
keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
required = fdt_getprop(fit, noffset, "required", NULL) != NULL; required = fdt_getprop(fit, noffset, FIT_KEY_REQUIRED, NULL) != NULL;
if (keyname) if (keyname)
printf(":%s", keyname); printf(":%s", keyname);
if (required) if (required)

7
common/image-sig.c
View file

@ -156,7 +156,7 @@ static int fit_image_setup_verify(struct image_sign_info *info,
return -1; return -1;
} }
memset(info, '\0', sizeof(*info)); memset(info, '\0', sizeof(*info));
info->keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); info->keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
info->fit = (void *)fit; info->fit = (void *)fit;
info->node_offset = noffset; info->node_offset = noffset;
info->algo = image_get_sig_algo(algo_name); info->algo = image_get_sig_algo(algo_name);
@ -264,7 +264,8 @@ int fit_image_verify_required_sigs(const void *fit, int image_noffset,
const char *required; const char *required;
int ret; int ret;
required = fdt_getprop(sig_blob, noffset, "required", NULL); required = fdt_getprop(sig_blob, noffset, FIT_KEY_REQUIRED,
NULL);
if (!required || strcmp(required, "image")) if (!required || strcmp(required, "image"))
continue; continue;
ret = fit_image_verify_sig(fit, image_noffset, data, size, ret = fit_image_verify_sig(fit, image_noffset, data, size,
@ -473,7 +474,7 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
const char *required; const char *required;
int ret; int ret;
required = fdt_getprop(sig_blob, noffset, "required", NULL); required = fdt_getprop(sig_blob, noffset, FIT_KEY_REQUIRED, NULL);
if (!required || strcmp(required, "conf")) if (!required || strcmp(required, "conf"))
continue; continue;
ret = fit_config_verify_sig(fit, conf_noffset, sig_blob, ret = fit_config_verify_sig(fit, conf_noffset, sig_blob,

4
include/image.h
View file

@ -762,12 +762,14 @@ int bootz_setup(ulong image, ulong *start, ulong *end);
#define FIT_IMAGES_PATH "/images" #define FIT_IMAGES_PATH "/images"
#define FIT_CONFS_PATH "/configurations" #define FIT_CONFS_PATH "/configurations"
/* hash/signature node */ /* hash/signature/key node */
#define FIT_HASH_NODENAME "hash" #define FIT_HASH_NODENAME "hash"
#define FIT_ALGO_PROP "algo" #define FIT_ALGO_PROP "algo"
#define FIT_VALUE_PROP "value" #define FIT_VALUE_PROP "value"
#define FIT_IGNORE_PROP "uboot-ignore" #define FIT_IGNORE_PROP "uboot-ignore"
#define FIT_SIG_NODENAME "signature" #define FIT_SIG_NODENAME "signature"
#define FIT_KEY_REQUIRED "required"
#define FIT_KEY_HINT "key-name-hint"
/* image node */ /* image node */
#define FIT_DATA_PROP "data" #define FIT_DATA_PROP "data"

4
lib/rsa/rsa-sign.c
View file

@ -486,7 +486,7 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest)
} }
if (!ret) { if (!ret) {
ret = fdt_setprop_string(keydest, node, "key-name-hint", ret = fdt_setprop_string(keydest, node, FIT_KEY_HINT,
info->keyname); info->keyname);
} }
if (!ret) if (!ret)
@ -509,7 +509,7 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest)
info->algo->name); info->algo->name);
} }
if (info->require_keys) { if (info->require_keys) {
ret = fdt_setprop_string(keydest, node, "required", ret = fdt_setprop_string(keydest, node, FIT_KEY_REQUIRED,
info->require_keys); info->require_keys);
} }
done: done:

6
tools/image-host.c
View file

@ -161,7 +161,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
memset(info, '\0', sizeof(*info)); memset(info, '\0', sizeof(*info));
info->keydir = keydir; info->keydir = keydir;
info->keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); info->keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
info->fit = fit; info->fit = fit;
info->node_offset = noffset; info->node_offset = noffset;
info->algo = image_get_sig_algo(algo_name); info->algo = image_get_sig_algo(algo_name);
@ -234,7 +234,7 @@ static int fit_image_process_sig(const char *keydir, void *keydest,
free(value); free(value);
/* Get keyname again, as FDT has changed and invalidated our pointer */ /* Get keyname again, as FDT has changed and invalidated our pointer */
info.keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); info.keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
/* Write the public key into the supplied FDT file */ /* Write the public key into the supplied FDT file */
if (keydest && info.algo->add_verify_data(&info, keydest)) { if (keydest && info.algo->add_verify_data(&info, keydest)) {
@ -605,7 +605,7 @@ static int fit_config_process_sig(const char *keydir, void *keydest,
free(region_prop); free(region_prop);
/* Get keyname again, as FDT has changed and invalidated our pointer */ /* Get keyname again, as FDT has changed and invalidated our pointer */
info.keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); info.keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
/* Write the public key into the supplied FDT file */ /* Write the public key into the supplied FDT file */
if (keydest) { if (keydest) {