diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-18 11:10:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-18 11:10:00 -0400 |
| commit | 7a1638c263508f7ff67fc82af5ea8072dcb783e2 (patch) | |
| tree | ac020306e87c134b562ab5314fee7d6f2768e670 /common | |
| parent | 52993fcb7672885ea827ef3f24927d650bca2e4e (diff) | |
| parent | 87316da05f2fd49d3709275e64ef0c5980366ade (diff) | |
| download | u-boot-7a1638c263508f7ff67fc82af5ea8072dcb783e2.tar.gz u-boot-7a1638c263508f7ff67fc82af5ea8072dcb783e2.tar.xz u-boot-7a1638c263508f7ff67fc82af5ea8072dcb783e2.zip | |
Merge tag 'efi-2021-07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-07-rc3
Documentation:
* add a man-page for the size command
* add man-page for extension command to index
Bug fixes:
* avoid build failure due to missing SHA512 hardware acceleration
* correct error handling in TCG2 protocol
* don't let user disable capsule authentication
* correct reading directories via UEFI API
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig.boot | 1 | ||||
| -rw-r--r-- | common/hash.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 5a18d62d78..56608226cc 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -80,6 +80,7 @@ config FIT_SIGNATURE select RSA_VERIFY select IMAGE_SIGN_INFO select FIT_FULL_CHECK + select HASH_CALCULATE help This option enables signature verification of FIT uImages, using a hash signed and verified using RSA. If diff --git a/common/hash.c b/common/hash.c index 10dff7ddb0..90cf46bcba 100644 --- a/common/hash.c +++ b/common/hash.c @@ -260,12 +260,12 @@ static struct hash_algo hash_algo[] = { .name = "sha384", .digest_size = SHA384_SUM_LEN, .chunk_size = CHUNKSZ_SHA384, -#ifdef CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SHA512_HW_ACCEL .hash_func_ws = hw_sha384, #else .hash_func_ws = sha384_csum_wd, #endif -#ifdef CONFIG_SHA_PROG_HW_ACCEL +#if defined(CONFIG_SHA512_HW_ACCEL) && defined(CONFIG_SHA_PROG_HW_ACCEL) .hash_init = hw_sha_init, .hash_update = hw_sha_update, .hash_finish = hw_sha_finish, @@ -281,12 +281,12 @@ static struct hash_algo hash_algo[] = { .name = "sha512", .digest_size = SHA512_SUM_LEN, .chunk_size = CHUNKSZ_SHA512, -#ifdef CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SHA512_HW_ACCEL .hash_func_ws = hw_sha512, #else .hash_func_ws = sha512_csum_wd, #endif -#ifdef CONFIG_SHA_PROG_HW_ACCEL +#if defined(CONFIG_SHA512_HW_ACCEL) && defined(CONFIG_SHA_PROG_HW_ACCEL) .hash_init = hw_sha_init, .hash_update = hw_sha_update, .hash_finish = hw_sha_finish, |