summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2016-08-31 23:25:28 +0800
committerchrome-bot <chrome-bot@chromium.org>2016-09-01 19:52:40 -0700
commitdf2bd9b1e74687dfc82a7bacc0b9a3c6162c0504 (patch)
tree4d6dc3474bd39b9bd0c4a89d369ef7daf5d4e389
parentb618e0ccf3a63ca9f4ab677d84f39378487dbf76 (diff)
downloadvboot-df2bd9b1e74687dfc82a7bacc0b9a3c6162c0504.tar.gz
tests: Remove dev_firmware.* keyblock and keys from devkey set.
The dev_firmware* was created for legacy devices having different RW firmware - A for devmode and B for normal, like Alex and ZGB. All other Chromebooks, including the CR48, were not doing that. Signer scripts relied on checking if RW A/B are equivalent to decide if they should select <dev_firmware* for A, firmware* for B> or <firmware* (normal) for both A and B>. This worked for a long time until Skylake family joined. Skylake FSP has some limitation that we have to execute code in-place, which leads to making RW A != B (due to addresses and offsets), and triggers signer to incorrectly use dev_firmware*. The production images are using keyset folders on signerbot, which only Alex/ZGB keyset folders have dev_firmware*; so the images for Skylake boards are signed correctly. But for people running firmware related tests using tests/devkey keyset, for example platform/dev/fm_and_key_version_test_prep.sh, having dev_firmware* in devkey may produce incorrect output. There is currently no easy way for signer scripts to figure out if the image should use dev_firmware or not except looking into keyset folder. Since Alex and ZGB are pretty old and no one plans to run key change tests anymore on them, the recommended solution is to remove dev_firmware.* from devkeys folder. BRANCH=none BUG=chrome-os-partner:52568 TEST=platform/dev/fm_and_key_version_test_prep.sh -b sentry -i \ /tmp/chromiumos_test_image.bin -f 8530.69.0 -s /tmp/image.bin -v \ Google_Sentry.7820.156.0 Change-Id: Ief37dd482875efc8e808460f3ad00041b5f3b3a2 Reviewed-on: https://chromium-review.googlesource.com/378661 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
-rw-r--r--tests/devkeys/dev_firmware.keyblockbin2232 -> 0 bytes
-rw-r--r--tests/devkeys/dev_firmware_data_key.vbprivkbin2356 -> 0 bytes
-rw-r--r--tests/devkeys/dev_firmware_data_key.vbpubkbin1064 -> 0 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/tests/devkeys/dev_firmware.keyblock b/tests/devkeys/dev_firmware.keyblock
deleted file mode 100644
index d0411acd..00000000
--- a/tests/devkeys/dev_firmware.keyblock
+++ /dev/null
Binary files differ
diff --git a/tests/devkeys/dev_firmware_data_key.vbprivk b/tests/devkeys/dev_firmware_data_key.vbprivk
deleted file mode 100644
index 1ef7dbdc..00000000
--- a/tests/devkeys/dev_firmware_data_key.vbprivk
+++ /dev/null
Binary files differ
diff --git a/tests/devkeys/dev_firmware_data_key.vbpubk b/tests/devkeys/dev_firmware_data_key.vbpubk
deleted file mode 100644
index 7bd17166..00000000
--- a/tests/devkeys/dev_firmware_data_key.vbpubk
+++ /dev/null
Binary files differ