mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-24 02:05:01 +00:00
f1dba02034
When disabling verity with make_dev_ssh.sh, a bug in vbutil_kernel caused the re-signed kernel size to be the entire kernel partition instead of just the necessary bits. Until we can improve the test coverage, I'm rolling back the changes that introduced this bug. BUG=chromium:418647 BRANCH=ToT TEST=manual Created a new test image with these changes. You can install it and disable dm-verity and it works (although there seems to be an unrelated browser startup issue on ToT). Change-Id: I48e8427b05e191c9894c42056429a79d57bfc78d Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/220935 Reviewed-by: Randall Spangler <rspangler@chromium.org>
169 lines
5.3 KiB
Bash
Executable File
169 lines
5.3 KiB
Bash
Executable File
#!/bin/bash -eux
|
|
# Copyright (c) 2014 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.
|
|
|
|
me=${0##*/}
|
|
TMP="$me.tmp"
|
|
|
|
# Work in scratch directory
|
|
cd "$OUTDIR"
|
|
|
|
DEVKEYS=${SRCDIR}/tests/devkeys
|
|
|
|
echo "hi there" > ${TMP}.config.txt
|
|
echo "hello boys" > ${TMP}.config2.txt
|
|
dd if=/dev/urandom bs=512 count=1 of=${TMP}.bootloader.bin
|
|
dd if=/dev/urandom bs=512 count=1 of=${TMP}.bootloader2.bin
|
|
|
|
# default padding
|
|
padding=65536
|
|
|
|
try_arch () {
|
|
local arch=$1
|
|
|
|
echo -n "${arch}.a " 1>&3
|
|
|
|
# pack it up the old way
|
|
${FUTILITY} vbutil_kernel --debug \
|
|
--pack ${TMP}.blob1.${arch} \
|
|
--keyblock ${DEVKEYS}/recovery_kernel.keyblock \
|
|
--signprivate ${DEVKEYS}/recovery_kernel_data_key.vbprivk \
|
|
--version 1 \
|
|
--config ${TMP}.config.txt \
|
|
--bootloader ${TMP}.bootloader.bin \
|
|
--vmlinuz ${SCRIPTDIR}/data/vmlinuz-${arch}.bin \
|
|
--arch ${arch} \
|
|
--kloadaddr 0x11000
|
|
|
|
# verify the old way
|
|
${FUTILITY} vbutil_kernel --verify ${TMP}.blob1.${arch} \
|
|
--signpubkey ${DEVKEYS}/recovery_key.vbpubk
|
|
${FUTILITY} vbutil_kernel2 --verify ${TMP}.blob1.${arch} \
|
|
--signpubkey ${DEVKEYS}/recovery_key.vbpubk --debug
|
|
|
|
# pack it up the new way
|
|
${FUTILITY} vbutil_kernel2 --debug \
|
|
--pack ${TMP}.blob2.${arch} \
|
|
--keyblock ${DEVKEYS}/recovery_kernel.keyblock \
|
|
--signprivate ${DEVKEYS}/recovery_kernel_data_key.vbprivk \
|
|
--version 1 \
|
|
--config ${TMP}.config.txt \
|
|
--bootloader ${TMP}.bootloader.bin \
|
|
--vmlinuz ${SCRIPTDIR}/data/vmlinuz-${arch}.bin \
|
|
--arch ${arch} \
|
|
--kloadaddr 0x11000
|
|
|
|
# they should be identical
|
|
cmp ${TMP}.blob1.${arch} ${TMP}.blob2.${arch}
|
|
|
|
# repack it the old way
|
|
${FUTILITY} vbutil_kernel \
|
|
--repack ${TMP}.blob3.${arch} \
|
|
--oldblob ${TMP}.blob1.${arch} \
|
|
--signprivate ${DEVKEYS}/kernel_data_key.vbprivk \
|
|
--keyblock ${DEVKEYS}/kernel.keyblock \
|
|
--version 2 \
|
|
--config ${TMP}.config2.txt \
|
|
--bootloader ${TMP}.bootloader2.bin
|
|
|
|
# verify the old way
|
|
${FUTILITY} vbutil_kernel --verify ${TMP}.blob3.${arch} \
|
|
--signpubkey ${DEVKEYS}/kernel_subkey.vbpubk
|
|
${FUTILITY} vbutil_kernel2 --verify ${TMP}.blob3.${arch} \
|
|
--signpubkey ${DEVKEYS}/kernel_subkey.vbpubk
|
|
|
|
# repack it the new way
|
|
${FUTILITY} vbutil_kernel2 \
|
|
--repack ${TMP}.blob4.${arch} \
|
|
--oldblob ${TMP}.blob2.${arch} \
|
|
--signprivate ${DEVKEYS}/kernel_data_key.vbprivk \
|
|
--keyblock ${DEVKEYS}/kernel.keyblock \
|
|
--version 2 \
|
|
--config ${TMP}.config2.txt \
|
|
--bootloader ${TMP}.bootloader2.bin
|
|
|
|
# they should be identical
|
|
cmp ${TMP}.blob3.${arch} ${TMP}.blob4.${arch}
|
|
|
|
# and now just the vblocks...
|
|
echo -n "${arch}.v " 1>&3
|
|
|
|
dd bs=${padding} count=1 if=${TMP}.blob1.${arch} of=${TMP}.blob1.${arch}.vb0
|
|
${FUTILITY} vbutil_kernel \
|
|
--pack ${TMP}.blob1.${arch}.vb1 \
|
|
--vblockonly \
|
|
--keyblock ${DEVKEYS}/recovery_kernel.keyblock \
|
|
--signprivate ${DEVKEYS}/recovery_kernel_data_key.vbprivk \
|
|
--version 1 \
|
|
--config ${TMP}.config.txt \
|
|
--bootloader ${TMP}.bootloader.bin \
|
|
--vmlinuz ${SCRIPTDIR}/data/vmlinuz-${arch}.bin \
|
|
--arch ${arch} \
|
|
--kloadaddr 0x11000
|
|
cmp ${TMP}.blob1.${arch}.vb0 ${TMP}.blob1.${arch}.vb1
|
|
|
|
dd bs=${padding} count=1 if=${TMP}.blob2.${arch} of=${TMP}.blob2.${arch}.vb0
|
|
${FUTILITY} vbutil_kernel2 \
|
|
--pack ${TMP}.blob2.${arch}.vb1 \
|
|
--vblockonly \
|
|
--keyblock ${DEVKEYS}/recovery_kernel.keyblock \
|
|
--signprivate ${DEVKEYS}/recovery_kernel_data_key.vbprivk \
|
|
--version 1 \
|
|
--config ${TMP}.config.txt \
|
|
--bootloader ${TMP}.bootloader.bin \
|
|
--vmlinuz ${SCRIPTDIR}/data/vmlinuz-${arch}.bin \
|
|
--arch ${arch} \
|
|
--kloadaddr 0x11000
|
|
cmp ${TMP}.blob2.${arch}.vb0 ${TMP}.blob2.${arch}.vb1
|
|
|
|
dd bs=${padding} count=1 if=${TMP}.blob3.${arch} of=${TMP}.blob3.${arch}.vb0
|
|
${FUTILITY} vbutil_kernel \
|
|
--repack ${TMP}.blob3.${arch}.vb1 \
|
|
--vblockonly \
|
|
--oldblob ${TMP}.blob1.${arch} \
|
|
--signprivate ${DEVKEYS}/kernel_data_key.vbprivk \
|
|
--keyblock ${DEVKEYS}/kernel.keyblock \
|
|
--version 2 \
|
|
--config ${TMP}.config2.txt \
|
|
--bootloader ${TMP}.bootloader2.bin
|
|
cmp ${TMP}.blob3.${arch}.vb0 ${TMP}.blob3.${arch}.vb1
|
|
|
|
dd bs=${padding} count=1 if=${TMP}.blob4.${arch} of=${TMP}.blob4.${arch}.vb0
|
|
${FUTILITY} vbutil_kernel2 \
|
|
--repack ${TMP}.blob4.${arch}.vb1 \
|
|
--vblockonly \
|
|
--oldblob ${TMP}.blob2.${arch} \
|
|
--signprivate ${DEVKEYS}/kernel_data_key.vbprivk \
|
|
--keyblock ${DEVKEYS}/kernel.keyblock \
|
|
--version 2 \
|
|
--config ${TMP}.config2.txt \
|
|
--bootloader ${TMP}.bootloader2.bin
|
|
cmp ${TMP}.blob4.${arch}.vb0 ${TMP}.blob4.${arch}.vb1
|
|
|
|
|
|
# Note: We specifically do not test repacking with a different --kloadaddr,
|
|
# because the old way has a bug and does not update params->cmd_line_ptr to
|
|
# point at the new on-disk location. Apparently (and not surprisingly), no
|
|
# one has ever done that.
|
|
|
|
#HEY # pack it up the new way
|
|
#HEY ${FUTILITY} sign --debug \
|
|
#HEY --vmlinuz ${SCRIPTDIR}/data/vmlinuz-${arch}.bin \
|
|
#HEY --config ${TMP}.config.txt \
|
|
#HEY --bootloader ${TMP}.bootloader.bin \
|
|
#HEY --arch ${arch} \
|
|
#HEY --keyblock ${DEVKEYS}/recovery_kernel.keyblock \
|
|
#HEY --signprivate ${DEVKEYS}/recovery_kernel_data_key.vbprivk \
|
|
#HEY --version 1 \
|
|
#HEY --outfile ${TMP}.blob2.${arch}
|
|
|
|
}
|
|
|
|
try_arch amd64
|
|
try_arch arm
|
|
|
|
# cleanup
|
|
rm -rf ${TMP}*
|
|
exit 0
|