Add a command line string field to verified boot kernel config image.

Also some cleanup of duplicated code.

BUG=670
TEST=Existing image verification tests still pass.

Review URL: http://codereview.chromium.org/874006

1 files changed, 1 insertions, 5 deletions

diff --git a/tests/firmware_image_tests.c b/tests/firmware_image_tests.c
index 82c4f37d..2af267cb 100644
--- a/tests/firmware_image_tests.c
+++ b/tests/firmware_image_tests.c
@@ -48,11 +48,7 @@ FirmwareImage* GenerateTestFirmwareImage(int algorithm,
   image->firmware_key_version = firmware_key_version;
 
   /* Update correct header length. */
-  image->header_len = (sizeof(image->header_len) +
-                       sizeof(image->firmware_sign_algorithm) +
-                       RSAProcessedKeySize(image->firmware_sign_algorithm) +
-                       sizeof(image->firmware_key_version) +
-                       sizeof(image->header_checksum));
+  image->header_len = GetFirmwareHeaderLen(image);
 
   /* Calculate SHA-512 digest on header and populate header_checksum. */
   DigestInit(&ctx, ROOT_SIGNATURE_ALGORITHM);