Change kernel vboot header layout and add support for separate header verification.

src/platform/vboot_reference/utility/kernel_utility.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Utility for manipulating verified boot kernel images.
 //
 
 #include "kernel_utility.h"
 
 #include <errno.h>
@@ skipping 18 matching lines @@
 namespace vboot_reference {
 
 KernelUtility::KernelUtility(): image_(NULL),
                                 firmware_key_pub_(NULL),
                                 header_version_(1),
                                 firmware_sign_algorithm_(-1),
                                 kernel_sign_algorithm_(-1),
                                 kernel_key_version_(-1),
                                 kernel_version_(-1),
                                 kernel_len_(0),
-                                kernel_config_(NULL),
                                 is_generate_(false),
                                 is_verify_(false),
                                 is_describe_(false),
                                 is_only_vblock_(false) {
 }
 
 KernelUtility::~KernelUtility() {
-  Free(kernel_config_);
   RSAPublicKeyFree(firmware_key_pub_);
   KernelImageFree(image_);
 }
 
 void KernelUtility::PrintUsage(void) {
   cerr <<
       "Utility to generate/verify/describe a verified boot kernel image\n\n"
       "Usage: kernel_utility <--generate|--verify|--describe> [OPTIONS]\n\n"
       "For \"--verify\",  required OPTIONS are:\n"
       "--in <infile>\t\t\tVerified boot kernel image to verify.\n"
       "--firmware_key_pub <pubkeyfile>\tPre-processed public firmware key "
       "to use for verification.\n\n"
       "For \"--generate\", required OPTIONS are:\n"
       "--firmware_key <privkeyfile>\tPrivate firmware signing key file\n"
       "--kernel_key <privkeyfile>\tPrivate kernel signing key file\n"
       "--kernel_key_pub <pubkeyfile>\tPre-processed public kernel signing"
       " key\n"
       "--firmware_sign_algorithm <algoid>\tSigning algorithm used by "
       "the firmware\n"
       "--kernel_sign_algorithm <algoid>\tSigning algorithm to use for kernel\n"
       "--kernel_key_version <version#>\tKernel signing Key Version#\n"
       "--kernel_version <version#>\tKernel Version#\n"
       "--in <infile>\t\tKernel Image to sign\n"
       "--out <outfile>\t\tOutput file for verified boot Kernel image\n\n"
       "Optional arguments for \"--generate\" include:\n"
-      "--config <file>\t\t\tPopulate contents of kernel config from a file\n"
       "--vblock\t\t\tJust output the verification block\n\n"
       "<algoid> (for --*_sign_algorithm) is one of the following:\n";
   for (int i = 0; i < kNumAlgorithms; i++) {
     cerr << i << " for " << algo_strings[i] << "\n";
   }
   cerr << "\n\n";
 }
 
 bool KernelUtility::ParseCmdLineOptions(int argc, char* argv[]) {
   int option_index, i;
   enum {
     OPT_FIRMWARE_KEY = 1000,
     OPT_FIRMWARE_KEY_PUB,
     OPT_KERNEL_KEY,
     OPT_KERNEL_KEY_PUB,
     OPT_FIRMWARE_SIGN_ALGORITHM,
     OPT_KERNEL_SIGN_ALGORITHM,
     OPT_KERNEL_KEY_VERSION,
     OPT_KERNEL_VERSION,
     OPT_IN,
     OPT_OUT,
     OPT_GENERATE,
     OPT_VERIFY,
     OPT_DESCRIBE,
-    OPT_CONFIG,
     OPT_VBLOCK,
   };
   static struct option long_options[] = {
     {"firmware_key", 1, 0,              OPT_FIRMWARE_KEY            },
     {"firmware_key_pub", 1, 0,          OPT_FIRMWARE_KEY_PUB        },
     {"kernel_key", 1, 0,                OPT_KERNEL_KEY              },
     {"kernel_key_pub", 1, 0,            OPT_KERNEL_KEY_PUB          },
     {"firmware_sign_algorithm", 1, 0,   OPT_FIRMWARE_SIGN_ALGORITHM },
     {"kernel_sign_algorithm", 1, 0,     OPT_KERNEL_SIGN_ALGORITHM   },
     {"kernel_key_version", 1, 0,        OPT_KERNEL_KEY_VERSION      },
     {"kernel_version", 1, 0,            OPT_KERNEL_VERSION          },
     {"in", 1, 0,                        OPT_IN                      },
     {"out", 1, 0,                       OPT_OUT                     },
     {"generate", 0, 0,                  OPT_GENERATE                },
     {"verify", 0, 0,                    OPT_VERIFY                  },
     {"describe", 0, 0,                  OPT_DESCRIBE                },
-    {"config", 1, 0,                    OPT_CONFIG                  },
     {"vblock", 0, 0,                    OPT_VBLOCK                  },
     {NULL, 0, 0, 0}
   };
   while ((i = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
     switch (i) {
     case '?':
       return false;
       break;
     case OPT_FIRMWARE_KEY:
       firmware_key_file_ = optarg;
@@ skipping 43 matching lines @@
       break;
     case OPT_GENERATE:
       is_generate_ = true;
       break;
     case OPT_VERIFY:
       is_verify_ = true;
       break;
     case OPT_DESCRIBE:
       is_describe_ = true;
       break;
-    case OPT_CONFIG:
-      config_file_ = optarg;
-      break;
     case OPT_VBLOCK:
       is_only_vblock_ = true;
       break;
     }
   }
   return CheckOptions();
 }
 
 void KernelUtility::OutputSignedImage(void) {
   if (image_) {
     if (!WriteKernelImage(out_file_.c_str(), image_, is_only_vblock_)) {
       cerr << "Couldn't write verified boot kernel image to file "
            << out_file_ <<".\n";
     }
   }
 }
 
 void KernelUtility::DescribeSignedImage(void) {
   image_ = ReadKernelImage(in_file_.c_str());
   if (!image_) {
     cerr << "Couldn't read kernel image or malformed image.\n";
     return;
   }
   PrintKernelImage(image_);
 }
 
 bool KernelUtility::GenerateSignedImage(void) {
-  uint64_t len;
   uint64_t kernel_key_pub_len;
   image_ = KernelImageNew();
 
   Memcpy(image_->magic, KERNEL_MAGIC, KERNEL_MAGIC_SIZE);
 
   // TODO(gauravsh): make this a command line option.
   image_->header_version = 1;
   image_->firmware_sign_algorithm = (uint16_t) firmware_sign_algorithm_;
   // Copy pre-processed public signing key.
   image_->kernel_sign_algorithm = (uint16_t) kernel_sign_algorithm_;
   image_->kernel_sign_key = BufferFromFile(kernel_key_pub_file_.c_str(),
                                            &kernel_key_pub_len);
   if (!image_->kernel_sign_key)
     return false;
   image_->kernel_key_version = kernel_key_version_;
 
   // Update header length.
   image_->header_len = GetKernelHeaderLen(image_);
 
   // Calculate header checksum.
   CalculateKernelHeaderChecksum(image_, image_->header_checksum);
 
   image_->kernel_version = kernel_version_;
-  if (!config_file_.empty()) {
-    kernel_config_ = BufferFromFile(config_file_.c_str(), &len);
-    if (len >= sizeof(image_->kernel_config)) {
-      cerr << "Input kernel config file is too big!";
-      return false;
-    }
-    Memcpy(image_->kernel_config,
-           kernel_config_, len);
-  } else {
-    Memset(image_->kernel_config, 0,
-           sizeof(image_->kernel_config));
-  }
   image_->kernel_data = BufferFromFile(in_file_.c_str(),
                                        &image_->kernel_len);
   if (!image_->kernel_data)
     return false;
   // Generate and add the signatures.
   if (!AddKernelKeySignature(image_, firmware_key_file_.c_str())) {
     cerr << "Couldn't write key signature to verified boot kernel image.\n";
     return false;
   }
 
@@ skipping 101 matching lines @@
   }
   else if (ku.is_verify()) {
     cerr << "Verification ";
     if (ku.VerifySignedImage())
       cerr << "SUCCESS.\n";
     else
       cerr << "FAILURE.\n";
   }
   return 0;
 }