diff options
Diffstat (limited to 'tests/vboot_api_kernel2_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel2_tests.c | 294 |
1 files changed, 146 insertions, 148 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 0b82bdcd..627a804c 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -26,7 +26,7 @@ static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; static LoadKernelParams lkp; static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]; -static struct vb2_context ctx; +static struct vb2_context *ctx; static struct vb2_shared_data *sd; static struct vb2_gbb_header gbb; @@ -88,13 +88,11 @@ static void ResetMocks(void) memset(&lkp, 0, sizeof(lkp)); - memset(&ctx, 0, sizeof(ctx)); - ctx.workbuf = workbuf; - ctx.workbuf_size = sizeof(workbuf); - vb2_init_context(&ctx); - vb2_nv_init(&ctx); + TEST_SUCC(vb2api_init(workbuf, sizeof(workbuf), &ctx), + "vb2api_init failed"); + vb2_nv_init(ctx); - sd = vb2_get_sd(&ctx); + sd = vb2_get_sd(ctx); sd->vbsd = shared; sd->flags |= VB2_SD_FLAG_DISPLAY_AVAILABLE; @@ -314,12 +312,12 @@ static void VbUserConfirmsTestGpio(uint32_t first, uint32_t second, mock_gpio[3].gpio_flags = third; mock_gpio[3].count = 4; if (confirm) { - TEST_EQ(VbUserConfirms(&ctx, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 1, msg); } else { - TEST_EQ(VbUserConfirms(&ctx, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), -1, msg); @@ -332,48 +330,48 @@ static void VbUserConfirmsTest(void) ResetMocks(); MockGpioAfter(1, GPIO_SHUTDOWN); - TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Shutdown requested"); + TEST_EQ(VbUserConfirms(ctx, 0), -1, "Shutdown requested"); ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Shutdown requested"); + TEST_EQ(VbUserConfirms(ctx, 0), -1, "Shutdown requested"); ResetMocks(); mock_keypress[0] = VB_KEY_ENTER; - TEST_EQ(VbUserConfirms(&ctx, 0), 1, "Enter"); + TEST_EQ(VbUserConfirms(ctx, 0), 1, "Enter"); ResetMocks(); mock_keypress[0] = VB_KEY_ESC; - TEST_EQ(VbUserConfirms(&ctx, 0), 0, "Esc"); + TEST_EQ(VbUserConfirms(ctx, 0), 0, "Esc"); ResetMocks(); mock_keypress[0] = ' '; MockGpioAfter(1, GPIO_SHUTDOWN); - TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_SPACE_MEANS_NO), 0, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO), 0, "Space means no"); ResetMocks(); mock_keypress[0] = ' '; MockGpioAfter(1, GPIO_SHUTDOWN); - TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Space ignored"); + TEST_EQ(VbUserConfirms(ctx, 0), -1, "Space ignored"); ResetMocks(); mock_keypress[0] = VB_KEY_ENTER; mock_keyflags[0] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_MUST_TRUST_KEYBOARD), + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_MUST_TRUST_KEYBOARD), 1, "Enter with trusted keyboard"); ResetMocks(); mock_keypress[0] = VB_KEY_ENTER; /* untrusted */ mock_keypress[1] = ' '; - TEST_EQ(VbUserConfirms(&ctx, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 0, "Untrusted keyboard"); ResetMocks(); MockGpioAfter(0, GPIO_PRESENCE); - TEST_EQ(VbUserConfirms(&ctx, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 1, "Presence button"); @@ -461,7 +459,7 @@ static void VbUserConfirmsTest(void) mock_keypress[3] = ' '; mock_gpio[0].gpio_flags = GPIO_PRESENCE; mock_gpio[0].count = ~0; - TEST_EQ(VbUserConfirms(&ctx, + TEST_EQ(VbUserConfirms(ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 0, "Recovery button stuck"); @@ -471,20 +469,20 @@ static void VbUserConfirmsTest(void) static void VbBootTest(void) { ResetMocks(); - TEST_EQ(VbBootNormal(&ctx), 1002, "VbBootNormal()"); + TEST_EQ(VbBootNormal(ctx), 1002, "VbBootNormal()"); ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DISPLAY_REQUEST, 1); - TEST_EQ(VbBootNormal(&ctx), VBERROR_REBOOT_REQUIRED, + vb2_nv_set(ctx, VB2_NV_DISPLAY_REQUEST, 1); + TEST_EQ(VbBootNormal(ctx), VBERROR_REBOOT_REQUIRED, "VbBootNormal() reboot to reset NVRAM display request"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, " display request reset"); ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DIAG_REQUEST, 1); - TEST_EQ(VbBootNormal(&ctx), VBERROR_REBOOT_REQUIRED, + vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1); + TEST_EQ(VbBootNormal(ctx), VBERROR_REBOOT_REQUIRED, "VbBootNormal() reboot to reset NVRAM diag request"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, " diag request reset"); } @@ -496,10 +494,10 @@ static void VbBootDevTest(void) /* Proceed after timeout */ ResetMocks(); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); @@ -507,7 +505,7 @@ static void VbBootDevTest(void) ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -515,61 +513,61 @@ static void VbBootDevTest(void) ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); /* Proceed to legacy after timeout if boot legacy and default boot * legacy are set */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); /* Proceed to legacy boot mode only if enabled */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Proceed to usb after timeout if boot usb and default boot * usb are set */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U USB"); /* Proceed to usb boot mode only if enabled */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Timeout"); /* If no USB tries fixed disk */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+U enabled"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+U enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Up arrow is uninteresting / passed to VbCheckDisplayKey() */ ResetMocks(); mock_keypress[0] = VB_KEY_UP; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Up arrow"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Up arrow"); /* Shutdown requested in loop */ ResetMocks(); mock_gpio[0].gpio_flags = 0; mock_gpio[0].count = 2; mock_gpio[1].gpio_flags = GPIO_SHUTDOWN; - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -577,7 +575,7 @@ static void VbBootDevTest(void) /* Shutdown requested by keyboard in loop */ ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard"); @@ -586,7 +584,7 @@ static void VbBootDevTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; mock_keypress[0] = ' '; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Space = tonorm"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); @@ -594,7 +592,7 @@ static void VbBootDevTest(void) " tonorm screen"); TEST_EQ(screens_displayed[2], VB_SCREEN_TO_NORM_CONFIRMED, " confirm screen"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); /* Space-space doesn't disable it */ @@ -603,7 +601,7 @@ static void VbBootDevTest(void) mock_keypress[0] = ' '; mock_keypress[1] = ' '; mock_keypress[2] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Space-space"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Space-space"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_DEVELOPER_TO_NORM, @@ -616,7 +614,7 @@ static void VbBootDevTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; mock_keypress[0] = VB_KEY_ENTER; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Enter ignored"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Enter ignored"); /* Enter does if GBB flag set */ ResetMocks(); @@ -624,7 +622,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM; mock_keypress[0] = VB_KEY_ENTER; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Enter = tonorm"); /* Tonorm ignored if GBB forces dev switch on */ @@ -633,7 +631,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON; mock_keypress[0] = ' '; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Can't tonorm gbb-dev"); /* Shutdown requested at tonorm screen */ @@ -641,7 +639,7 @@ static void VbBootDevTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; mock_keypress[0] = ' '; MockGpioAfter(3, GPIO_SHUTDOWN); - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested at tonorm"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, @@ -653,15 +651,15 @@ static void VbBootDevTest(void) ResetMocks(); shared->flags = VBSD_BOOT_DEV_SWITCH_ON; mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard at nonorm"); /* Ctrl+D dismisses warning */ ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('D'); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+D"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+D"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -670,13 +668,13 @@ static void VbBootDevTest(void) ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('D'); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+D"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+D"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Ctrl+L tries legacy boot mode only if enabled */ ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('L'); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+L normal"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Enter altfw menu and time out */ @@ -684,7 +682,7 @@ static void VbBootDevTest(void) MockGpioAfter(1000, GPIO_SHUTDOWN); gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 0, " try legacy"); @@ -693,26 +691,26 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); /* Enter altfw menu and then exit it */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 0, " try legacy"); /* Enter altfw menu and select firmware 0 */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -722,7 +720,7 @@ static void VbBootDevTest(void) VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -731,21 +729,21 @@ static void VbBootDevTest(void) for (key = '1'; key <= '9'; key++) { ResetMocks(); mock_keypress[0] = key; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "'1' normal"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "'1' normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); ResetMocks(); gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = key; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); mock_keypress[0] = key; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); @@ -753,7 +751,7 @@ static void VbBootDevTest(void) ResetMocks(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_LEGACY; mock_keypress[0] = key; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); @@ -762,32 +760,32 @@ static void VbBootDevTest(void) /* Ctrl+U boots USB only if enabled */ ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('U'); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+U normal"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+U normal"); /* Ctrl+U enabled, with good USB boot */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U USB"); /* Ctrl+U enabled via GBB */ ResetMocks(); gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_USB; mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U force USB"); /* Ctrl+U enabled via FWMP */ ResetMocks(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_USB; mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U force USB"); /* Ctrl+S set vendor data and reboot */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '3'; @@ -795,14 +793,14 @@ static void VbBootDevTest(void) mock_keypress[4] = '1'; mock_keypress[5] = VB_KEY_ENTER; // Set vendor data mock_keypress[6] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S set vendor data and reboot"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); /* Ctrl+S extra keys ignored */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '3'; @@ -811,14 +809,14 @@ static void VbBootDevTest(void) mock_keypress[5] = '5'; mock_keypress[6] = VB_KEY_ENTER; // Set vendor data mock_keypress[7] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S extra keys ignored"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); /* Ctrl+S converts case */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = 'a'; mock_keypress[2] = 'B'; @@ -826,14 +824,14 @@ static void VbBootDevTest(void) mock_keypress[4] = 'z'; mock_keypress[5] = VB_KEY_ENTER; // Set vendor data mock_keypress[6] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S converts case"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "ABYZ", " Vendor data correct"); /* Ctrl+S backspace works */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = 'A'; mock_keypress[2] = 'B'; @@ -845,14 +843,14 @@ static void VbBootDevTest(void) mock_keypress[8] = '1'; mock_keypress[9] = VB_KEY_ENTER; // Set vendor data mock_keypress[10] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S backspace works"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "A321", " Vendor data correct"); /* Ctrl+S invalid chars don't print */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '-'; @@ -865,14 +863,14 @@ static void VbBootDevTest(void) mock_keypress[9] = '1'; mock_keypress[10] = VB_KEY_ENTER; // Set vendor data mock_keypress[11] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S invalid chars don't print"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); /* Ctrl+S invalid chars don't print with backspace */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '-'; @@ -883,14 +881,14 @@ static void VbBootDevTest(void) mock_keypress[7] = '0'; mock_keypress[8] = VB_KEY_ENTER; // Set vendor data mock_keypress[9] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S invalid chars don't print with backspace"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "3210", " Vendor data correct"); /* Ctrl+S backspace only doesn't underrun */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = 'A'; mock_keypress[2] = VB_KEY_BACKSPACE; @@ -901,14 +899,14 @@ static void VbBootDevTest(void) mock_keypress[7] = '1'; mock_keypress[8] = VB_KEY_ENTER; // Set vendor data mock_keypress[9] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S backspace only doesn't underrun"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); /* Ctrl+S vowels not allowed after first char */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = 'A'; mock_keypress[2] = 'A'; @@ -921,14 +919,14 @@ static void VbBootDevTest(void) mock_keypress[9] = 'D'; mock_keypress[10] = VB_KEY_ENTER; // Set vendor data mock_keypress[11] = VB_KEY_ENTER; // Confirm vendor data - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+S vowels not allowed after first char"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "ABCD", " Vendor data correct"); /* Ctrl+S too short */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '1'; mock_keypress[2] = '2'; @@ -936,33 +934,33 @@ static void VbBootDevTest(void) mock_keypress[4] = VB_KEY_ENTER; // Set vendor data (Nothing happens) mock_keypress[5] = VB_KEY_ENTER; // Confirm vendor data (Nothing happens) mock_keypress[6] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+S too short"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+S too short"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); /* Ctrl+S esc from set screen */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+S esc from set screen"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+S esc from set screen"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); /* Ctrl+S esc from set screen with tag */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '3'; mock_keypress[3] = '2'; mock_keypress[4] = '1'; mock_keypress[5] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+S esc from set screen with tag"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); /* Ctrl+S esc from confirm screen */ ResetMocks(); - ctx.flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; + ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_CTRL('S'); mock_keypress[1] = '4'; mock_keypress[2] = '3'; @@ -970,16 +968,16 @@ static void VbBootDevTest(void) mock_keypress[4] = '1'; mock_keypress[5] = VB_KEY_ENTER; // Set vendor data mock_keypress[6] = VB_KEY_ESC; - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+S esc from set screen"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+S esc from set screen"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); /* If no USB, eventually times out and tries fixed disk */ ResetMocks(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_KEY_CTRL('U'); - TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+U enabled"); + TEST_EQ(VbBootDeveloper(ctx), 1002, "Ctrl+U enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); @@ -988,7 +986,7 @@ static void VbBootDevTest(void) VbApiKernelGetFwmp()->flags |= FWMP_DEV_DISABLE_BOOT; mock_keypress[0] = VB_KEY_ESC; /* Just causes TONORM again */ mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, "FWMP dev disabled"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM, " tonorm screen"); @@ -996,7 +994,7 @@ static void VbBootDevTest(void) " tonorm screen"); TEST_EQ(screens_displayed[2], VB_SCREEN_TO_NORM_CONFIRMED, " confirm screen"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); /* Shutdown requested when dev disabled */ @@ -1004,7 +1002,7 @@ static void VbBootDevTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; VbApiKernelGetFwmp()->flags |= FWMP_DEV_DISABLE_BOOT; MockGpioAfter(1, GPIO_SHUTDOWN); - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested when dev disabled"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM, @@ -1015,7 +1013,7 @@ static void VbBootDevTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; VbApiKernelGetFwmp()->flags |= FWMP_DEV_DISABLE_BOOT; mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(&ctx), + TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard when dev disabled"); @@ -1048,11 +1046,11 @@ static void VbBootRecTestGpio(uint32_t first, uint32_t second, uint32_t third, mock_gpio[3].count = 4; if (confirm) { - TEST_EQ(VbBootRecovery(&ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, + TEST_EQ(VbBootRecovery(ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, msg); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); } else { - TEST_EQ(VbBootRecovery(&ctx), VBERROR_SHUTDOWN_REQUESTED, msg); + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, msg); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); } } @@ -1064,11 +1062,11 @@ static void VbBootRecTest(void) /* Shutdown requested in loop */ ResetMocks(); MockGpioAfter(10, GPIO_SHUTDOWN); - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1076,7 +1074,7 @@ static void VbBootRecTest(void) /* Shutdown requested by keyboard */ ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard"); @@ -1093,7 +1091,7 @@ static void VbBootRecTest(void) shared->flags = VBSD_BOOT_REC_SWITCH_ON; trust_ec = 1; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ignore power button held on boot"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1108,7 +1106,7 @@ static void VbBootRecTest(void) mock_num_disks[1] = 1; mock_num_disks[2] = 1; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Broken"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1121,7 +1119,7 @@ static void VbBootRecTest(void) mock_num_disks[1] = 1; shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Broken (dev)"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1132,7 +1130,7 @@ static void VbBootRecTest(void) MockGpioAfter(100, GPIO_SHUTDOWN); gbb.flags |= VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Insert (forced by GBB)"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1145,7 +1143,7 @@ static void VbBootRecTest(void) mock_num_disks[1] = 1; shared->flags |= VBSD_BOOT_REC_SWITCH_ON; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "No remove in rec"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1157,7 +1155,7 @@ static void VbBootRecTest(void) mock_num_disks[0] = 0; mock_num_disks[1] = 1; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Remove"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1168,7 +1166,7 @@ static void VbBootRecTest(void) MockGpioAfter(10, GPIO_SHUTDOWN); mock_num_disks[0] = -1; vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Bad disk count"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1180,7 +1178,7 @@ static void VbBootRecTest(void) MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); trust_ec = 0; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if EC not trusted"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1192,7 +1190,7 @@ static void VbBootRecTest(void) trust_ec = 1; MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if already in dev mode"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1203,7 +1201,7 @@ static void VbBootRecTest(void) trust_ec = 1; MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if recovery not manually triggered"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1221,7 +1219,7 @@ static void VbBootRecTest(void) mock_gpio[0].count = 100; mock_gpio[1].gpio_flags = GPIO_PRESENCE | GPIO_SHUTDOWN; mock_gpio[1].count = 100; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if phys pres button is still pressed"); TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV, @@ -1235,7 +1233,7 @@ static void VbBootRecTest(void) trust_ec = 1; mock_keypress[0] = VB_KEY_CTRL('D'); mock_keypress[1] = ' '; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D todev abort"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1255,7 +1253,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_KEY_CTRL('D'); mock_keypress[1] = VB_KEY_ENTER; mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - TEST_EQ(VbBootRecovery(&ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, + TEST_EQ(VbBootRecovery(ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, "Ctrl+D todev confirm via enter"); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); @@ -1351,7 +1349,7 @@ static void VbBootRecTest(void) mock_keypress[1] = VB_KEY_ENTER; mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD; virtdev_retval = VB2_ERROR_MOCK; - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, "Ctrl+D todev failure"); @@ -1362,20 +1360,20 @@ static void VbBootRecTest(void) vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('C'); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+C todiag - enabled"); else - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+C todiag - disabled"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for Ctrl-C"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, " todiag doesn't set unneeded DISPLAY_REQUEST"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1388,19 +1386,19 @@ static void VbBootRecTest(void) vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_F(12); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, "F12 todiag - enabled"); else - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "F12 todiag - disabled"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for F12"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, " todiag doesn't set unneeded DISPLAY_REQUEST"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1410,19 +1408,19 @@ static void VbBootRecTest(void) shared->flags = 0; MockGpioAfter(100, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('C'); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, "Ctrl+C todiag os broken - enabled"); else - TEST_EQ(VbBootRecovery(&ctx), + TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+C todiag os broken - disabled"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for Ctrl-C"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, " todiag doesn't set unneeded DISPLAY_REQUEST"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " os broken screen"); @@ -1436,7 +1434,7 @@ static void VbBootDiagTest(void) /* No key pressed - timeout. */ ResetMocks(); - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_REBOOT_REQUIRED, "Timeout"); + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Timeout"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1449,7 +1447,7 @@ static void VbBootDiagTest(void) /* Esc key pressed. */ ResetMocks(); mock_keypress[0] = VB_KEY_ESC; - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_REBOOT_REQUIRED, "Esc key"); + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Esc key"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1461,7 +1459,7 @@ static void VbBootDiagTest(void) /* Shutdown requested via lid close */ ResetMocks(); MockGpioAfter(10, GPIO_LID_CLOSED); - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown"); + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1474,7 +1472,7 @@ static void VbBootDiagTest(void) ResetMocks(); mock_gpio[0].gpio_flags = GPIO_PRESENCE; mock_gpio[0].count = ~0; - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_REBOOT_REQUIRED, "Power held"); + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Power held"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1485,7 +1483,7 @@ static void VbBootDiagTest(void) /* Power button is pressed and released. */ ResetMocks(); MockGpioAfter(3, GPIO_PRESENCE); - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_REBOOT_REQUIRED, "Confirm"); + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Confirm"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1498,7 +1496,7 @@ static void VbBootDiagTest(void) * Ideally we'd that no recovery request was recorded, but * VbExLegacy() can only fail or crash the tests. */ - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), VB2_RECOVERY_ALTFW_HASH_FAILED, " recovery request"); @@ -1509,7 +1507,7 @@ static void VbBootDiagTest(void) mock_gpio[0].count = 2; mock_gpio[1].gpio_flags = GPIO_PRESENCE; mock_gpio[1].count = 2; - TEST_EQ(VbBootDiagnostic(&ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Confirm but tpm fail"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); @@ -1518,7 +1516,7 @@ static void VbBootDiagTest(void) TEST_EQ(tpm_set_mode_called, 1, " tpm call"); TEST_EQ(tpm_mode, VB2_TPM_MODE_DISABLED, " tpm disabled"); TEST_EQ(vbexlegacy_called, 0, " legacy not called"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), VB2_RECOVERY_TPM_DISABLE_FAILED, " recovery request"); |