delta/coreboot/vboot.git/tests, branch stabilize-14998.B

futility: Add --keyset option to sign command for BIOS and kernel

2022-07-22T07:46:32+00:00

This patch adds --keyset option for sign command for BIOS_IMAGE,
RAW_FIRMWARE, RAW_KERNEL and KERN_PREAMBLE file types. The default value
of this option is '/usr/share/vboot/devkeys'. It allows futility to load
public and private keys, and keyblocks from under this path, when they
were not provided manually using their respective options.

Files loaded by default for BIOS_IMAGE and RAW_FIRMWARE:
- ${keysetdir}/firmware_data_key.vbprivk
- ${keysetdir}/firmware.keyblock
- ${keysetdir}/kernel_subkey.vbpubk

Files loaded by default for RAW_KERNEL:
- ${keysetdir}/kernel_data_key.vbprivk
- ${keysetdir}/kernel.keyblock

File loaded by default for KERN_PREAMBLE:
- ${keysetdir}/kernel_data_key.vbprivk

BUG=none
BRANCH=none
TEST=make runfutiltests

Signed-off-by: Jakub Czapiga 
Change-Id: Ic4026d501d88e0de7d2c6f52c7494c639d08bd15
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3740601
Auto-Submit: Jakub Czapiga 
Reviewed-by: Julius Werner 
Commit-Queue: Julius Werner 
Tested-by: Jakub Czapiga

2kernel.c: check display request in vb2api_kernel_phase2

2022-07-15T07:11:44+00:00

In preparation for moving VbTryLoadKernel to depthcharge, move the
VB2_NV_DISPLAY_REQUEST check from vb2api_normal_boot to
vb2api_kernel_phase2.

BUG=b:172339016
BRANCH=none
TEST=make runtests

Signed-off-by: Hsin-Te Yuan 
Change-Id: I3629d8dbbcaba23220152543ba77558c8bbcdc7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3752431
Reviewed-by: Yu-Ping Wu 
Reviewed-by: Hsuan Ting Chen

tests/common/boot_mode.c: Introduce SET_BOOT_MODE

2022-07-15T07:11:42+00:00

Introduce set_boot_mode to set up the corresponding ctx flags and call
vb2_set_boot_mode to set ctx->boot_mode to be consistent with those
flags.

BUG=none
BRANCH=none
TEST=make runtests

Signed-off-by: Hsin-Te Yuan 
Change-Id: I7020639521af30bcdb6edcfac4c1a5b21ca8815e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3750959
Reviewed-by: Yu-Ping Wu 
Reviewed-by: Hsuan Ting Chen

tests/common/tests.h: rename test_common.h to common/tests.h

2022-07-15T07:11:40+00:00

Create tests/common/ to put some common files.

BUG=none
BRANCH=none
TEST=make runtests

Signed-off-by: Hsin-Te Yuan 
Change-Id: I8918b7a1e62d47fca6074ef123e2de6f46f1aa00
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3754814
Reviewed-by: Hsuan Ting Chen 
Reviewed-by: Yu-Ping Wu

2lib/2auxfw_sync: Request recovery for missing auxfw

2022-07-13T09:07:43+00:00

When the hash file of auxfw is not found in the CBFS, VB2_ERROR_UNKNOWN
will be returned from vb2ex_auxfw_check(), causing the device to enter
reboot loop. Similar to how we handle missing ecrw.hash, vb2api_fail()
should be called, so that the device will try to boot from the other
slot, and if the hash is still missing, recovery will be triggered.

Call vb2api_fail() from vb2api_auxfw_sync() using the 3-argument form of
VB2_TRY(). Add a unit test to prevent regression.

BUG=b:237745301
TEST=make run2tests
TEST=emerge-corsola libpayload
BRANCH=none

Change-Id: I789c63b10201bd1852bc087199ec7b226ec85ba8
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3742863
Reviewed-by: Julius Werner 
Commit-Queue: Julius Werner

vboot_api_kernel.c: Remove kparams_ptr

2022-07-13T05:01:22+00:00

Pass VbSelectAndLoadKernelParams kparams as a function argument instead
of using global variable kparams_ptr. Remove VbSelectAndLoadKernel and
replace its tests with the unit tests for vb2_set_boot_mode,
vb2api_kernel_phase2, vb2api_kernel_finalize, and vb2api_normal_boot.

BUG=b:172339016
BRANCH=none
TEST=make runtests

Cq-Depend: chromium:3731710
Signed-off-by: Hsin-Te Yuan 
Change-Id: I26895ced5e310b2894b9d42d0ad5514d3b0b930a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3731412
Reviewed-by: Yu-Ping Wu

2kernel.c: Clear VB2_NV_DIAG_REQUEST unconditionally

2022-07-11T18:24:55+00:00

BUG=none
TEST=make runtests
BRANCH=none

Signed-off-by: Hsin-Te Yuan 
Change-Id: I406bcf806a6bbe21faa5f069381b73d43a7550b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3737566
Reviewed-by: Julius Werner 
Reviewed-by: Yu-Ping Wu 
Tested-by: Hsuan Ting Chen

2api.c: Initialize display using boot_mode

2022-07-03T00:38:13+00:00

In vb2api_fw_phase1, use the boot_mode set by vb2_set_boot_mode to
determine whether to initialize display. This fixes the edge case where
VB2_NV_DIAG_REQUEST is set, but vb2api_diagnostic_ui_enabled() is 0.

BUG=none
TEST=make runtests
BRANCH=none

Signed-off-by: Hsin-Te Yuan 
Change-Id: Iecb9f52b056906bcd1d7da324390672adc5112c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3737563
Reviewed-by: Hsuan Ting Chen 
Reviewed-by: Yu-Ping Wu 
Reviewed-by: Julius Werner

futility/file_type_bios: Rework image signing

2022-06-30T14:55:17+00:00

This patch reworks whole BIOS image signing to support images with CBFS,
and with ponly RW/A slot. CBFS images will now be truncated to eliminate
unnecessary empty space, and will sign only the part of firmware area
which contains the data, and not empty space.
This patch also adds more checks for potential errors, and does not
allow for signing incorrect nor uses data from structures, which might
not be valid.
futility sign command tests are also greatly extended to cover a wide
variety of possible errors, which have to be handled correctly.

BUG=b:197114807
TEST=sudo emerge vboot_reference
TEST=build whole chromeos-bootimage after making it and coreboot use
     `futility sign --type bios ...`
TEST=make runtests
BRANCH=none

Signed-off-by: Jakub Czapiga 
Cq-Depend: chromium:3707104
Change-Id: I7c84aa38776e8890a87f0e9b7ec7f32d86f82c13
Disallow-Recycled-Builds: test-failures
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3575325
Tested-by: Jakub Czapiga 
Reviewed-by: Julius Werner 
Auto-Submit: Jakub Czapiga 
Commit-Queue: Jakub Czapiga

2kernel: Add vb2api_kernel_phase2 and vb2api_normal_boot

2022-06-28T12:59:30+00:00

Extract the middle part of VbSelectAndLoadKernel as vb2api_kernel_phase2
and call it from VbSelectAndLoadKernel. Also, remove vb2_nv_init in
VbSelectAndLoadKernel. Furthermore, publicize vb2_normal_boot as
vb2api_normal_boot in preparation for moving the content of
VbSelectAndLoadKernel to depthcharge. Besides, when NO_BOOT is set,
manual recovery should be disallowed (unless
VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY is set). Therefore, print the NO_BOOT
debug log only for the broken screen case.

BUG=b:172339016
BRANCH=none
TEST=make runtests

Signed-off-by: Hsin-Te Yuan 
Change-Id: I4dc5ee4fb80ecc8c24a992a489c3bf6fe267046d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3720975
Reviewed-by: Hsuan Ting Chen 
Reviewed-by: Yu-Ping Wu