commit aad0cfff9dea75a405a2ebff48c87b03cce43051
author Mike Frysinger <vapier@chromium.org> Thu Dec 13 16:25:48 2018 -0500
committer chrome-bot <chrome-bot@chromium.org> Sat Dec 15 02:18:44 2018 -0800
tree 53a4a4a919e28b3afdb6313d1e561e2ef300171c
parent f1810e1145a050150ddabe024b826e91aacc8277

image_signing: fix breakage from dropping <R16 support

Commit 16ceb9625ed13b0da4ae6306f9187b672b9b382f dropped support for old
versions, but it also accidentally dropped the salt= setting which ended
up breaking newer recovery kernels.  Restore that line and drop an unused
var from the old code path.

BRANCH=None
BUG=chromium:891015, chromium:891764
TEST=running `./sign_official_build.sh verify` against the images in crbug.com/891764 works again

Change-Id: I8ae619c9243f9c2638962ae439b9df5090d6c535
Reviewed-on: https://chromium-review.googlesource.com/1376831
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>

scripts/image_signing/sign_official_build.sh

diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh
index 8db3ead..726a554 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -179,10 +179,10 @@
 
   # Extract the key-value parameters from the kernel command line.
   local rootfs_sectors=$(get_verity_arg "${vroot_dev}" hashstart)
-  local verity_depth=0
   local verity_algorithm=$(get_verity_arg "${vroot_dev}" alg)
   local root_dev=$(get_verity_arg "${vroot_dev}" payload)
   local hash_dev=$(get_verity_arg "${vroot_dev}" hashtree)
+  local salt=$(get_verity_arg "${vroot_dev}" salt)
 
   local salt_arg
   if [ -n "$salt" ]; then