diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2015-10-28 09:21:43 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-29 00:03:33 -0700 |
| commit | faa8c7f6223701613965a89123227676d142ca9e (patch) | |
| tree | 75dcab24c29c02db3b55718d0d116057866bd0e6 /scripts | |
| parent | 55484550bcedc2b70d84504ec59932f441988838 (diff) | |
| download | vboot-faa8c7f6223701613965a89123227676d142ca9e.tar.gz | |
sign_official_build: fix support for signing standalone accessories
My previous patch using futility to re-sign standalone accessory
firmware images had a mistake in the key directory path : fix it.
Also add RSA-2048 'accessory' keys for signer unit testing.
BRANCH=smaug, samus
BUG=chrome-os-partner:46635
TEST=run cros-signing unittests (./signing_unittests.py)
Change-Id: Ia2f641c85337c67f81968be4730643a6ad5f22cf
Reviewed-on: https://chromium-review.googlesource.com/309530
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index 145e92d3..aa3dc24e 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -882,11 +882,11 @@ elif [[ "${TYPE}" == "recovery_kernel" ]]; then elif [[ "${TYPE}" == "update_payload" ]]; then sign_update_payload ${INPUT_IMAGE} ${KEY_DIR} ${OUTPUT_IMAGE} elif [[ "${TYPE}" == "accessory_usbpd" ]]; then - KEY_NAME="key_$(basename $(dirname ${INPUT_IMAGE}))" + KEY_NAME="${KEY_DIR}/key_$(basename $(dirname ${INPUT_IMAGE}))" cp "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" futility sign --type usbpd1 --pem "${KEY_NAME}.pem" "${OUTPUT_IMAGE}" elif [[ "${TYPE}" == "accessory_rwsig" ]]; then - KEY_NAME="key_$(basename $(dirname ${INPUT_IMAGE}))" + KEY_NAME="${KEY_DIR}/key_$(basename $(dirname ${INPUT_IMAGE}))" cp "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" futility sign --type rwsig --prikey "${KEY_NAME}.vbprik2" "${OUTPUT_IMAGE}" else |