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 <jwerner@chromium.org>
Change-Id: I287d8dac3c49ad7ea3e18a015874ce8d610ec67e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66561
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jakub Czapiga <jacz@semihalf.com>
		
	
		
			
				
	
	
		
			51 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			51 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* SPDX-License-Identifier: BSD-3-Clause */
 | 
						|
 | 
						|
#ifndef _CBFS_CBFS_GLUE_H
 | 
						|
#define _CBFS_CBFS_GLUE_H
 | 
						|
 | 
						|
#include <libpayload-config.h>
 | 
						|
#include <boot_device.h>
 | 
						|
#include <stdbool.h>
 | 
						|
#include <stdio.h>
 | 
						|
 | 
						|
#define CBFS_ENABLE_HASHING CONFIG(LP_CBFS_VERIFICATION)
 | 
						|
#define CBFS_HASH_HWCRYPTO cbfs_hwcrypto_allowed()
 | 
						|
 | 
						|
#define ERROR(...) printf("CBFS ERROR: " __VA_ARGS__)
 | 
						|
#define LOG(...) printf("CBFS: " __VA_ARGS__)
 | 
						|
#define DEBUG(...)                                                                             \
 | 
						|
	do {                                                                                   \
 | 
						|
		if (CONFIG(LP_DEBUG_CBFS))                                                     \
 | 
						|
			printf("CBFS DEBUG: " __VA_ARGS__);                                    \
 | 
						|
	} while (0)
 | 
						|
 | 
						|
struct cbfs_dev {
 | 
						|
	size_t offset;
 | 
						|
	size_t size;
 | 
						|
};
 | 
						|
 | 
						|
struct cbfs_boot_device {
 | 
						|
	struct cbfs_dev dev;
 | 
						|
	void *mcache;
 | 
						|
	size_t mcache_size;
 | 
						|
};
 | 
						|
 | 
						|
typedef const struct cbfs_dev *cbfs_dev_t;
 | 
						|
 | 
						|
static inline ssize_t cbfs_dev_read(cbfs_dev_t dev, void *buffer, size_t offset, size_t size)
 | 
						|
{
 | 
						|
	if (offset + size < offset || offset + size > dev->size)
 | 
						|
		return CB_ERR_ARG;
 | 
						|
 | 
						|
	return boot_device_read(buffer, dev->offset + offset, size);
 | 
						|
}
 | 
						|
 | 
						|
static inline size_t cbfs_dev_size(cbfs_dev_t dev)
 | 
						|
{
 | 
						|
	return dev->size;
 | 
						|
}
 | 
						|
 | 
						|
bool cbfs_hwcrypto_allowed(void);
 | 
						|
 | 
						|
#endif /* _CBFS_CBFS_GLUE_H */
 |