Add --subkey_in and --subkey_out options to firmware signing utility.

With this change, just like the kernel signing utility, the firmware signing utility now supports outputting the key signature (subkey) header and reusing it to generate new signed firmware images without requiring the root key (assuming the firmware signing key doesn't change).

Also, some minor comment fixes I missed the last time around.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/utility/include/firmware_utility.h b/utility/include/firmware_utility.h
index 9e668e0a..663536a2 100644
--- a/utility/include/firmware_utility.h
+++ b/utility/include/firmware_utility.h
@@ -54,17 +54,19 @@ class FirmwareUtility {
   RSAPublicKey* root_key_pub_;
   std::string root_key_file_;
   std::string root_key_pub_file_;
-  int firmware_version_;
   std::string firmware_key_file_;
   std::string firmware_key_pub_file_;
-  int firmware_key_version_;
-  int firmware_sign_algorithm_;
+  std::string subkey_in_file_;  // Existing key signature header.
   std::string in_file_;
   std::string out_file_;
+  int firmware_key_version_;
+  int firmware_sign_algorithm_;
+  int firmware_version_;
   bool is_generate_;  // Are we generating a new image?
   bool is_verify_;  // Are we just verifying an already signed image?
   bool is_describe_; // Should we print out description of the image?
   bool is_only_vblock_;  // Should we just output the verification block?
+  bool is_subkey_out_;  // Should we just output the subkey header?
 };
 
 }  // namespace vboot_reference