scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-17 05:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

resign_firmwarefd.sh: support new "flag" (for hinting two-stop FW)

Browse Source 
The two-stop firmware relies on the "flag" field which may be useful for the
resign_firmwarefd.sh.

BUG=chrome-os-partner:5095
TEST=./resign_firmwarefd [params] 1
     vbutil_firmware --verify ..... # seeing flag = 1

Change-Id: I56b44ee5b610e36384e15e6eb31286f0f838734b
Reviewed-on: http://gerrit.chromium.org/gerrit/4561
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
This commit is contained in:
Hung-Te Lin
2011-07-22 16:07:58 +08:00
parent ad03a439bc
commit 8e17e5fe43
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/image_signing/make_dev_firmware.sh
View File

@@ -222,6 +222,7 @@ main() {
debug_msg "Resign the firmware code (A/B) with new keys" debug_msg "Resign the firmware code (A/B) with new keys"
local unsigned_image="$(make_temp_file)" local unsigned_image="$(make_temp_file)"
cp -f "$IMAGE" "$unsigned_image" cp -f "$IMAGE" "$unsigned_image"
# TODO(hungte) derive kernel key and preamble flag from existing firmware
"$SCRIPT_BASE/resign_firmwarefd.sh" \ "$SCRIPT_BASE/resign_firmwarefd.sh" \
"$unsigned_image" \ "$unsigned_image" \
"$IMAGE" \ "$IMAGE" \
@@ -231,6 +232,9 @@ main() {
"$dev_firmware_keyblock" \ "$dev_firmware_keyblock" \
"$kernel_sub_pubkey" >"$EXEC_LOG" 2>&1 || "$kernel_sub_pubkey" >"$EXEC_LOG" 2>&1 ||
err_die "Failed to re-sign firmware. (message: $(cat "$EXEC_LOG"))" err_die "Failed to re-sign firmware. (message: $(cat "$EXEC_LOG"))"
if is_debug_mode; then
cat "$EXEC_LOG"
fi
# TODO(hungte) compare if the image really needs to be changed. # TODO(hungte) compare if the image really needs to be changed.

17
scripts/image_signing/resign_firmwarefd.sh
View File

@@ -54,9 +54,9 @@
set -e set -e
# Check arguments # Check arguments
if [ $# -lt 7 ] || [ $# -gt 8 ]; then if [ $# -lt 7 ] || [ $# -gt 9 ]; then
echo "Usage: $PROG src_fd dst_fd firmware_datakey firmware_keyblock"\ echo "Usage: $PROG src_fd dst_fd firmware_datakey firmware_keyblock"\
"dev_firmware_datakey dev_firmware_keyblock kernel_subkey [version]" "dev_firmware_datakey dev_firmware_keyblock kernel_subkey [version [flag]]"
exit 1 exit 1
fi fi
@@ -74,12 +74,21 @@ DEV_FIRMWARE_DATAKEY=$5
DEV_FIRMWARE_KEYBLOCK=$6 DEV_FIRMWARE_KEYBLOCK=$6
KERNEL_SUBKEY=$7 KERNEL_SUBKEY=$7
VERSION=$8 VERSION=$8
# This is the --flag in vbutil_firmware. It currently has only two values:
# 0 for RW-NORMAL firmware, and 1 for RO-NORMAL firmware (search "two_stop
# firmware" for more information).
PREAMBLE_FLAG=$9
if [ -z $VERSION ]; then if [ -z "$VERSION" ]; then
VERSION=1 VERSION=1
fi fi
echo "Using firmware version: $VERSION" echo "Using firmware version: $VERSION"
if [ -n "$PREAMBLE_FLAG" ]; then
echo "Using firmware preamble flag: $PREAMBLE_FLAG"
PREAMBLE_FLAG="--flag $PREAMBLE_FLAG"
fi
# Parse offsets and size of firmware data and vblocks # Parse offsets and size of firmware data and vblocks
for i in "A" "B" for i in "A" "B"
do do
@@ -118,6 +127,7 @@ vbutil_firmware \
--keyblock "${DEV_FIRMWARE_KEYBLOCK}" \ --keyblock "${DEV_FIRMWARE_KEYBLOCK}" \
--signprivate "${DEV_FIRMWARE_DATAKEY}" \ --signprivate "${DEV_FIRMWARE_DATAKEY}" \
--version "${VERSION}" \ --version "${VERSION}" \
$PREAMBLE_FLAG \
--fv "${temp_fwimage}" \ --fv "${temp_fwimage}" \
--kernelkey "${KERNEL_SUBKEY}" --kernelkey "${KERNEL_SUBKEY}"
@@ -135,6 +145,7 @@ vbutil_firmware \
--keyblock "${FIRMWARE_KEYBLOCK}" \ --keyblock "${FIRMWARE_KEYBLOCK}" \
--signprivate "${FIRMWARE_DATAKEY}" \ --signprivate "${FIRMWARE_DATAKEY}" \
--version "${VERSION}" \ --version "${VERSION}" \
$PREAMBLE_FLAG \
--fv "${temp_fwimage}" \ --fv "${temp_fwimage}" \
--kernelkey "${KERNEL_SUBKEY}" --kernelkey "${KERNEL_SUBKEY}"