dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
This commit is contained in:
Simon Glass
2020-03-18 11:44:06 -06:00
parent b008677daf
commit 72188f5462
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/image-cipher.c
View File

@@ -88,7 +88,7 @@ static int fit_image_setup_decrypt(struct image_cipher_info *info,
return -1; return -1;
} }
info->keyname = fdt_getprop(fit, cipher_noffset, "key-name-hint", NULL); info->keyname = fdt_getprop(fit, cipher_noffset, FIT_KEY_HINT, NULL);
if (!info->keyname) { if (!info->keyname) {
printf("Can't get key name\n"); printf("Can't get key name\n");
return -1; return -1;

6
common/image-fit.c
View File

@@ -168,7 +168,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
int value_len; int value_len;
char *algo; char *algo;
const char *padding; const char *padding;
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,
@@ -179,8 +179,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)

8
common/image-sig.c
View File

@@ -229,7 +229,7 @@ static int fit_image_setup_verify(struct image_sign_info *info,
padding_name = RSA_DEFAULT_PADDING_NAME; padding_name = RSA_DEFAULT_PADDING_NAME;
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->name = algo_name; info->name = algo_name;
@@ -340,7 +340,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,
@@ -557,7 +558,8 @@ 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

@@ -939,12 +939,14 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size,
#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"
/* cipher node */ /* cipher node */
#define FIT_CIPHER_NODENAME "cipher" #define FIT_CIPHER_NODENAME "cipher"

6
lib/rsa/rsa-sign.c
View File

@@ -792,8 +792,8 @@ 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)
ret = fdt_setprop_u32(keydest, node, "rsa,num-bits", bits); ret = fdt_setprop_u32(keydest, node, "rsa,num-bits", bits);
@@ -815,7 +815,7 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest)
info->name); info->name);
} }
if (!ret && info->require_keys) { if (!ret && 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:

8
tools/image-host.c
View File

@@ -170,7 +170,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->name = strdup(algo_name); info->name = strdup(algo_name);
@@ -249,7 +249,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; this might fail * Write the public key into the supplied FDT file; this might fail
@@ -337,7 +337,7 @@ static int fit_image_setup_cipher(struct image_cipher_info *info,
info->keydir = keydir; info->keydir = keydir;
/* Read the key name */ /* Read the key name */
info->keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); info->keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
if (!info->keyname) { if (!info->keyname) {
printf("Can't get key name for cipher '%s' in image '%s'\n", printf("Can't get key name for cipher '%s' in image '%s'\n",
node_name, image_name); node_name, image_name);
@@ -886,7 +886,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) {