aboutsummaryrefslogtreecommitdiff
path: root/utility
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2014-06-18 14:15:04 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-20 21:40:29 +0000
commit539cbc27305b6aef9643adffc3297c7079fe7457 (patch)
treef24530559cf55819b0fe198e6831cdc4ef4312e2 /utility
parenta7ab8b50b8923afcfd7a9e6181892c4c8a2de250 (diff)
downloadvboot_reference-539cbc27305b6aef9643adffc3297c7079fe7457.tar.gz
vboot2: Add end-to-end test of firmware verification
This constructs a test firmware using the old vboot signing utilities, and then verifies it using vboot2 libraries. This ensures vboot2 can read files signed by the current signing process. BUG=chromium:370082 BRANCH=none TEST=VBOOT2=1 make runtests Change-Id: Icc113c982e5ed99382a4592f9ab688784e853c8e Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/204561 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r--utility/vb2_verify_fw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/utility/vb2_verify_fw.c b/utility/vb2_verify_fw.c
index 2d662de0..f7ec0b50 100644
--- a/utility/vb2_verify_fw.c
+++ b/utility/vb2_verify_fw.c
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
if (rv) {
printf("Phase 1 wants recovery mode.\n");
save_if_needed(&ctx);
- return 0;
+ return rv;
}
/* Determine which firmware slot to boot */
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
if (rv) {
printf("Phase 2 wants reboot.\n");
save_if_needed(&ctx);
- return 0;
+ return rv;
}
/* Try that slot */
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
if (rv) {
printf("Phase 3 wants reboot.\n");
save_if_needed(&ctx);
- return 0;
+ return rv;
}
/* Verify body */
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
save_if_needed(&ctx);
if (rv) {
printf("Phase 4 wants reboot.\n");
- return 0;
+ return rv;
}
printf("Yaay!\n");