vboot_reference: fix make_dev_firmware to fit latest dev firmware design

scripts/image_signing/make_dev_firmware.sh

 #!/bin/sh
 #
 # Copyright (c) 2011 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.
 #
 # This script can change key (usually developer keys) in a firmware binary
 # image or system live firmware (EEPROM), and assign proper HWID, BMPFV as well.
 
 SCRIPT_BASE="$(dirname "$0")"
@@ skipping 123 matching lines @@
 }
 
 # Main
 # ----------------------------------------------------------------------------
 main() {
   # Check parameters
   local root_pubkey="$FLAGS_keys/root_key.vbpubk"
   local recovery_pubkey="$FLAGS_keys/recovery_key.vbpubk"
   local firmware_keyblock="$FLAGS_keys/firmware.keyblock"
   local firmware_prvkey="$FLAGS_keys/firmware_data_key.vbprivk"
+  local dev_firmware_keyblock="$FLAGS_keys/dev_firmware.keyblock"
+  local dev_firmware_prvkey="$FLAGS_keys/dev_firmware_data_key.vbprivk"
   local kernel_sub_pubkey="$FLAGS_keys/kernel_subkey.vbpubk"
   local new_bmpfv="$FLAGS_bmpfv"
   local is_from_live=0
   local backup_image=
   local opt_bmpfv=""
 
   if [ "$new_bmpfv" = "$DEFAULT_BMPFV_FILE" ]; then
     new_bmpfv=$(explore_bmpfv) &&
       debug_msg "Using bitmaps from $new_bmpfv"
   fi
@@ skipping 64 matching lines @@
     err_die "Failed to change GBB Data. (message: $(cat "$EXEC_LOG"))"
 
   debug_msg "Resign the firmware code (A/B) with new keys"
   local unsigned_image="$(make_temp_file)"
   cp -f "$IMAGE" "$unsigned_image"
   "$SCRIPT_BASE/resign_firmwarefd.sh" \
     "$unsigned_image" \
     "$IMAGE" \
     "$firmware_prvkey" \
     "$firmware_keyblock" \
+    "$dev_firmware_prvkey" \
+    "$dev_firmware_keyblock" \
     "$kernel_sub_pubkey" >"$EXEC_LOG" 2>&1 ||
     err_die "Failed to re-sign firmware. (message: $(cat "$EXEC_LOG"))"
 
   # TODO(hungte) compare if the image really needs to be changed.
 
   debug_msg "Check if we need to make backup file(s)"
   if [ -n "$backup_image" ]; then
     local backup_hwid_name="$(echo "$old_hwid" | sed 's/ /_/g')"
     local backup_date_time="$(date +'%Y%m%d_%H%M%S')"
     local backup_file_name="firmware_${backup_hwid_name}_${backup_date_time}.fd"
@@ skipping 32 matching lines @@
 
   debug_msg "Complete."
   if [ -z "$FLAGS_to" ]; then
     echo "Successfully changed firmware to Developer Keys. New HWID: $new_hwid"
   else
     echo "Firmware '$FLAGS_to' now uses Developer Keys. New HWID: $new_hwid"
   fi
 }
 
 main