diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-05-02 23:42:08 -0400 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-05-04 06:07:01 -0700 |
| commit | febef2af40e1d6ede0567277620aa8a6d8101789 (patch) | |
| tree | 4e0e8e7c12b6657dbde60b9c980972f57b6710e8 | |
| parent | 1919b169bfb6739db8b31509fd0d6c22427bdadf (diff) | |
| download | vboot-febef2af40e1d6ede0567277620aa8a6d8101789.tar.gz | |
image_signing: fix signing of zip/crx files
Restore the search logic for manifests in subdirs.
BRANCH=None
BUG=chromium:697645
TEST=signed adb/fastboot zip archives
Change-Id: I07a417216ea463cb00d6ead7cd3b61d6e6fa507d
Reviewed-on: https://chromium-review.googlesource.com/494207
Commit-Ready: Hsinyu Chao <hychao@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_oci_container.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/image_signing/sign_oci_container.sh b/scripts/image_signing/sign_oci_container.sh index 14ca3af8..793e5f80 100755 --- a/scripts/image_signing/sign_oci_container.sh +++ b/scripts/image_signing/sign_oci_container.sh @@ -38,16 +38,16 @@ sign_oci_container() { rsync -a "${input}/" "${output}/" fi - local out_manifest="${output}/imageloader.sig.2" - local manifest="${input}/imageloader.json" - if [[ ! -f "${manifest}" ]]; then - die "Could not find manifest" - fi - info "Signing: ${manifest}" - if ! openssl dgst -sha256 -sign "${key_file}" \ - -out "${out_manifest}" "${manifest}"; then - die "Failed to sign" - fi + local manifest out_manifest + while read -d $'\0' -r manifest; do + out_manifest="${output}/${manifest%.json}.sig.2" + manifest="${input}/${manifest}" + info "Signing: ${manifest}" + if ! openssl dgst -sha256 -sign "${key_file}" \ + -out "${out_manifest}" "${manifest}"; then + die "Failed to sign" + fi + done < <(find "${input}/" -name imageloader.json -printf '%P\0') } # Sign the crx/zip holding OCI container(s). We look for an imageloader.json |