diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-22 09:56:23 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-23 10:10:05 +0200 |
commit | 1cf0d514db41bd3729c14253a62f33e74ef1a43e (patch) | |
tree | f14cf66ac6e05745e5e36f55406d3e360e4b0d01 /arch/arm/cpu | |
parent | 5f04e5e03e941c8cae4f42f670abba847bfbcf9d (diff) | |
download | barebox-1cf0d514db41bd3729c14253a62f33e74ef1a43e.tar.gz barebox-1cf0d514db41bd3729c14253a62f33e74ef1a43e.tar.xz |
pbl: Move piggy verification into pbl_barebox_uncompress()
piggy verification is a direct prerequisite of uncompressing the
piggydata, so move the verification there.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/uncompress.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 9cc3b358b0..4f16af22f8 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -42,18 +42,14 @@ unsigned long free_mem_end_ptr; extern unsigned char input_data[]; extern unsigned char input_data_end[]; -extern unsigned char sha_sum[]; -extern unsigned char sha_sum_end[]; - void __noreturn barebox_multi_pbl_start(unsigned long membase, unsigned long memsize, void *boarddata) { - uint32_t pg_len, uncompressed_len, pbl_hash_len; + uint32_t pg_len, uncompressed_len; void __noreturn (*barebox)(unsigned long, unsigned long, void *); unsigned long endmem = membase + memsize; unsigned long barebox_base; void *pg_start, *pg_end; - void *pbl_hash_start, *pbl_hash_end; unsigned long pc = get_pc(); pg_start = input_data + global_variable_offset(); @@ -96,17 +92,6 @@ void __noreturn barebox_multi_pbl_start(unsigned long membase, pr_debug("uncompressing barebox binary at 0x%p (size 0x%08x) to 0x%08lx (uncompressed size: 0x%08x)\n", pg_start, pg_len, barebox_base, uncompressed_len); - if (IS_ENABLED(CONFIG_PBL_VERIFY_PIGGY)) { - pbl_hash_start = sha_sum; - pbl_hash_end = sha_sum_end; - pbl_hash_len = pbl_hash_end - pbl_hash_start; - if (pbl_barebox_verify(pg_start, pg_len, pbl_hash_start, - pbl_hash_len) != 0) { - putc_ll('!'); - panic("hash mismatch, refusing to decompress"); - } - } - pbl_barebox_uncompress((void*)barebox_base, pg_start, pg_len); sync_caches_for_execution(); |