Add CONFIG_AVB_PUBKEY_FILE to specify the root avb public key
The new config CONFIG_AVB_PUBKEY_FILE is used to specify the path to the public key file that u-boot uses as the root public key. Previously, the root public key was hard coded in avb_verify.c and therefore was non-trivial to replace it with a custom key. The public key that was hard-coded is extracted as default.avbpubkey and is used as the default. Bug: 181924266 Test: DIST_DIR=out/dist BUILD_CONFIG=u-boot/build.config.crosvm.aarch64 build/build.sh -j80 Signed-off-by: Jiyong Park <jiyong@google.com> (cherry picked from commit e609074ced3dd07ca2a13d4becbae997e3a48c9f) Signed-off-by: Guillaume La Roque <glaroque@baylibre.com> [mkorpershoek: fixed conflict around _SPL_TPL_ support] Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Reviewed-by: Guillaume La Roque <glaroque@baylibre.com>
This commit is contained in:
Jiyong Park
Praneeth Bajjuri
parent
c14d557243
commit
4cbb1eb81c
|
|
@ -810,6 +810,15 @@ config AVB_BUF_SIZE
|
|||
AVB requires a buffer for memory transactions. This variable defines the
|
||||
buffer size.
|
||||
|
||||
config AVB_PUBKEY_FILE
|
||||
string "Path to the root public key file"
|
||||
default "default.avbpubkey"
|
||||
help
|
||||
This specifies the path to file having the public key that u-boot
|
||||
will use to verify the payload against. The file can usually be
|
||||
created via `avbtool extract_public_key --key <path_to_private_key>
|
||||
--out <path_to_public_key>`.
|
||||
|
||||
endif # AVB_VERIFY
|
||||
|
||||
config SCP03
|
||||
|
|
|
|||
|
|
@ -113,3 +113,35 @@ obj-$(CONFIG_$(SPL_TPL_)STACKPROTECTOR) += stackprot.o
|
|||
obj-$(CONFIG_SCP03) += scp03.o
|
||||
|
||||
obj-$(CONFIG_QFW) += qfw.o
|
||||
|
||||
###################################################
|
||||
# Build avb_pubkey.o from CONFIG_AVB_PUBKEY_FILE
|
||||
obj-$(CONFIG_$(SPL_TPLE_)AVB_VERIFY) += avb_pubkey.o
|
||||
|
||||
# Workaround: ARM linker (bfd) has a bug that segfault occurs when trying to
|
||||
# parse a binary file as an input. That issue is fixed in GCC 6.2 [1] but we
|
||||
# are using GCC 4.9 and it doesn't look like we are going to upgrade to the
|
||||
# recent version. Fortunately, the gold linker doesn't have the problem. So,
|
||||
# forcibely use the gold linker when building the avb_pubkey.o. U-boot has
|
||||
# been using bfd linker [2] for features (like OVERLAY), but that matters only
|
||||
# for the final linking. Gold linker is okay for converting the binary key file
|
||||
# into an ELF object file.
|
||||
# [1] https://sourceware.org/legacy-ml/binutils-cvs/2016-10/msg00110.html
|
||||
# [2] https://u-boot.denx.narkive.com/5JODsok5/patch-config-always-use-gnu-ld
|
||||
ld_for_avbpubkey := $(LD)
|
||||
ifneq ($(findstring arm-,$(LD)),)
|
||||
ifeq ($(shell $(LD) -v | grep "GNU gold" 2> /dev/null),)
|
||||
ld_for_avbpubkey := arm-linux-androideabi-ld.gold
|
||||
endif
|
||||
endif
|
||||
|
||||
# The content of the file which CONFIG_AVB_PUBKEY_FILE refers to is imported
|
||||
# as binary. Copying to a temporary file `avb_pubkey` is necessary to keep the
|
||||
# name of the auto-generated symbols which are defined around the imported
|
||||
# region the same. The symbol names follow the path of the input file.
|
||||
$(obj)/avb_pubkey.o: PRIVATE_LD := $(ld_for_avbpubkey)
|
||||
ld_for_avbpubkey :=
|
||||
$(obj)/avb_pubkey.o: $(srctree)/$(subst $(quote),,$(CONFIG_AVB_PUBKEY_FILE))
|
||||
cp $< $(obj)/avb_pubkey
|
||||
$(PRIVATE_LD) $(KBUILD_LDFLAGS) -r -b binary $(obj)/avb_pubkey -o $@
|
||||
rm $(obj)/avb_pubkey
|
||||
|
|
|
|||
|
|
@ -13,112 +13,11 @@
|
|||
#include <tee.h>
|
||||
#include <tee/optee_ta_avb.h>
|
||||
|
||||
static const unsigned char avb_root_pub[1032] = {
|
||||
0x0, 0x0, 0x10, 0x0, 0x55, 0xd9, 0x4, 0xad, 0xd8, 0x4,
|
||||
0xaf, 0xe3, 0xd3, 0x84, 0x6c, 0x7e, 0xd, 0x89, 0x3d, 0xc2,
|
||||
0x8c, 0xd3, 0x12, 0x55, 0xe9, 0x62, 0xc9, 0xf1, 0xf, 0x5e,
|
||||
0xcc, 0x16, 0x72, 0xab, 0x44, 0x7c, 0x2c, 0x65, 0x4a, 0x94,
|
||||
0xb5, 0x16, 0x2b, 0x0, 0xbb, 0x6, 0xef, 0x13, 0x7, 0x53,
|
||||
0x4c, 0xf9, 0x64, 0xb9, 0x28, 0x7a, 0x1b, 0x84, 0x98, 0x88,
|
||||
0xd8, 0x67, 0xa4, 0x23, 0xf9, 0xa7, 0x4b, 0xdc, 0x4a, 0xf,
|
||||
0xf7, 0x3a, 0x18, 0xae, 0x54, 0xa8, 0x15, 0xfe, 0xb0, 0xad,
|
||||
0xac, 0x35, 0xda, 0x3b, 0xad, 0x27, 0xbc, 0xaf, 0xe8, 0xd3,
|
||||
0x2f, 0x37, 0x34, 0xd6, 0x51, 0x2b, 0x6c, 0x5a, 0x27, 0xd7,
|
||||
0x96, 0x6, 0xaf, 0x6b, 0xb8, 0x80, 0xca, 0xfa, 0x30, 0xb4,
|
||||
0xb1, 0x85, 0xb3, 0x4d, 0xaa, 0xaa, 0xc3, 0x16, 0x34, 0x1a,
|
||||
0xb8, 0xe7, 0xc7, 0xfa, 0xf9, 0x9, 0x77, 0xab, 0x97, 0x93,
|
||||
0xeb, 0x44, 0xae, 0xcf, 0x20, 0xbc, 0xf0, 0x80, 0x11, 0xdb,
|
||||
0x23, 0xc, 0x47, 0x71, 0xb9, 0x6d, 0xd6, 0x7b, 0x60, 0x47,
|
||||
0x87, 0x16, 0x56, 0x93, 0xb7, 0xc2, 0x2a, 0x9a, 0xb0, 0x4c,
|
||||
0x1, 0xc, 0x30, 0xd8, 0x93, 0x87, 0xf0, 0xed, 0x6e, 0x8b,
|
||||
0xbe, 0x30, 0x5b, 0xf6, 0xa6, 0xaf, 0xdd, 0x80, 0x7c, 0x45,
|
||||
0x5e, 0x8f, 0x91, 0x93, 0x5e, 0x44, 0xfe, 0xb8, 0x82, 0x7,
|
||||
0xee, 0x79, 0xca, 0xbf, 0x31, 0x73, 0x62, 0x58, 0xe3, 0xcd,
|
||||
0xc4, 0xbc, 0xc2, 0x11, 0x1d, 0xa1, 0x4a, 0xbf, 0xfe, 0x27,
|
||||
0x7d, 0xa1, 0xf6, 0x35, 0xa3, 0x5e, 0xca, 0xdc, 0x57, 0x2f,
|
||||
0x3e, 0xf0, 0xc9, 0x5d, 0x86, 0x6a, 0xf8, 0xaf, 0x66, 0xa7,
|
||||
0xed, 0xcd, 0xb8, 0xed, 0xa1, 0x5f, 0xba, 0x9b, 0x85, 0x1a,
|
||||
0xd5, 0x9, 0xae, 0x94, 0x4e, 0x3b, 0xcf, 0xcb, 0x5c, 0xc9,
|
||||
0x79, 0x80, 0xf7, 0xcc, 0xa6, 0x4a, 0xa8, 0x6a, 0xd8, 0xd3,
|
||||
0x31, 0x11, 0xf9, 0xf6, 0x2, 0x63, 0x2a, 0x1a, 0x2d, 0xd1,
|
||||
0x1a, 0x66, 0x1b, 0x16, 0x41, 0xbd, 0xbd, 0xf7, 0x4d, 0xc0,
|
||||
0x4a, 0xe5, 0x27, 0x49, 0x5f, 0x7f, 0x58, 0xe3, 0x27, 0x2d,
|
||||
0xe5, 0xc9, 0x66, 0xe, 0x52, 0x38, 0x16, 0x38, 0xfb, 0x16,
|
||||
0xeb, 0x53, 0x3f, 0xe6, 0xfd, 0xe9, 0xa2, 0x5e, 0x25, 0x59,
|
||||
0xd8, 0x79, 0x45, 0xff, 0x3, 0x4c, 0x26, 0xa2, 0x0, 0x5a,
|
||||
0x8e, 0xc2, 0x51, 0xa1, 0x15, 0xf9, 0x7b, 0xf4, 0x5c, 0x81,
|
||||
0x9b, 0x18, 0x47, 0x35, 0xd8, 0x2d, 0x5, 0xe9, 0xad, 0xf,
|
||||
0x35, 0x74, 0x15, 0xa3, 0x8e, 0x8b, 0xcc, 0x27, 0xda, 0x7c,
|
||||
0x5d, 0xe4, 0xfa, 0x4, 0xd3, 0x5, 0xb, 0xba, 0x3a, 0xb2,
|
||||
0x49, 0x45, 0x2f, 0x47, 0xc7, 0xd, 0x41, 0x3f, 0x97, 0x80,
|
||||
0x4d, 0x3f, 0xc1, 0xb5, 0xbb, 0x70, 0x5f, 0xa7, 0x37, 0xaf,
|
||||
0x48, 0x22, 0x12, 0x45, 0x2e, 0xf5, 0xf, 0x87, 0x92, 0xe2,
|
||||
0x84, 0x1, 0xf9, 0x12, 0xf, 0x14, 0x15, 0x24, 0xce, 0x89,
|
||||
0x99, 0xee, 0xb9, 0xc4, 0x17, 0x70, 0x70, 0x15, 0xea, 0xbe,
|
||||
0xc6, 0x6c, 0x1f, 0x62, 0xb3, 0xf4, 0x2d, 0x16, 0x87, 0xfb,
|
||||
0x56, 0x1e, 0x45, 0xab, 0xae, 0x32, 0xe4, 0x5e, 0x91, 0xed,
|
||||
0x53, 0x66, 0x5e, 0xbd, 0xed, 0xad, 0xe6, 0x12, 0x39, 0xd,
|
||||
0x83, 0xc9, 0xe8, 0x6b, 0x6c, 0x2d, 0xa5, 0xee, 0xc4, 0x5a,
|
||||
0x66, 0xae, 0x8c, 0x97, 0xd7, 0xd, 0x6c, 0x49, 0xc7, 0xf5,
|
||||
0xc4, 0x92, 0x31, 0x8b, 0x9, 0xee, 0x33, 0xda, 0xa9, 0x37,
|
||||
0xb6, 0x49, 0x18, 0xf8, 0xe, 0x60, 0x45, 0xc8, 0x33, 0x91,
|
||||
0xef, 0x20, 0x57, 0x10, 0xbe, 0x78, 0x2d, 0x83, 0x26, 0xd6,
|
||||
0xca, 0x61, 0xf9, 0x2f, 0xe0, 0xbf, 0x5, 0x30, 0x52, 0x5a,
|
||||
0x12, 0x1c, 0x0, 0xa7, 0x5d, 0xcc, 0x7c, 0x2e, 0xc5, 0x95,
|
||||
0x8b, 0xa3, 0x3b, 0xf0, 0x43, 0x2e, 0x5e, 0xdd, 0x0, 0xdb,
|
||||
0xd, 0xb3, 0x37, 0x99, 0xa9, 0xcd, 0x9c, 0xb7, 0x43, 0xf7,
|
||||
0x35, 0x44, 0x21, 0xc2, 0x82, 0x71, 0xab, 0x8d, 0xaa, 0xb4,
|
||||
0x41, 0x11, 0xec, 0x1e, 0x8d, 0xfc, 0x14, 0x82, 0x92, 0x4e,
|
||||
0x83, 0x6a, 0xa, 0x6b, 0x35, 0x5e, 0x5d, 0xe9, 0x5c, 0xcc,
|
||||
0x8c, 0xde, 0x39, 0xd1, 0x4a, 0x5b, 0x5f, 0x63, 0xa9, 0x64,
|
||||
0xe0, 0xa, 0xcb, 0xb, 0xb8, 0x5a, 0x7c, 0xc3, 0xb, 0xe6,
|
||||
0xbe, 0xfe, 0x8b, 0xf, 0x7d, 0x34, 0x8e, 0x2, 0x66, 0x74,
|
||||
0x1, 0x6c, 0xca, 0x76, 0xac, 0x7c, 0x67, 0x8, 0x2f, 0x3f,
|
||||
0x1a, 0xa6, 0x2c, 0x60, 0xb3, 0xff, 0xda, 0x8d, 0xb8, 0x12,
|
||||
0xc, 0x0, 0x7f, 0xcc, 0x50, 0xa1, 0x5c, 0x64, 0xa1, 0xe2,
|
||||
0x5f, 0x32, 0x65, 0xc9, 0x9c, 0xbe, 0xd6, 0xa, 0x13, 0x87,
|
||||
0x3c, 0x2a, 0x45, 0x47, 0xc, 0xca, 0x42, 0x82, 0xfa, 0x89,
|
||||
0x65, 0xe7, 0x89, 0xb4, 0x8f, 0xf7, 0x1e, 0xe6, 0x23, 0xa5,
|
||||
0xd0, 0x59, 0x37, 0x79, 0x92, 0xd7, 0xce, 0x3d, 0xfd, 0xe3,
|
||||
0xa1, 0xb, 0xcf, 0x6c, 0x85, 0xa0, 0x65, 0xf3, 0x5c, 0xc6,
|
||||
0x4a, 0x63, 0x5f, 0x6e, 0x3a, 0x3a, 0x2a, 0x8b, 0x6a, 0xb6,
|
||||
0x2f, 0xbb, 0xf8, 0xb2, 0x4b, 0x62, 0xbc, 0x1a, 0x91, 0x25,
|
||||
0x66, 0xe3, 0x69, 0xca, 0x60, 0x49, 0xb, 0xf6, 0x8a, 0xbe,
|
||||
0x3e, 0x76, 0x53, 0xc2, 0x7a, 0xa8, 0x4, 0x17, 0x75, 0xf1,
|
||||
0xf3, 0x3, 0x62, 0x1b, 0x85, 0xb2, 0xb0, 0xef, 0x80, 0x15,
|
||||
0xb6, 0xd4, 0x4e, 0xdf, 0x71, 0xac, 0xdb, 0x2a, 0x4, 0xd4,
|
||||
0xb4, 0x21, 0xba, 0x65, 0x56, 0x57, 0xe8, 0xfa, 0x84, 0xa2,
|
||||
0x7d, 0x13, 0xe, 0xaf, 0xd7, 0x9a, 0x58, 0x2a, 0xa3, 0x81,
|
||||
0x84, 0x8d, 0x9, 0xa0, 0x6a, 0xc1, 0xbb, 0xd9, 0xf5, 0x86,
|
||||
0xac, 0xbd, 0x75, 0x61, 0x9, 0xe6, 0x8c, 0x3d, 0x77, 0xb2,
|
||||
0xed, 0x30, 0x20, 0xe4, 0x0, 0x1d, 0x97, 0xe8, 0xbf, 0xc7,
|
||||
0x0, 0x1b, 0x21, 0xb1, 0x16, 0xe7, 0x41, 0x67, 0x2e, 0xec,
|
||||
0x38, 0xbc, 0xe5, 0x1b, 0xb4, 0x6, 0x23, 0x31, 0x71, 0x1c,
|
||||
0x49, 0xcd, 0x76, 0x4a, 0x76, 0x36, 0x8d, 0xa3, 0x89, 0x8b,
|
||||
0x4a, 0x7a, 0xf4, 0x87, 0xc8, 0x15, 0xf, 0x37, 0x39, 0xf6,
|
||||
0x6d, 0x80, 0x19, 0xef, 0x5c, 0xa8, 0x66, 0xce, 0x1b, 0x16,
|
||||
0x79, 0x21, 0xdf, 0xd7, 0x31, 0x30, 0xc4, 0x21, 0xdd, 0x34,
|
||||
0x5b, 0xd2, 0x1a, 0x2b, 0x3e, 0x5d, 0xf7, 0xea, 0xca, 0x5,
|
||||
0x8e, 0xb7, 0xcb, 0x49, 0x2e, 0xa0, 0xe3, 0xf4, 0xa7, 0x48,
|
||||
0x19, 0x10, 0x9c, 0x4, 0xa7, 0xf4, 0x28, 0x74, 0xc8, 0x6f,
|
||||
0x63, 0x20, 0x2b, 0x46, 0x24, 0x26, 0x19, 0x1d, 0xd1, 0x2c,
|
||||
0x31, 0x6d, 0x5a, 0x29, 0xa2, 0x6, 0xa6, 0xb2, 0x41, 0xcc,
|
||||
0xa, 0x27, 0x96, 0x9, 0x96, 0xac, 0x47, 0x65, 0x78, 0x68,
|
||||
0x51, 0x98, 0xd6, 0xd8, 0xa6, 0x2d, 0xa0, 0xcf, 0xec, 0xe2,
|
||||
0x74, 0xf2, 0x82, 0xe3, 0x97, 0xd9, 0x7e, 0xd4, 0xf8, 0xb,
|
||||
0x70, 0x43, 0x3d, 0xb1, 0x7b, 0x97, 0x80, 0xd6, 0xcb, 0xd7,
|
||||
0x19, 0xbc, 0x63, 0xb, 0xfd, 0x4d, 0x88, 0xfe, 0x67, 0xac,
|
||||
0xb8, 0xcc, 0x50, 0xb7, 0x68, 0xb3, 0x5b, 0xd6, 0x1e, 0x25,
|
||||
0xfc, 0x5f, 0x3c, 0x8d, 0xb1, 0x33, 0x7c, 0xb3, 0x49, 0x1,
|
||||
0x3f, 0x71, 0x55, 0xe, 0x51, 0xba, 0x61, 0x26, 0xfa, 0xea,
|
||||
0xe5, 0xb5, 0xe8, 0xaa, 0xcf, 0xcd, 0x96, 0x9f, 0xd6, 0xc1,
|
||||
0x5f, 0x53, 0x91, 0xad, 0x5, 0xde, 0x20, 0xe7, 0x51, 0xda,
|
||||
0x5b, 0x95, 0x67, 0xed, 0xf4, 0xee, 0x42, 0x65, 0x70, 0x13,
|
||||
0xb, 0x70, 0x14, 0x1c, 0xc9, 0xe0, 0x19, 0xca, 0x5f, 0xf5,
|
||||
0x1d, 0x70, 0x4b, 0x6c, 0x6, 0x74, 0xec, 0xb5, 0x2e, 0x77,
|
||||
0xe1, 0x74, 0xa1, 0xa3, 0x99, 0xa0, 0x85, 0x9e, 0xf1, 0xac,
|
||||
0xd8, 0x7e,
|
||||
};
|
||||
/** Location of the root public key. These symbols are declared at the start
|
||||
* and end of region where the content of the file CONFIG_AVB_PUBKEY_FILE is
|
||||
* imported into. */
|
||||
extern const unsigned char _binary_common_avb_pubkey_start;
|
||||
extern const unsigned char _binary_common_avb_pubkey_end;
|
||||
|
||||
/**
|
||||
* ============================================================================
|
||||
|
|
@ -589,14 +488,16 @@ static AvbIOResult validate_vbmeta_public_key(AvbOps *ops,
|
|||
public_key_metadata_length,
|
||||
bool *out_key_is_trusted)
|
||||
{
|
||||
size_t root_pubkey_size = (size_t)&_binary_common_avb_pubkey_end -
|
||||
(size_t)&_binary_common_avb_pubkey_start;
|
||||
if (!public_key_length || !public_key_data || !out_key_is_trusted)
|
||||
return AVB_IO_RESULT_ERROR_IO;
|
||||
|
||||
*out_key_is_trusted = false;
|
||||
if (public_key_length != sizeof(avb_root_pub))
|
||||
if (public_key_length != root_pubkey_size)
|
||||
return AVB_IO_RESULT_ERROR_IO;
|
||||
|
||||
if (memcmp(avb_root_pub, public_key_data, public_key_length) == 0)
|
||||
if (memcmp(&_binary_common_avb_pubkey_start, public_key_data, public_key_length) == 0)
|
||||
*out_key_is_trusted = true;
|
||||
|
||||
return AVB_IO_RESULT_OK;
|
||||
|
|
|
|||
Loading…
Reference in New Issue