summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2011-02-24 11:05:34 -0800
committerRandall Spangler <rspangler@chromium.org>2011-02-24 11:05:34 -0800
commitefa40aa21da738b8f48e8b013e9c04b7724ccb45 (patch)
treea26744577c6aaaece622302094d46b66e2ec4ea2
parente77bec95d57ad8937e005ec7ebf183c925e656d9 (diff)
downloadvboot-efa40aa21da738b8f48e8b013e9c04b7724ccb45.tar.gz
Add dev firmware key to devkeys.
The existing keys are kept the same, so that old dev kernels and firmware remain compatible with new kernels and firmware. Change-Id: I4177d1868904a477d79b9f2e6de88ed756ed57b4 BUG=chrome-os-partner:2218 TEST=manual: Build firmware with new keys. Boot with dev switch on. Run 'crossystem mainfw_act mainfw_type'. Should see "A developer" Boot with dev switch off. Run 'crossystem mainfw_act mainfw_type'. Should see "B normal" Review URL: http://codereview.chromium.org/6580035
-rwxr-xr-xtests/devkeys/create_new_keys.sh4
-rw-r--r--tests/devkeys/dev_firmware.keyblockbin0 -> 2232 bytes
-rw-r--r--tests/devkeys/dev_firmware_data_key.vbprivkbin0 -> 2356 bytes
-rw-r--r--tests/devkeys/dev_firmware_data_key.vbpubkbin0 -> 1064 bytes
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/devkeys/create_new_keys.sh b/tests/devkeys/create_new_keys.sh
index 625fbc6c..311d9243 100755
--- a/tests/devkeys/create_new_keys.sh
+++ b/tests/devkeys/create_new_keys.sh
@@ -94,6 +94,7 @@ function make_keyblock {
# Create the normal keypairs
make_pair root_key 11
make_pair firmware_data_key 7
+make_pair dev_firmware_data_key 7
make_pair kernel_subkey 7
make_pair kernel_data_key 4
@@ -106,6 +107,9 @@ make_pair installer_kernel_data_key 11
# since it's never even checked during Recovery mode.
make_keyblock firmware 7 firmware_data_key root_key
+# Create the dev firmware keyblock for use only in Developer mode.
+make_keyblock dev_firmware 6 dev_firmware_data_key root_key
+
# Create the recovery kernel keyblock for use only in Recovery mode.
make_keyblock recovery_kernel 11 recovery_kernel_data_key recovery_key
diff --git a/tests/devkeys/dev_firmware.keyblock b/tests/devkeys/dev_firmware.keyblock
new file mode 100644
index 00000000..d0411acd
--- /dev/null
+++ b/tests/devkeys/dev_firmware.keyblock
Binary files differ
diff --git a/tests/devkeys/dev_firmware_data_key.vbprivk b/tests/devkeys/dev_firmware_data_key.vbprivk
new file mode 100644
index 00000000..1ef7dbdc
--- /dev/null
+++ b/tests/devkeys/dev_firmware_data_key.vbprivk
Binary files differ
diff --git a/tests/devkeys/dev_firmware_data_key.vbpubk b/tests/devkeys/dev_firmware_data_key.vbpubk
new file mode 100644
index 00000000..7bd17166
--- /dev/null
+++ b/tests/devkeys/dev_firmware_data_key.vbpubk
Binary files differ