From d96ca2465227f29354b41ce2ea7a17f1c5b8f1c1 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 8 Aug 2022 18:08:35 -0700 Subject: cbfs/vboot: Adapt to new vb2_digest API CL:3825558 changes all vb2_digest and vb2_hash functions to take a new hwcrypto_allowed argument, to potentially let them try to call the vb2ex_hwcrypto API for hash calculation. This change will open hardware crypto acceleration up to all hash calculations in coreboot (most notably CBFS verification). As part of this change, the vb2_digest_buffer() function has been removed, so replace existing instances in coreboot with the newer vb2_hash_calculate() API. Due to the circular dependency of these changes with vboot, this patch also needs to update the vboot submodule: Updating from commit id 18cb85b5: 2load_kernel.c: Expose load kernel as vb2_api to commit id b827ddb9: tests: Ensure auxfw sync runs after EC sync This brings in 15 new commits. Signed-off-by: Julius Werner Change-Id: I287d8dac3c49ad7ea3e18a015874ce8d610ec67e Reviewed-on: https://review.coreboot.org/c/coreboot/+/66561 Tested-by: build bot (Jenkins) Reviewed-by: Jakub Czapiga --- src/commonlib/bsd/cbfs_private.c | 5 +---- src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/commonlib/bsd') diff --git a/src/commonlib/bsd/cbfs_private.c b/src/commonlib/bsd/cbfs_private.c index e77c299e7b..b9221fc776 100644 --- a/src/commonlib/bsd/cbfs_private.c +++ b/src/commonlib/bsd/cbfs_private.c @@ -30,13 +30,10 @@ enum cb_err cbfs_walk(cbfs_dev_t dev, enum cb_err (*walker)(cbfs_dev_t dev, size const bool do_hash = CBFS_ENABLE_HASHING && metadata_hash; const size_t devsize = cbfs_dev_size(dev); struct vb2_digest_context dc; - vb2_error_t vbrv; assert(CBFS_ENABLE_HASHING || (!metadata_hash && !(flags & CBFS_WALK_WRITEBACK_HASH))); - if (do_hash && (vbrv = vb2_digest_init(&dc, metadata_hash->algo))) { - ERROR("Metadata hash digest (%d) init error: %#x\n", metadata_hash->algo, vbrv); + if (do_hash && vb2_digest_init(&dc, CBFS_HASH_HWCRYPTO, metadata_hash->algo, 0)) return CB_ERR_ARG; - } size_t offset = 0; enum cb_err ret_header; diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h b/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h index 410bfd62ba..88f5b630bb 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h @@ -27,6 +27,9 @@ * cbfs_dev_t An opaque type representing a CBFS storage backend. * CBFS_ENABLE_HASHING Should be 0 to avoid linking hashing features, 1 otherwise. (Only for * metadata hashing. Host application needs to check file hashes itself.) + * CBFS_HASH_HWCRYPTO Should evaluate to true to allow using vboot hardware crypto routines + * for hashing, false to forbid. This macro may expand to a function call + * to decide this at runtime. * ERROR(...) printf-style macro to print errors. * LOG(...) printf-style macro to print normal-operation log messages. * DEBUG(...) printf-style macro to print detailed debug output. -- cgit v1.2.3