image_signing: support loem keysets with firmware shellballs

With an loem keyset in a recovery shellball, we don't want to write the
rootkeys & vblocks to the firmware image directly.  Instead, we'll put
them into a keyset subdir that the firmware updater will process later.

bios.bin
keyset/
  rootkey.LOEMID
  vblock_A.LOEMID
  vblock_B.LOEMID

We still write the recovery key to the firmware image though as that is
shared between all the keysets.

BUG=chromium:381862
TEST=Ran against a recovery image with devkeys & loemkeys and checked shellball
TEST=`cbuildbot daisy-release` works
BRANCH=none

Change-Id: I6fc99c71e6c7dee25f7f9a466a97314ff750fda9
Reviewed-on: https://chromium-review.googlesource.com/203682
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

36 files changed, 38 insertions, 0 deletions

diff --git a/tests/loemkeys/README b/tests/loemkeys/README
new file mode 100644
index 00000000..58b3bc8a
--- /dev/null
+++ b/tests/loemkeys/README
@@ -0,0 +1 @@
+These are devkeys, but with filename tweaks for testing loem keysets.
diff --git a/tests/loemkeys/firmware.loem1.keyblock b/tests/loemkeys/firmware.loem1.keyblock
new file mode 120000
index 00000000..0d6087df
--- /dev/null
+++ b/tests/loemkeys/firmware.loem1.keyblock
@@ -0,0 +1 @@
+../devkeys/firmware.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/firmware.loem2.keyblock b/tests/loemkeys/firmware.loem2.keyblock
new file mode 120000
index 00000000..0d6087df
--- /dev/null
+++ b/tests/loemkeys/firmware.loem2.keyblock
@@ -0,0 +1 @@
+../devkeys/firmware.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/firmware.loem3.keyblock b/tests/loemkeys/firmware.loem3.keyblock
new file mode 120000
index 00000000..0d6087df
--- /dev/null
+++ b/tests/loemkeys/firmware.loem3.keyblock
@@ -0,0 +1 @@
+../devkeys/firmware.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/firmware.loem4.keyblock b/tests/loemkeys/firmware.loem4.keyblock
new file mode 120000
index 00000000..0d6087df
--- /dev/null
+++ b/tests/loemkeys/firmware.loem4.keyblock
@@ -0,0 +1 @@
+../devkeys/firmware.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem1.vbprivk b/tests/loemkeys/firmware_data_key.loem1.vbprivk
new file mode 120000
index 00000000..d361c316
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem1.vbprivk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem1.vbpubk b/tests/loemkeys/firmware_data_key.loem1.vbpubk
new file mode 120000
index 00000000..013e040f
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem1.vbpubk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem2.vbprivk b/tests/loemkeys/firmware_data_key.loem2.vbprivk
new file mode 120000
index 00000000..d361c316
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem2.vbprivk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem2.vbpubk b/tests/loemkeys/firmware_data_key.loem2.vbpubk
new file mode 120000
index 00000000..013e040f
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem2.vbpubk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem3.vbprivk b/tests/loemkeys/firmware_data_key.loem3.vbprivk
new file mode 120000
index 00000000..d361c316
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem3.vbprivk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem3.vbpubk b/tests/loemkeys/firmware_data_key.loem3.vbpubk
new file mode 120000
index 00000000..013e040f
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem3.vbpubk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem4.vbprivk b/tests/loemkeys/firmware_data_key.loem4.vbprivk
new file mode 120000
index 00000000..d361c316
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem4.vbprivk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/firmware_data_key.loem4.vbpubk b/tests/loemkeys/firmware_data_key.loem4.vbpubk
new file mode 120000
index 00000000..013e040f
--- /dev/null
+++ b/tests/loemkeys/firmware_data_key.loem4.vbpubk
@@ -0,0 +1 @@
+../devkeys/firmware_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/installer_kernel.keyblock b/tests/loemkeys/installer_kernel.keyblock
new file mode 120000
index 00000000..32e5e92d
--- /dev/null
+++ b/tests/loemkeys/installer_kernel.keyblock
@@ -0,0 +1 @@
+../devkeys/installer_kernel.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/installer_kernel_data_key.vbprivk b/tests/loemkeys/installer_kernel_data_key.vbprivk
new file mode 120000
index 00000000..3581b5e5
--- /dev/null
+++ b/tests/loemkeys/installer_kernel_data_key.vbprivk
@@ -0,0 +1 @@
+../devkeys/installer_kernel_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/installer_kernel_data_key.vbpubk b/tests/loemkeys/installer_kernel_data_key.vbpubk
new file mode 120000
index 00000000..2b684128
--- /dev/null
+++ b/tests/loemkeys/installer_kernel_data_key.vbpubk
@@ -0,0 +1 @@
+../devkeys/installer_kernel_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/kernel.keyblock b/tests/loemkeys/kernel.keyblock
new file mode 120000
index 00000000..27352c7b
--- /dev/null
+++ b/tests/loemkeys/kernel.keyblock
@@ -0,0 +1 @@
+../devkeys/kernel.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/kernel_data_key.vbprivk b/tests/loemkeys/kernel_data_key.vbprivk
new file mode 120000
index 00000000..39a35a7e
--- /dev/null
+++ b/tests/loemkeys/kernel_data_key.vbprivk
@@ -0,0 +1 @@
+../devkeys/kernel_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/kernel_data_key.vbpubk b/tests/loemkeys/kernel_data_key.vbpubk
new file mode 120000
index 00000000..19865269
--- /dev/null
+++ b/tests/loemkeys/kernel_data_key.vbpubk
@@ -0,0 +1 @@
+../devkeys/kernel_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/kernel_subkey.vbprivk b/tests/loemkeys/kernel_subkey.vbprivk
new file mode 120000
index 00000000..5fa82c81
--- /dev/null
+++ b/tests/loemkeys/kernel_subkey.vbprivk
@@ -0,0 +1 @@
+../devkeys/kernel_subkey.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/kernel_subkey.vbpubk b/tests/loemkeys/kernel_subkey.vbpubk
new file mode 120000
index 00000000..b0cf2f14
--- /dev/null
+++ b/tests/loemkeys/kernel_subkey.vbpubk
@@ -0,0 +1 @@
+../devkeys/kernel_subkey.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/key.versions b/tests/loemkeys/key.versions
new file mode 120000
index 00000000..db9cdbd1
--- /dev/null
+++ b/tests/loemkeys/key.versions
@@ -0,0 +1 @@
+../devkeys/key.versions
\ No newline at end of file
diff --git a/tests/loemkeys/loem.ini b/tests/loemkeys/loem.ini
new file mode 100644
index 00000000..8501f0c1
--- /dev/null
+++ b/tests/loemkeys/loem.ini
@@ -0,0 +1,3 @@
+[loem]
+1 = ACME
+2 = SHINRA
diff --git a/tests/loemkeys/recovery_kernel.keyblock b/tests/loemkeys/recovery_kernel.keyblock
new file mode 120000
index 00000000..ad3fd6e6
--- /dev/null
+++ b/tests/loemkeys/recovery_kernel.keyblock
@@ -0,0 +1 @@
+../devkeys/recovery_kernel.keyblock
\ No newline at end of file
diff --git a/tests/loemkeys/recovery_kernel_data_key.vbprivk b/tests/loemkeys/recovery_kernel_data_key.vbprivk
new file mode 120000
index 00000000..b47a51bf
--- /dev/null
+++ b/tests/loemkeys/recovery_kernel_data_key.vbprivk
@@ -0,0 +1 @@
+../devkeys/recovery_kernel_data_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/recovery_kernel_data_key.vbpubk b/tests/loemkeys/recovery_kernel_data_key.vbpubk
new file mode 120000
index 00000000..395583b6
--- /dev/null
+++ b/tests/loemkeys/recovery_kernel_data_key.vbpubk
@@ -0,0 +1 @@
+../devkeys/recovery_kernel_data_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/recovery_key.vbprivk b/tests/loemkeys/recovery_key.vbprivk
new file mode 120000
index 00000000..9a7733b9
--- /dev/null
+++ b/tests/loemkeys/recovery_key.vbprivk
@@ -0,0 +1 @@
+../devkeys/recovery_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/recovery_key.vbpubk b/tests/loemkeys/recovery_key.vbpubk
new file mode 120000
index 00000000..1ea4a982
--- /dev/null
+++ b/tests/loemkeys/recovery_key.vbpubk
@@ -0,0 +1 @@
+../devkeys/recovery_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem1.vbprivk b/tests/loemkeys/root_key.loem1.vbprivk
new file mode 120000
index 00000000..d032898a
--- /dev/null
+++ b/tests/loemkeys/root_key.loem1.vbprivk
@@ -0,0 +1 @@
+../devkeys/root_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem1.vbpubk b/tests/loemkeys/root_key.loem1.vbpubk
new file mode 120000
index 00000000..7a61f84c
--- /dev/null
+++ b/tests/loemkeys/root_key.loem1.vbpubk
@@ -0,0 +1 @@
+../devkeys/root_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem2.vbprivk b/tests/loemkeys/root_key.loem2.vbprivk
new file mode 120000
index 00000000..d032898a
--- /dev/null
+++ b/tests/loemkeys/root_key.loem2.vbprivk
@@ -0,0 +1 @@
+../devkeys/root_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem2.vbpubk b/tests/loemkeys/root_key.loem2.vbpubk
new file mode 120000
index 00000000..7a61f84c
--- /dev/null
+++ b/tests/loemkeys/root_key.loem2.vbpubk
@@ -0,0 +1 @@
+../devkeys/root_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem3.vbprivk b/tests/loemkeys/root_key.loem3.vbprivk
new file mode 120000
index 00000000..d032898a
--- /dev/null
+++ b/tests/loemkeys/root_key.loem3.vbprivk
@@ -0,0 +1 @@
+../devkeys/root_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem3.vbpubk b/tests/loemkeys/root_key.loem3.vbpubk
new file mode 120000
index 00000000..7a61f84c
--- /dev/null
+++ b/tests/loemkeys/root_key.loem3.vbpubk
@@ -0,0 +1 @@
+../devkeys/root_key.vbpubk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem4.vbprivk b/tests/loemkeys/root_key.loem4.vbprivk
new file mode 120000
index 00000000..d032898a
--- /dev/null
+++ b/tests/loemkeys/root_key.loem4.vbprivk
@@ -0,0 +1 @@
+../devkeys/root_key.vbprivk
\ No newline at end of file
diff --git a/tests/loemkeys/root_key.loem4.vbpubk b/tests/loemkeys/root_key.loem4.vbpubk
new file mode 120000
index 00000000..7a61f84c
--- /dev/null
+++ b/tests/loemkeys/root_key.loem4.vbpubk
@@ -0,0 +1 @@
+../devkeys/root_key.vbpubk
\ No newline at end of file