brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

image: Rename fit_image_check_hashes() to fit_image_verify()

Browse Source 
This is the main entry point to the FIT image verification code. We will
be using it to handle image verification with signatures, so rename the
function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Simon Glass 2013-05-07 06:11:57 +00:00 committed by Tom Rini
parent b7260910dc
commit b8da836650
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/cmd_bootm.c
View File

@ -815,7 +815,7 @@ static int fit_check_kernel(const void *fit, int os_noffset, int verify)
if (verify) { if (verify) {
puts(" Verifying Hash Integrity ... "); puts(" Verifying Hash Integrity ... ");
if (!fit_image_check_hashes(fit, os_noffset)) { if (!fit_image_verify(fit, os_noffset)) {
puts("Bad Data Hash\n"); puts("Bad Data Hash\n");
bootstage_error(BOOTSTAGE_ID_FIT_CHECK_HASH); bootstage_error(BOOTSTAGE_ID_FIT_CHECK_HASH);
return 0; return 0;
@ -1169,7 +1169,7 @@ static int image_info(ulong addr)
fit_print_contents(hdr); fit_print_contents(hdr);
if (!fit_all_image_check_hashes(hdr)) { if (!fit_all_image_verify(hdr)) {
puts("Bad hash in FIT image!\n"); puts("Bad hash in FIT image!\n");
return 1; return 1;
} }

2
common/cmd_fpga.c
View File

@ -306,7 +306,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
} }
/* verify integrity */ /* verify integrity */
if (!fit_image_check_hashes (fit_hdr, noffset)) { if (!fit_image_verify(fit_hdr, noffset)) {
puts ("Bad Data Hash\n"); puts ("Bad Data Hash\n");
return 1; return 1;
} }

2
common/cmd_source.c
View File

@ -127,7 +127,7 @@ source (ulong addr, const char *fit_uname)
/* verify integrity */ /* verify integrity */
if (verify) { if (verify) {
if (!fit_image_check_hashes (fit_hdr, noffset)) { if (!fit_image_verify(fit_hdr, noffset)) {
puts ("Bad Data Hash\n"); puts ("Bad Data Hash\n");
return 1; return 1;
} }

2
common/cmd_ximg.c
View File

@ -162,7 +162,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
/* verify integrity */ /* verify integrity */
if (verify) { if (verify) {
if (!fit_image_check_hashes(fit_hdr, noffset)) { if (!fit_image_verify(fit_hdr, noffset)) {
puts("Bad Data Hash\n"); puts("Bad Data Hash\n");
return 1; return 1;
} }

16
common/image-fit.c
View File

@ -850,11 +850,11 @@ int calculate_hash(const void *data, int data_len, const char *algo,
} }
/** /**
* fit_image_check_hashes - verify data intergity * fit_image_verify - verify data intergity
* @fit: pointer to the FIT format image header * @fit: pointer to the FIT format image header
* @image_noffset: component image node offset * @image_noffset: component image node offset
* *
* fit_image_check_hashes() goes over component image hash nodes, * fit_image_verify() goes over component image hash nodes,
* re-calculates each data hash and compares with the value stored in hash * re-calculates each data hash and compares with the value stored in hash
* node. * node.
* *
@ -862,7 +862,7 @@ int calculate_hash(const void *data, int data_len, const char *algo,
* 1, if all hashes are valid * 1, if all hashes are valid
* 0, otherwise (or on error) * 0, otherwise (or on error)
*/ */
int fit_image_check_hashes(const void *fit, int image_noffset) int fit_image_verify(const void *fit, int image_noffset)
{ {
const void *data; const void *data;
size_t size; size_t size;
@ -955,17 +955,17 @@ error:
} }
/** /**
* fit_all_image_check_hashes - verify data intergity for all images * fit_all_image_verify - verify data intergity for all images
* @fit: pointer to the FIT format image header * @fit: pointer to the FIT format image header
* *
* fit_all_image_check_hashes() goes over all images in the FIT and * fit_all_image_verify() goes over all images in the FIT and
* for every images checks if all it's hashes are valid. * for every images checks if all it's hashes are valid.
* *
* returns: * returns:
* 1, if all hashes of all images are valid * 1, if all hashes of all images are valid
* 0, otherwise (or on error) * 0, otherwise (or on error)
*/ */
int fit_all_image_check_hashes(const void *fit) int fit_all_image_verify(const void *fit)
{ {
int images_noffset; int images_noffset;
int noffset; int noffset;
@ -995,7 +995,7 @@ int fit_all_image_check_hashes(const void *fit)
printf(" Hash(es) for Image %u (%s): ", count++, printf(" Hash(es) for Image %u (%s): ", count++,
fit_get_name(fit, noffset, NULL)); fit_get_name(fit, noffset, NULL));
if (!fit_image_check_hashes(fit, noffset)) if (!fit_image_verify(fit, noffset))
return 0; return 0;
printf("\n"); printf("\n");
} }
@ -1443,7 +1443,7 @@ int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch,
if (verify) { if (verify) {
puts(" Verifying Hash Integrity ... "); puts(" Verifying Hash Integrity ... ");
if (!fit_image_check_hashes(fit, rd_noffset)) { if (!fit_image_verify(fit, rd_noffset)) {
puts("Bad Data Hash\n"); puts("Bad Data Hash\n");
bootstage_error(BOOTSTAGE_ID_FIT_RD_HASH); bootstage_error(BOOTSTAGE_ID_FIT_RD_HASH);
return 0; return 0;

2
common/image.c
View File

@ -1210,7 +1210,7 @@ static int fit_check_fdt(const void *fit, int fdt_noffset, int verify)
if (verify) { if (verify) {
puts(" Verifying Hash Integrity ... "); puts(" Verifying Hash Integrity ... ");
if (!fit_image_check_hashes(fit, fdt_noffset)) { if (!fit_image_verify(fit, fdt_noffset)) {
fdt_error("Bad Data Hash"); fdt_error("Bad Data Hash");
return 0; return 0;
} }

2
common/update.c
View File

@ -297,7 +297,7 @@ got_update_file:
printf("Processing update '%s' :", printf("Processing update '%s' :",
fit_get_name(fit, noffset, NULL)); fit_get_name(fit, noffset, NULL));
if (!fit_image_check_hashes(fit, noffset)) { if (!fit_image_verify(fit, noffset)) {
printf("Error: invalid update hash, aborting\n"); printf("Error: invalid update hash, aborting\n");
ret = 1; ret = 1;
goto next_node; goto next_node;

4
include/image.h
View File

@ -615,8 +615,8 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
int fit_set_hashes(void *fit); int fit_set_hashes(void *fit);
int fit_image_set_hashes(void *fit, int image_noffset); int fit_image_set_hashes(void *fit, int image_noffset);
int fit_image_check_hashes(const void *fit, int noffset); int fit_image_verify(const void *fit, int noffset);
int fit_all_image_check_hashes(const void *fit); int fit_all_image_verify(const void *fit);
int fit_image_check_os(const void *fit, int noffset, uint8_t os); int fit_image_check_os(const void *fit, int noffset, uint8_t os);
int fit_image_check_arch(const void *fit, int noffset, uint8_t arch); int fit_image_check_arch(const void *fit, int noffset, uint8_t arch);
int fit_image_check_type(const void *fit, int noffset, uint8_t type); int fit_image_check_type(const void *fit, int noffset, uint8_t type);