diff options
| author | Mike Frysinger <vapier@chromium.org> | 2019-02-26 18:16:15 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2019-02-26 23:17:26 +0000 |
| commit | 348132bf4746058d87ec6d6c6cc7bd90c8ca3738 (patch) | |
| tree | 6380fad816c0b6c0d96e57b74d2bd80606d4ddc2 /scripts | |
| parent | c9a9d3c6fbf7dcc2eb76422988cecfbed076e47e (diff) | |
| download | vboot-348132bf4746058d87ec6d6c6cc7bd90c8ca3738.tar.gz | |
image_signing: fix thinko in payload signingstabilize-11839.Bstabilize-11839.3.Bstabilize-11839.1.B
There's already a local |output| variable that we clobbered.
BUG=chromium:935628
TEST=cros-signing/signer/signing_unittest.py passes
BRANCH=none
Change-Id: Idde2aa35053ff6bc149f3f4d1df784e25b4fcdc5
Reviewed-on: https://chromium-review.googlesource.com/c/1490651
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index 80ac6702..a5f3f867 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -468,7 +468,7 @@ sign_update_payload() { local image=$1 local key_dir=$2 local output=$3 - local key_size key_file="${key_dir}/update_key.pem" + local key_output key_size key_file="${key_dir}/update_key.pem" # Maps key size to verified boot's algorithm id (for pad_digest_utility). # Hashing algorithm is always SHA-256. local algo algos=( @@ -478,11 +478,11 @@ sign_update_payload() { [8192]=10 ) - output=$(futility show "${key_file}") - key_size=$(echo "${output}" | sed -n '/Key length/s/[^0-9]*//p') + key_output=$(futility show "${key_file}") + key_size=$(echo "${key_output}" | sed -n '/Key length/s/[^0-9]*//p') algo=${algos[${key_size}]} if [[ -z ${algo} ]]; then - die "Unknown algorithm: futility output=${output}" + die "Unknown algorithm: futility output=${key_output}" fi pad_digest_utility ${algo} "${image}" | \ |