diff options
| author | Victor Hsieh <victorhsieh@chromium.org> | 2016-09-22 20:09:01 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-26 11:59:22 -0700 |
| commit | 31cf713244380d927b29bde7eb20f876e2bea580 (patch) | |
| tree | 42523cd2358898d7eda8e520aea55ecdeafd3e8a | |
| parent | 10d5cfe461fe2ef927b5aa0dd34aa39a3d913f3c (diff) | |
| download | vboot-31cf713244380d927b29bde7eb20f876e2bea580.tar.gz | |
Revert "Change debug key signatures"
The lab use test image (non-signed) to run CTS, so we still need to switch key to make a test pass (which blacklist Google's dev key).
This reverts commit b94145a309131f23d49a08dd94fc26247621da65.
TEST=None
BUG=b:29915721,b:31373710
Change-Id: I0873d13b606f3e49b9d055e9dd081d3dacd97c65
Reviewed-on: https://chromium-review.googlesource.com/388636
Commit-Ready: Victor Hsieh <victorhsieh@chromium.org>
Tested-by: Victor Hsieh <victorhsieh@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_android_image.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh index a5602322..d81556dc 100755 --- a/scripts/image_signing/sign_android_image.sh +++ b/scripts/image_signing/sign_android_image.sh @@ -40,25 +40,19 @@ choose_key() { keytool -printcert | awk '/^\s*SHA1:/ {print $2}') # Fingerprints below are generated by: - # $ keytool -file vendor/google/certs/devkeys/$NAME.x509.pem -printcert \ + # $ keytool -file vendor/google/certs/cheetskeys/$NAME.x509.pem -printcert \ # | grep SHA1: - # TODO(victorhsieh): deprecate the first part of the fingerprint when no - # release branches have system.raw.img built before Sep. 8, 2016. case "${sha1}" in - "AA:04:E0:5F:82:9C:7E:D1:B9:F8:FC:99:6C:5A:54:43:83:D9:F5:BC"| \ - "CD:21:AB:22:D1:D1:B6:38:8A:AC:EA:A5:2B:82:BE:3F:A4:E6:0C:58") + "AA:04:E0:5F:82:9C:7E:D1:B9:F8:FC:99:6C:5A:54:43:83:D9:F5:BC") echo "platform" ;; - "D4:C4:2D:E0:B9:1B:15:72:FA:7D:A7:21:E0:A6:09:94:B4:4C:B5:AE"| \ - "60:C6:D1:64:36:D3:C8:62:22:BB:95:2E:8D:D3:A8:40:D9:AD:8D:7A") + "D4:C4:2D:E0:B9:1B:15:72:FA:7D:A7:21:E0:A6:09:94:B4:4C:B5:AE") echo "media" ;; - "38:B6:2C:E1:75:98:E3:E1:1C:CC:F6:6B:83:BB:97:0E:2D:40:6C:AE"| \ - "E3:9B:7B:FB:E0:A6:7D:78:29:2F:6C:C6:2E:06:CA:27:A2:EB:F2:55") + "38:B6:2C:E1:75:98:E3:E1:1C:CC:F6:6B:83:BB:97:0E:2D:40:6C:AE") echo "shared" ;; - "EC:63:36:20:23:B7:CB:66:18:70:D3:39:3C:A9:AE:7E:EF:A9:32:42"| \ - "40:73:90:92:BD:52:D4:4C:C5:DE:96:A7:08:C1:38:5B:FE:3B:12:16") + "EC:63:36:20:23:B7:CB:66:18:70:D3:39:3C:A9:AE:7E:EF:A9:32:42") # The above fingerprint is from devkey. Translate to releasekey. echo "releasekey" ;; |