hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

efi: use sha256() instead of open coding 

Now that there's a function that calculates the SHA-256 digest of a
buffer in one step, use it instead of sha256_init() + sha256_update() +
sha256_final().

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Cc: linux-efi@vger.kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2020-07-08 09:39:41 -07:00 committed by Herbert Xu
parent 9ea9c58b40
commit 2164960df8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/firmware/efi/embedded-firmware.c
View File

@ -37,9 +37,8 @@ static const struct dmi_system_id * const embedded_fw_table[] = {
static int __init efi_check_md_for_embedded_firmware( static int __init efi_check_md_for_embedded_firmware(
efi_memory_desc_t *md, const struct efi_embedded_fw_desc *desc) efi_memory_desc_t *md, const struct efi_embedded_fw_desc *desc)
{ {
struct sha256_state sctx;
struct efi_embedded_fw *fw; struct efi_embedded_fw *fw;
u8 sha256[32]; u8 hash[32];
u64 i, size; u64 i, size;
u8 *map; u8 *map;
@ -54,10 +53,8 @@ static int __init efi_check_md_for_embedded_firmware(
if (memcmp(map + i, desc->prefix, EFI_EMBEDDED_FW_PREFIX_LEN)) if (memcmp(map + i, desc->prefix, EFI_EMBEDDED_FW_PREFIX_LEN))
continue; continue;
sha256_init(&sctx); sha256(map + i, desc->length, hash);
sha256_update(&sctx, map + i, desc->length); if (memcmp(hash, desc->sha256, 32) == 0)
sha256_final(&sctx, sha256);
if (memcmp(sha256, desc->sha256, 32) == 0)
break; break;
} }
if ((i + desc->length) > size) { if ((i + desc->length) > size) {