LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: introduce HASH_CALCULATE option 

Build error occurs when CONFIG_EFI_SECURE_BOOT or
CONFIG_EFI_CAPSULE_AUTHENTICATE is enabled,
because hash-checksum.c is not compiled.

Since hash_calculate() implemented in hash-checksum.c can be
commonly used aside from FIT image signature verification,
this commit itroduces HASH_CALCULATE option to decide
if hash-checksum.c shall be compiled.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Masahisa Kojima 2021-05-13 23:48:08 +09:00 committed by Heinrich Schuchardt
parent 48ee084602
commit 87316da05f
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/Kconfig.boot
View File

@ -80,6 +80,7 @@ config FIT_SIGNATURE
select RSA_VERIFY select RSA_VERIFY
select IMAGE_SIGN_INFO select IMAGE_SIGN_INFO
select FIT_FULL_CHECK select FIT_FULL_CHECK
select HASH_CALCULATE
help help
This option enables signature verification of FIT uImages, This option enables signature verification of FIT uImages,
using a hash signed and verified using RSA. If using a hash signed and verified using RSA. If

3
lib/Kconfig
View File

@ -439,6 +439,9 @@ config CRC32C
config XXHASH config XXHASH
bool bool
config HASH_CALCULATE
bool
endmenu endmenu
menu "Compression Support" menu "Compression Support"

2
lib/Makefile
View File

@ -61,7 +61,7 @@ endif
obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/ obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/
obj-$(CONFIG_$(SPL_)MD5) += md5.o obj-$(CONFIG_$(SPL_)MD5) += md5.o
obj-$(CONFIG_$(SPL_)RSA) += rsa/ obj-$(CONFIG_$(SPL_)RSA) += rsa/
obj-$(CONFIG_FIT_SIGNATURE) += hash-checksum.o obj-$(CONFIG_HASH_CALCULATE) += hash-checksum.o
obj-$(CONFIG_SHA1) += sha1.o obj-$(CONFIG_SHA1) += sha1.o
obj-$(CONFIG_SHA256) += sha256.o obj-$(CONFIG_SHA256) += sha256.o
obj-$(CONFIG_SHA512_ALGO) += sha512.o obj-$(CONFIG_SHA512_ALGO) += sha512.o

2
lib/efi_loader/Kconfig
View File

@ -174,6 +174,7 @@ config EFI_CAPSULE_AUTHENTICATE
select PKCS7_MESSAGE_PARSER select PKCS7_MESSAGE_PARSER
select PKCS7_VERIFY select PKCS7_VERIFY
select IMAGE_SIGN_INFO select IMAGE_SIGN_INFO
select HASH_CALCULATE
default n default n
help help
Select this option if you want to enable capsule Select this option if you want to enable capsule
@ -342,6 +343,7 @@ config EFI_SECURE_BOOT
select X509_CERTIFICATE_PARSER select X509_CERTIFICATE_PARSER
select PKCS7_MESSAGE_PARSER select PKCS7_MESSAGE_PARSER
select PKCS7_VERIFY select PKCS7_VERIFY
select HASH_CALCULATE
default n default n
help help
Select this option to enable EFI secure boot support. Select this option to enable EFI secure boot support.