vboot: standardize on vb2_context identifiers in tests

Use `ctx` for global vb2_context variable, and `c` for argument
to functions.  This avoids shadowing the `ctx` identifier, which
was recently disallowed by enabling -Wshadow in CL:1598721.

BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none

Change-Id: I9db97fd4945694e6f54abc5b0c04ed5533789300
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1616872
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Youcheng Syu <youcheng@chromium.org>

1 files changed, 165 insertions, 165 deletions

diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index 781b0847..0f3f0c58 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -17,7 +17,7 @@
 /* Common context for tests */
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__ ((aligned (VB2_WORKBUF_ALIGN)));
-static struct vb2_context cc;
+static struct vb2_context ctx;
 static struct vb2_shared_data *sd;
 
 /* Mocked function data */
@@ -32,17 +32,17 @@ static void reset_common_data(void)
 {
 	memset(workbuf, 0xaa, sizeof(workbuf));
 
-	memset(&cc, 0, sizeof(cc));
-	cc.workbuf = workbuf;
-	cc.workbuf_size = sizeof(workbuf);
+	memset(&ctx, 0, sizeof(ctx));
+	ctx.workbuf = workbuf;
+	ctx.workbuf_size = sizeof(workbuf);
 
-	vb2_init_context(&cc);
-	sd = vb2_get_sd(&cc);
+	vb2_init_context(&ctx);
+	sd = vb2_get_sd(&ctx);
 
-	vb2_nv_init(&cc);
+	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&cc);
-	vb2_secdata_init(&cc);
+	vb2_secdata_create(&ctx);
+	vb2_secdata_init(&ctx);
 
 	mock_tpm_clear_called = 0;
 	mock_tpm_clear_retval = VB2_SUCCESS;
@@ -50,7 +50,7 @@ static void reset_common_data(void)
 
 /* Mocked functions */
 
-int vb2ex_read_resource(struct vb2_context *ctx,
+int vb2ex_read_resource(struct vb2_context *c,
 			enum vb2_resource_index index,
 			uint32_t offset,
 			void *buf,
@@ -66,7 +66,7 @@ int vb2ex_read_resource(struct vb2_context *ctx,
 	return VB2_SUCCESS;
 }
 
-int vb2ex_tpm_clear_owner(struct vb2_context *ctx)
+int vb2ex_tpm_clear_owner(struct vb2_context *c)
 {
 	mock_tpm_clear_called++;
 
@@ -148,13 +148,13 @@ static void misc_tests(void)
 	struct vb2_workbuf wb;
 
 	reset_common_data();
-	cc.workbuf_used = VB2_WORKBUF_ALIGN;
+	ctx.workbuf_used = VB2_WORKBUF_ALIGN;
 
-	vb2_workbuf_from_ctx(&cc, &wb);
+	vb2_workbuf_from_ctx(&ctx, &wb);
 
 	TEST_PTR_EQ(wb.buf, workbuf + VB2_WORKBUF_ALIGN,
 		    "vb_workbuf_from_ctx() buf");
-	TEST_EQ(wb.size, cc.workbuf_size - VB2_WORKBUF_ALIGN,
+	TEST_EQ(wb.size, ctx.workbuf_size - VB2_WORKBUF_ALIGN,
 		"vb_workbuf_from_ctx() size");
 }
 
@@ -182,52 +182,52 @@ static void gbb_tests(void)
 	mock_resource_index = VB2_RES_GBB;
 	mock_resource_ptr = &gbb;
 	mock_resource_size = sizeof(gbb);
-	TEST_SUCC(vb2_read_gbb_header(&cc, &gbbdest), "read gbb header good");
+	TEST_SUCC(vb2_read_gbb_header(&ctx, &gbbdest), "read gbb header good");
 	TEST_SUCC(memcmp(&gbb, &gbbdest, sizeof(gbb)), "read gbb contents");
 
 	mock_resource_index = VB2_RES_GBB + 1;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_EX_READ_RESOURCE_INDEX, "read gbb header missing");
 	mock_resource_index = VB2_RES_GBB;
 
 	gbb.signature[0]++;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_GBB_MAGIC, "read gbb header bad magic");
 	gbb.signature[0]--;
 
 	gbb.major_version = VB2_GBB_MAJOR_VER + 1;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_GBB_VERSION, "read gbb header major version");
 	gbb.major_version = VB2_GBB_MAJOR_VER;
 
 	gbb.minor_version = VB2_GBB_MINOR_VER + 1;
-	TEST_SUCC(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_SUCC(vb2_read_gbb_header(&ctx, &gbbdest),
 		  "read gbb header minor++");
 	gbb.minor_version = 1;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_GBB_TOO_OLD, "read gbb header 1.1 fails");
 	gbb.minor_version = 0;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_GBB_TOO_OLD, "read gbb header 1.0 fails");
 	gbb.minor_version = VB2_GBB_MINOR_VER;
 
 	gbb.header_size--;
-	TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest),
+	TEST_EQ(vb2_read_gbb_header(&ctx, &gbbdest),
 		VB2_ERROR_GBB_HEADER_SIZE, "read gbb header size");
-	TEST_EQ(vb2_fw_parse_gbb(&cc),
+	TEST_EQ(vb2_fw_parse_gbb(&ctx),
 		VB2_ERROR_GBB_HEADER_SIZE, "parse gbb failure");
 	gbb.header_size++;
 
 	/* Parse GBB */
-	TEST_SUCC(vb2_fw_parse_gbb(&cc), "parse gbb");
+	TEST_SUCC(vb2_fw_parse_gbb(&ctx), "parse gbb");
 	TEST_EQ(sd->gbb_flags, gbb.flags, "gbb flags");
 	TEST_EQ(sd->gbb_rootkey_offset, gbb.rootkey_offset, "rootkey offset");
 	TEST_EQ(sd->gbb_rootkey_size, gbb.rootkey_size, "rootkey size");
 
 	/* Workbuf failure */
 	reset_common_data();
-	cc.workbuf_used = cc.workbuf_size - 4;
-	TEST_EQ(vb2_fw_parse_gbb(&cc),
+	ctx.workbuf_used = ctx.workbuf_size - 4;
+	TEST_EQ(vb2_fw_parse_gbb(&ctx),
 		VB2_ERROR_GBB_WORKBUF, "parse gbb no workbuf");
 }
 
@@ -236,34 +236,34 @@ static void fail_tests(void)
 	/* Early fail (before even NV init) */
 	reset_common_data();
 	sd->status &= ~VB2_SD_STATUS_NV_INIT;
-	vb2_fail(&cc, 1, 2);
+	vb2_fail(&ctx, 1, 2);
 	TEST_NEQ(sd->status & VB2_SD_STATUS_NV_INIT, 0, "vb2_fail inits NV");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST),
 		1, "vb2_fail request");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_SUBCODE),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_SUBCODE),
 		2, "vb2_fail subcode");
 
 	/* Repeated fail doesn't overwrite the error code */
-	vb2_fail(&cc, 3, 4);
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST),
+	vb2_fail(&ctx, 3, 4);
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST),
 		1, "vb2_fail repeat");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_SUBCODE),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_SUBCODE),
 		2, "vb2_fail repeat2");
 
 	/* Fail with other slot good doesn't trigger recovery */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_TRY_COUNT, 3);
-	vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_UNKNOWN);
+	vb2_nv_set(&ctx, VB2_NV_TRY_COUNT, 3);
+	vb2_nv_set(&ctx, VB2_NV_FW_RESULT, VB2_FW_RESULT_UNKNOWN);
 	sd->status |= VB2_SD_STATUS_CHOSE_SLOT;
 	sd->fw_slot = 0;
 	sd->last_fw_slot = 1;
 	sd->last_fw_result = VB2_FW_RESULT_UNKNOWN;
-	vb2_fail(&cc, 5, 6);
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST), 0, "vb2_failover");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	vb2_fail(&ctx, 5, 6);
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "vb2_failover");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_FAILURE, "vb2_fail this fw");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_COUNT), 0, "vb2_fail use up tries");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_NEXT), 1, "vb2_fail try other slot");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_COUNT), 0, "vb2_fail use up tries");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_NEXT), 1, "vb2_fail try other slot");
 
 	/* Fail with other slot already failing triggers recovery */
 	reset_common_data();
@@ -271,50 +271,50 @@ static void fail_tests(void)
 	sd->fw_slot = 1;
 	sd->last_fw_slot = 0;
 	sd->last_fw_result = VB2_FW_RESULT_FAILURE;
-	vb2_fail(&cc, 7, 8);
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST), 7,
+	vb2_fail(&ctx, 7, 8);
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 7,
 		"vb2_fail both slots bad");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_FAILURE, "vb2_fail this fw");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_NEXT), 0, "vb2_fail try other slot");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_NEXT), 0, "vb2_fail try other slot");
 }
 
 static void recovery_tests(void)
 {
 	/* No recovery */
 	reset_common_data();
-	vb2_check_recovery(&cc);
+	vb2_check_recovery(&ctx);
 	TEST_EQ(sd->recovery_reason, 0, "No recovery reason");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_MANUAL_RECOVERY,
 		0, "Not manual recovery");
-	TEST_EQ(cc.flags & VB2_CONTEXT_RECOVERY_MODE,
+	TEST_EQ(ctx.flags & VB2_CONTEXT_RECOVERY_MODE,
 		0, "Not recovery mode");
 
 	/* From request */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_RECOVERY_REQUEST, 3);
-	vb2_check_recovery(&cc);
+	vb2_nv_set(&ctx, VB2_NV_RECOVERY_REQUEST, 3);
+	vb2_check_recovery(&ctx);
 	TEST_EQ(sd->recovery_reason, 3, "Recovery reason from request");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST), 0, "NV cleared");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "NV cleared");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_MANUAL_RECOVERY,
 		0, "Not manual recovery");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_RECOVERY_MODE,
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_RECOVERY_MODE,
 		 0, "Recovery mode");
 
 	/* From request, but already failed */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_RECOVERY_REQUEST, 4);
+	vb2_nv_set(&ctx, VB2_NV_RECOVERY_REQUEST, 4);
 	sd->recovery_reason = 5;
-	vb2_check_recovery(&cc);
+	vb2_check_recovery(&ctx);
 	TEST_EQ(sd->recovery_reason, 5, "Recovery reason already failed");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST),
 		0, "NV still cleared");
 
 	/* Override */
 	reset_common_data();
 	sd->recovery_reason = 6;
-	cc.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
-	vb2_check_recovery(&cc);
+	ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
+	vb2_check_recovery(&ctx);
 	TEST_EQ(sd->recovery_reason, VB2_RECOVERY_RO_MANUAL,
 		"Recovery reason forced");
 	TEST_NEQ(sd->flags & VB2_SD_FLAG_MANUAL_RECOVERY,
@@ -322,9 +322,9 @@ static void recovery_tests(void)
 
 	/* Override at broken screen */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_RECOVERY_SUBCODE, VB2_RECOVERY_US_TEST);
-	cc.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
-	vb2_check_recovery(&cc);
+	vb2_nv_set(&ctx, VB2_NV_RECOVERY_SUBCODE, VB2_RECOVERY_US_TEST);
+	ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
+	vb2_check_recovery(&ctx);
 	TEST_EQ(sd->recovery_reason, VB2_RECOVERY_US_TEST,
 		"Recovery reason forced from broken");
 	TEST_NEQ(sd->flags & VB2_SD_FLAG_MANUAL_RECOVERY,
@@ -337,107 +337,107 @@ static void dev_switch_tests(void)
 
 	/* Normal mode */
 	reset_common_data();
-	TEST_SUCC(vb2_check_dev_switch(&cc), "dev mode off");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "dev mode off");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
-	TEST_EQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
 	TEST_EQ(mock_tpm_clear_called, 0, "  no tpm clear");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_REQ_WIPEOUT), 0, "  no nv wipeout");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_REQ_WIPEOUT), 0, "  no nv wipeout");
 
 	/* Dev mode */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS,
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS,
 			(VB2_SECDATA_FLAG_DEV_MODE |
 			 VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER));
-	TEST_SUCC(vb2_check_dev_switch(&cc), "dev mode on");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "dev mode on");
 	TEST_NEQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd in dev");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx in dev");
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx in dev");
 	TEST_EQ(mock_tpm_clear_called, 0, "  no tpm clear");
 
 	/* Any normal mode boot clears dev boot flags */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_DEV_BOOT_USB, 1);
-	vb2_nv_set(&cc, VB2_NV_DEV_BOOT_LEGACY, 1);
-	vb2_nv_set(&cc, VB2_NV_DEV_BOOT_SIGNED_ONLY, 1);
-	vb2_nv_set(&cc, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 1);
-	vb2_nv_set(&cc, VB2_NV_DEV_DEFAULT_BOOT, 1);
-	vb2_nv_set(&cc, VB2_NV_FASTBOOT_UNLOCK_IN_FW, 1);
-	TEST_SUCC(vb2_check_dev_switch(&cc), "dev mode off");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_BOOT_USB),
+	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
+	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
+	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_SIGNED_ONLY, 1);
+	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 1);
+	vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, 1);
+	vb2_nv_set(&ctx, VB2_NV_FASTBOOT_UNLOCK_IN_FW, 1);
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "dev mode off");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_USB),
 		0, "  cleared dev boot usb");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_BOOT_LEGACY),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_LEGACY),
 		0, "  cleared dev boot legacy");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_BOOT_SIGNED_ONLY),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_SIGNED_ONLY),
 		0, "  cleared dev boot signed only");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP),
 		0, "  cleared dev boot fastboot full cap");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_DEFAULT_BOOT),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_DEFAULT_BOOT),
 		0, "  cleared dev default boot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FASTBOOT_UNLOCK_IN_FW),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FASTBOOT_UNLOCK_IN_FW),
 		0, "  cleared dev boot fastboot unlock in fw");
 
 	/* Normal-dev transition clears TPM */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS, VB2_SECDATA_FLAG_DEV_MODE);
-	TEST_SUCC(vb2_check_dev_switch(&cc), "to dev mode");
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS, VB2_SECDATA_FLAG_DEV_MODE);
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "to dev mode");
 	TEST_EQ(mock_tpm_clear_called, 1, "  tpm clear");
-	vb2_secdata_get(&cc, VB2_SECDATA_FLAGS, &v);
+	vb2_secdata_get(&ctx, VB2_SECDATA_FLAGS, &v);
 	TEST_EQ(v, (VB2_SECDATA_FLAG_DEV_MODE |
 		    VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER),
 		"  last boot developer now");
 
 	/* Dev-normal transition clears TPM too */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS,
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS,
 			VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER);
-	TEST_SUCC(vb2_check_dev_switch(&cc), "from dev mode");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "from dev mode");
 	TEST_EQ(mock_tpm_clear_called, 1, "  tpm clear");
-	vb2_secdata_get(&cc, VB2_SECDATA_FLAGS, &v);
+	vb2_secdata_get(&ctx, VB2_SECDATA_FLAGS, &v);
 	TEST_EQ(v, 0, "  last boot not developer now");
 
 	/* Disable dev mode */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS,
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS,
 			(VB2_SECDATA_FLAG_DEV_MODE |
 			 VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER));
-	vb2_nv_set(&cc, VB2_NV_DISABLE_DEV_REQUEST, 1);
-	TEST_SUCC(vb2_check_dev_switch(&cc), "disable dev request");
+	vb2_nv_set(&ctx, VB2_NV_DISABLE_DEV_REQUEST, 1);
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "disable dev request");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DISABLE_DEV_REQUEST),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST),
 		0, "  request cleared");
 
 	/* Force enabled by GBB */
 	reset_common_data();
 	sd->gbb_flags |= VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON;
-	TEST_SUCC(vb2_check_dev_switch(&cc), "dev on via gbb");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "dev on via gbb");
 	TEST_NEQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd in dev");
-	vb2_secdata_get(&cc, VB2_SECDATA_FLAGS, &v);
+	vb2_secdata_get(&ctx, VB2_SECDATA_FLAGS, &v);
 	TEST_EQ(v, VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER,
 		"  doesn't set dev on in secdata but does set last boot dev");
 	TEST_EQ(mock_tpm_clear_called, 1, "  tpm clear");
 
 	/* Request disable by ctx flag */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS,
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS,
 			(VB2_SECDATA_FLAG_DEV_MODE |
 			 VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER));
-	cc.flags |= VB2_CONTEXT_DISABLE_DEVELOPER_MODE;
-	TEST_SUCC(vb2_check_dev_switch(&cc), "disable dev on ctx request");
+	ctx.flags |= VB2_CONTEXT_DISABLE_DEVELOPER_MODE;
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "disable dev on ctx request");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
 
 	/* Simulate clear owner failure */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS,
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS,
 			VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER);
 	mock_tpm_clear_retval = VB2_ERROR_EX_TPM_CLEAR_OWNER;
-	TEST_EQ(vb2_check_dev_switch(&cc),
+	TEST_EQ(vb2_check_dev_switch(&ctx),
 		VB2_ERROR_EX_TPM_CLEAR_OWNER, "tpm clear fail");
 	TEST_EQ(mock_tpm_clear_called, 1, "  tpm clear");
-	vb2_secdata_get(&cc, VB2_SECDATA_FLAGS, &v);
+	vb2_secdata_get(&ctx, VB2_SECDATA_FLAGS, &v);
 	TEST_EQ(v, VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER,
 		"  last boot still developer");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST),
 		VB2_RECOVERY_TPM_CLEAR_OWNER, "  requests recovery");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_SUBCODE),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_SUBCODE),
 		(uint8_t)VB2_ERROR_EX_TPM_CLEAR_OWNER, "  recovery subcode");
 
 	/*
@@ -445,75 +445,75 @@ static void dev_switch_tests(void)
 	 * mode was on in the (inaccessible) secdata.
 	 */
 	reset_common_data();
-	vb2_secdata_set(&cc, VB2_SECDATA_FLAGS, VB2_SECDATA_FLAG_DEV_MODE);
+	vb2_secdata_set(&ctx, VB2_SECDATA_FLAGS, VB2_SECDATA_FLAG_DEV_MODE);
 	sd->status &= ~VB2_SD_STATUS_SECDATA_INIT;
-	TEST_EQ(vb2_check_dev_switch(&cc), VB2_ERROR_SECDATA_GET_UNINITIALIZED,
+	TEST_EQ(vb2_check_dev_switch(&ctx), VB2_ERROR_SECDATA_GET_UNINITIALIZED,
 		"secdata fail normal");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
-	TEST_EQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
 
 	/* Secdata failure in recovery mode continues */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_RECOVERY_MODE;
+	ctx.flags |= VB2_CONTEXT_RECOVERY_MODE;
 	sd->status &= ~VB2_SD_STATUS_SECDATA_INIT;
-	TEST_SUCC(vb2_check_dev_switch(&cc), "secdata fail recovery");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "secdata fail recovery");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
-	TEST_EQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
 
 	/* And doesn't check or clear dev disable request */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_RECOVERY_MODE;
+	ctx.flags |= VB2_CONTEXT_RECOVERY_MODE;
 	sd->status &= ~VB2_SD_STATUS_SECDATA_INIT;
-	vb2_nv_set(&cc, VB2_NV_DISABLE_DEV_REQUEST, 1);
-	TEST_SUCC(vb2_check_dev_switch(&cc), "secdata fail recovery disable");
+	vb2_nv_set(&ctx, VB2_NV_DISABLE_DEV_REQUEST, 1);
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "secdata fail recovery disable");
 	TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd not in dev");
-	TEST_EQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_DISABLE_DEV_REQUEST),
+	TEST_EQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx not in dev");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST),
 		1, "  request not cleared");
 
 	/* Can still override with GBB flag */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_RECOVERY_MODE;
+	ctx.flags |= VB2_CONTEXT_RECOVERY_MODE;
 	sd->status &= ~VB2_SD_STATUS_SECDATA_INIT;
 	sd->gbb_flags |= VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON;
-	TEST_SUCC(vb2_check_dev_switch(&cc), "secdata fail recovery gbb");
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "secdata fail recovery gbb");
 	TEST_NEQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, "  sd in dev");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx in dev");
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, "  ctx in dev");
 	TEST_EQ(mock_tpm_clear_called, 1, "  tpm clear");
 
 	/* Force wipeout by ctx flag */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_FORCE_WIPEOUT_MODE;
-	TEST_SUCC(vb2_check_dev_switch(&cc), "wipeout on ctx flag");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_REQ_WIPEOUT), 1, "  nv wipeout");
+	ctx.flags |= VB2_CONTEXT_FORCE_WIPEOUT_MODE;
+	TEST_SUCC(vb2_check_dev_switch(&ctx), "wipeout on ctx flag");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_REQ_WIPEOUT), 1, "  nv wipeout");
 }
 
 static void tpm_clear_tests(void)
 {
 	/* No clear request */
 	reset_common_data();
-	TEST_SUCC(vb2_check_tpm_clear(&cc), "no clear request");
+	TEST_SUCC(vb2_check_tpm_clear(&ctx), "no clear request");
 	TEST_EQ(mock_tpm_clear_called, 0, "tpm not cleared");
 
 	/* Successful request */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_CLEAR_TPM_OWNER_REQUEST, 1);
-	TEST_SUCC(vb2_check_tpm_clear(&cc), "clear request");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_CLEAR_TPM_OWNER_REQUEST),
+	vb2_nv_set(&ctx, VB2_NV_CLEAR_TPM_OWNER_REQUEST, 1);
+	TEST_SUCC(vb2_check_tpm_clear(&ctx), "clear request");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_CLEAR_TPM_OWNER_REQUEST),
 		0, "request cleared");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_CLEAR_TPM_OWNER_DONE),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_CLEAR_TPM_OWNER_DONE),
 		1, "done set");
 	TEST_EQ(mock_tpm_clear_called, 1, "tpm cleared");
 
 	/* Failed request */
 	reset_common_data();
 	mock_tpm_clear_retval = VB2_ERROR_EX_TPM_CLEAR_OWNER;
-	vb2_nv_set(&cc, VB2_NV_CLEAR_TPM_OWNER_REQUEST, 1);
-	TEST_EQ(vb2_check_tpm_clear(&cc),
+	vb2_nv_set(&ctx, VB2_NV_CLEAR_TPM_OWNER_REQUEST, 1);
+	TEST_EQ(vb2_check_tpm_clear(&ctx),
 		VB2_ERROR_EX_TPM_CLEAR_OWNER, "clear failure");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_CLEAR_TPM_OWNER_REQUEST),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_CLEAR_TPM_OWNER_REQUEST),
 		0, "request cleared");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_CLEAR_TPM_OWNER_DONE),
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_CLEAR_TPM_OWNER_DONE),
 		0, "done not set");
 }
 
@@ -521,86 +521,86 @@ static void select_slot_tests(void)
 {
 	/* Slot A */
 	reset_common_data();
-	TEST_SUCC(vb2_select_fw_slot(&cc), "select slot A");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "select slot A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_UNKNOWN, "result unknown");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 0, "tried A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 0, "tried A");
 	TEST_EQ(sd->fw_slot, 0, "selected A");
-	TEST_EQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
 
 	/* Slot B */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_TRY_NEXT, 1);
-	TEST_SUCC(vb2_select_fw_slot(&cc), "select slot B");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	vb2_nv_set(&ctx, VB2_NV_TRY_NEXT, 1);
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "select slot B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_UNKNOWN, "result unknown");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 1, "tried B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 1, "tried B");
 	TEST_EQ(sd->fw_slot, 1, "selected B");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
 
 	/* Slot A ran out of tries */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_TRYING);
-	TEST_SUCC(vb2_select_fw_slot(&cc), "select slot A out of tries");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_NEXT), 1, "try B next");
+	vb2_nv_set(&ctx, VB2_NV_FW_RESULT, VB2_FW_RESULT_TRYING);
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "select slot A out of tries");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_NEXT), 1, "try B next");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 1, "tried B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 1, "tried B");
 	TEST_EQ(sd->fw_slot, 1, "selected B");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
 
 	/* Slot A ran out of tries, even with nofail active */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_NOFAIL_BOOT;
-	vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_TRYING);
-	TEST_SUCC(vb2_select_fw_slot(&cc), "select slot A out of tries");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_NEXT), 1, "try B next");
+	ctx.flags |= VB2_CONTEXT_NOFAIL_BOOT;
+	vb2_nv_set(&ctx, VB2_NV_FW_RESULT, VB2_FW_RESULT_TRYING);
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "select slot A out of tries");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_NEXT), 1, "try B next");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 1, "tried B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 1, "tried B");
 	TEST_EQ(sd->fw_slot, 1, "selected B");
-	TEST_NEQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
+	TEST_NEQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "ctx says choose B");
 
 	/* Slot A used up a try */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_TRY_COUNT, 3);
-	TEST_SUCC(vb2_select_fw_slot(&cc), "try slot A");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	vb2_nv_set(&ctx, VB2_NV_TRY_COUNT, 3);
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "try slot A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_TRYING, "result trying");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 0, "tried A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 0, "tried A");
 	TEST_EQ(sd->fw_slot, 0, "selected A");
-	TEST_EQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_COUNT), 2, "tries decremented");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_COUNT), 2, "tries decremented");
 
 	/* Slot A failed, but nofail active */
 	reset_common_data();
-	cc.flags |= VB2_CONTEXT_NOFAIL_BOOT;
-	vb2_nv_set(&cc, VB2_NV_TRY_COUNT, 3);
-	TEST_SUCC(vb2_select_fw_slot(&cc), "try slot A");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_RESULT),
+	ctx.flags |= VB2_CONTEXT_NOFAIL_BOOT;
+	vb2_nv_set(&ctx, VB2_NV_TRY_COUNT, 3);
+	TEST_SUCC(vb2_select_fw_slot(&ctx), "try slot A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_RESULT),
 		VB2_FW_RESULT_TRYING, "result trying");
 	TEST_NEQ(sd->status & VB2_SD_STATUS_CHOSE_SLOT, 0, "chose slot");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_TRIED), 0, "tried A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_TRIED), 0, "tried A");
 	TEST_EQ(sd->fw_slot, 0, "selected A");
-	TEST_EQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_COUNT), 3, "tries not decremented");
+	TEST_EQ(ctx.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_TRY_COUNT), 3, "tries not decremented");
 
 	/* Tried/result get copied to the previous fields */
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_FW_TRIED, 0);
-	vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_SUCCESS);
-	vb2_select_fw_slot(&cc);
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_TRIED), 0, "prev A");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_RESULT),	VB2_FW_RESULT_SUCCESS,
+	vb2_nv_set(&ctx, VB2_NV_FW_TRIED, 0);
+	vb2_nv_set(&ctx, VB2_NV_FW_RESULT, VB2_FW_RESULT_SUCCESS);
+	vb2_select_fw_slot(&ctx);
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_PREV_TRIED), 0, "prev A");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_PREV_RESULT),	VB2_FW_RESULT_SUCCESS,
 		"prev success");
 
 	reset_common_data();
-	vb2_nv_set(&cc, VB2_NV_FW_TRIED, 1);
-	vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_FAILURE);
-	vb2_select_fw_slot(&cc);
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_TRIED), 1, "prev B");
-	TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_RESULT),	VB2_FW_RESULT_FAILURE,
+	vb2_nv_set(&ctx, VB2_NV_FW_TRIED, 1);
+	vb2_nv_set(&ctx, VB2_NV_FW_RESULT, VB2_FW_RESULT_FAILURE);
+	vb2_select_fw_slot(&ctx);
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_PREV_TRIED), 1, "prev B");
+	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FW_PREV_RESULT),	VB2_FW_RESULT_FAILURE,
 		"prev failure");
 }