diff options
| author | Furquan Shaikh <furquan@google.com> | 2015-02-03 15:34:29 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-02-12 04:40:35 +0000 |
| commit | 80e779d50b52cd97c9d5896a3b75fa8118ee488f (patch) | |
| tree | 18417a40d0f494546b6cc8b35cbd47938451facc /tests | |
| parent | 623d6c4744ed92b53ac929edd94de22c61a93daf (diff) | |
| download | vboot-80e779d50b52cd97c9d5896a3b75fa8118ee488f.tar.gz | |
kernel flags: Add flags field to kernel preamble.
1. Increase kernel preamble revision from 2.1 to 2.2.
2. Add flags field to kernel preamble.
3. Update futility to accept flags parameter for vbutil_kernel and
cmd_sign for kernel.
4. Pass in an extra flags field to SignKernelBlob and
CreateKernelPreamble.
BUG=chrome-os-partner:35861
BRANCH=None
TEST=1) "make runalltests" completes successfully. 2) vboot_reference
compiles successfully for ryu. 3) Verified flags field in header using
futility show.
Change-Id: If9f06f98778a7339194c77090cbef4807d5e34e2
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/245950
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vboot_common2_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_common_tests.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/vboot_common2_tests.c b/tests/vboot_common2_tests.c index 3a2b59f3..40953117 100644 --- a/tests/vboot_common2_tests.c +++ b/tests/vboot_common2_tests.c @@ -128,7 +128,7 @@ static void VerifyKernelPreambleTest(const VbPublicKey *public_key, rsa = PublicKeyToRSA(public_key); hdr = CreateKernelPreamble(0x1234, 0x100000, 0x300000, 0x4000, body_sig, - 0, 0, 0, private_key); + 0, 0, 0, 0, private_key); TEST_NEQ(hdr && rsa, 0, "VerifyKernelPreamble() prerequisites"); if (!hdr) return; diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c index 8fd021a1..3c303a6c 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vboot_common_tests.c @@ -31,7 +31,7 @@ static void StructPackingTest(void) TEST_EQ(EXPECTED_VBFIRMWAREPREAMBLEHEADER2_1_SIZE, sizeof(VbFirmwarePreambleHeader), "sizeof(VbFirmwarePreambleHeader)"); - TEST_EQ(EXPECTED_VBKERNELPREAMBLEHEADER2_1_SIZE, + TEST_EQ(EXPECTED_VBKERNELPREAMBLEHEADER2_2_SIZE, sizeof(VbKernelPreambleHeader), "sizeof(VbKernelPreambleHeader)"); |