commit f8016c2b4aaaba55a19f74d48edd23c95910c930
author Benjamin Shai <bshai@google.com> Tue Jan 16 17:49:40 2024 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 17 03:09:55 2024 +0000
tree 95a71b8210b960e667cfb8f58ec2f60e3f624e9f
parent 3d37d2aafe1f941c532def2a1fbbb58c8dd84182

make_keyblock: change to parsing key prefix

Instead of requiring an arg, just check if the private key starts with
"remote:" to detect omitting the extension.

BUG=b:318522770
BRANCH=None
TEST=[None|unit-test|led-launch]

Change-Id: I55f04e25a43b2e9fe3ddf3951e48b29a6fe26d49
Signed-off-by: Benjamin Shai <bshai@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5201825
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Julius Werner <jwerner@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

scripts/keygeneration/common.sh

diff --git a/scripts/keygeneration/common.sh b/scripts/keygeneration/common.sh
index 8116b76..b8ddde7 100644
--- a/scripts/keygeneration/common.sh
+++ b/scripts/keygeneration/common.sh
@@ -152,10 +152,9 @@
   local flags=$2
   local pubkey=$3
   local signkey=$4
-  local excl_extn=$5
 
   local privkey="${signkey}"
-  if [[-z "${excl_extn}" ]]; then
+  if [[ "${signkey}" != "remote:"* ]]; then
     privkey="${signkey}.vbprivk"
   fi