From 28f43363b414e86a188ff27378710078fd9fc9cc Mon Sep 17 00:00:00 2001 From: David Riley Date: Tue, 8 Sep 2015 13:05:56 -0700 Subject: signer: create devkeys with and without pkc Signing test of firmware for non-t210 targets fails when PKC keys are present so separate devkeys into two keysets where only one has the PKC key. BUG=chrome-os-partner:44227 TEST=sign_official_build.sh nv_lp0_firmware tegra_lp0_resume.fw tests/devkeys-pkc tegra_lp0_resume.fw.signed versions.default BRANCH=signer Change-Id: Ie0670638d30d17692f1113b5a9f0309ea610d72a Signed-off-by: David Riley Reviewed-on: https://chromium-review.googlesource.com/298091 Reviewed-by: Mike Frysinger --- tests/devkeys-pkc/dev_firmware.keyblock | Bin 0 -> 2232 bytes tests/devkeys-pkc/dev_firmware_data_key.vbprivk | Bin 0 -> 2356 bytes tests/devkeys-pkc/dev_firmware_data_key.vbpubk | Bin 0 -> 1064 bytes tests/devkeys-pkc/ec.keyblock | Bin 0 -> 1720 bytes tests/devkeys-pkc/ec_data_key.vbprivk | Bin 0 -> 2355 bytes tests/devkeys-pkc/ec_data_key.vbpubk | Bin 0 -> 1064 bytes tests/devkeys-pkc/ec_root_key.vbprivk | Bin 0 -> 2356 bytes tests/devkeys-pkc/ec_root_key.vbpubk | Bin 0 -> 1064 bytes tests/devkeys-pkc/firmware.keyblock | Bin 0 -> 2232 bytes tests/devkeys-pkc/firmware_bmpfv.bin | Bin 0 -> 253568 bytes tests/devkeys-pkc/firmware_data_key.vbprivk | Bin 0 -> 2354 bytes tests/devkeys-pkc/firmware_data_key.vbpubk | Bin 0 -> 1064 bytes tests/devkeys-pkc/installer_kernel.keyblock | Bin 0 -> 3256 bytes .../devkeys-pkc/installer_kernel_data_key.vbprivk | Bin 0 -> 4660 bytes tests/devkeys-pkc/installer_kernel_data_key.vbpubk | Bin 0 -> 2088 bytes tests/devkeys-pkc/kernel.keyblock | Bin 0 -> 1208 bytes tests/devkeys-pkc/kernel_data_key.vbprivk | Bin 0 -> 1199 bytes tests/devkeys-pkc/kernel_data_key.vbpubk | Bin 0 -> 552 bytes tests/devkeys-pkc/kernel_subkey.vbprivk | Bin 0 -> 2357 bytes tests/devkeys-pkc/kernel_subkey.vbpubk | Bin 0 -> 1064 bytes tests/devkeys-pkc/key.versions | 4 +++ tests/devkeys-pkc/nv_pkc.pem | 27 +++++++++++++++++++++ tests/devkeys-pkc/recovery_kernel.keyblock | Bin 0 -> 3256 bytes tests/devkeys-pkc/recovery_kernel_data_key.vbprivk | Bin 0 -> 4660 bytes tests/devkeys-pkc/recovery_kernel_data_key.vbpubk | Bin 0 -> 2088 bytes tests/devkeys-pkc/recovery_key.vbprivk | Bin 0 -> 4660 bytes tests/devkeys-pkc/recovery_key.vbpubk | Bin 0 -> 2088 bytes tests/devkeys-pkc/root_key.vbprivk | Bin 0 -> 4660 bytes tests/devkeys-pkc/root_key.vbpubk | Bin 0 -> 2088 bytes tests/devkeys/nv_pkc.pem | 27 --------------------- 30 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 tests/devkeys-pkc/dev_firmware.keyblock create mode 100644 tests/devkeys-pkc/dev_firmware_data_key.vbprivk create mode 100644 tests/devkeys-pkc/dev_firmware_data_key.vbpubk create mode 100644 tests/devkeys-pkc/ec.keyblock create mode 100644 tests/devkeys-pkc/ec_data_key.vbprivk create mode 100644 tests/devkeys-pkc/ec_data_key.vbpubk create mode 100644 tests/devkeys-pkc/ec_root_key.vbprivk create mode 100644 tests/devkeys-pkc/ec_root_key.vbpubk create mode 100644 tests/devkeys-pkc/firmware.keyblock create mode 100644 tests/devkeys-pkc/firmware_bmpfv.bin create mode 100644 tests/devkeys-pkc/firmware_data_key.vbprivk create mode 100644 tests/devkeys-pkc/firmware_data_key.vbpubk create mode 100644 tests/devkeys-pkc/installer_kernel.keyblock create mode 100644 tests/devkeys-pkc/installer_kernel_data_key.vbprivk create mode 100644 tests/devkeys-pkc/installer_kernel_data_key.vbpubk create mode 100644 tests/devkeys-pkc/kernel.keyblock create mode 100644 tests/devkeys-pkc/kernel_data_key.vbprivk create mode 100644 tests/devkeys-pkc/kernel_data_key.vbpubk create mode 100644 tests/devkeys-pkc/kernel_subkey.vbprivk create mode 100644 tests/devkeys-pkc/kernel_subkey.vbpubk create mode 100644 tests/devkeys-pkc/key.versions create mode 100644 tests/devkeys-pkc/nv_pkc.pem create mode 100644 tests/devkeys-pkc/recovery_kernel.keyblock create mode 100644 tests/devkeys-pkc/recovery_kernel_data_key.vbprivk create mode 100644 tests/devkeys-pkc/recovery_kernel_data_key.vbpubk create mode 100644 tests/devkeys-pkc/recovery_key.vbprivk create mode 100644 tests/devkeys-pkc/recovery_key.vbpubk create mode 100644 tests/devkeys-pkc/root_key.vbprivk create mode 100644 tests/devkeys-pkc/root_key.vbpubk delete mode 100644 tests/devkeys/nv_pkc.pem diff --git a/tests/devkeys-pkc/dev_firmware.keyblock b/tests/devkeys-pkc/dev_firmware.keyblock new file mode 100644 index 00000000..d0411acd Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware.keyblock differ diff --git a/tests/devkeys-pkc/dev_firmware_data_key.vbprivk b/tests/devkeys-pkc/dev_firmware_data_key.vbprivk new file mode 100644 index 00000000..1ef7dbdc Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/dev_firmware_data_key.vbpubk b/tests/devkeys-pkc/dev_firmware_data_key.vbpubk new file mode 100644 index 00000000..7bd17166 Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/ec.keyblock b/tests/devkeys-pkc/ec.keyblock new file mode 100644 index 00000000..6b088f32 Binary files /dev/null and b/tests/devkeys-pkc/ec.keyblock differ diff --git a/tests/devkeys-pkc/ec_data_key.vbprivk b/tests/devkeys-pkc/ec_data_key.vbprivk new file mode 100644 index 00000000..9f194ce9 Binary files /dev/null and b/tests/devkeys-pkc/ec_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/ec_data_key.vbpubk b/tests/devkeys-pkc/ec_data_key.vbpubk new file mode 100644 index 00000000..5804dfd6 Binary files /dev/null and b/tests/devkeys-pkc/ec_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/ec_root_key.vbprivk b/tests/devkeys-pkc/ec_root_key.vbprivk new file mode 100644 index 00000000..49144720 Binary files /dev/null and b/tests/devkeys-pkc/ec_root_key.vbprivk differ diff --git a/tests/devkeys-pkc/ec_root_key.vbpubk b/tests/devkeys-pkc/ec_root_key.vbpubk new file mode 100644 index 00000000..76c26f94 Binary files /dev/null and b/tests/devkeys-pkc/ec_root_key.vbpubk differ diff --git a/tests/devkeys-pkc/firmware.keyblock b/tests/devkeys-pkc/firmware.keyblock new file mode 100644 index 00000000..1e2273e5 Binary files /dev/null and b/tests/devkeys-pkc/firmware.keyblock differ diff --git a/tests/devkeys-pkc/firmware_bmpfv.bin b/tests/devkeys-pkc/firmware_bmpfv.bin new file mode 100644 index 00000000..3e9af976 Binary files /dev/null and b/tests/devkeys-pkc/firmware_bmpfv.bin differ diff --git a/tests/devkeys-pkc/firmware_data_key.vbprivk b/tests/devkeys-pkc/firmware_data_key.vbprivk new file mode 100644 index 00000000..49e57513 Binary files /dev/null and b/tests/devkeys-pkc/firmware_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/firmware_data_key.vbpubk b/tests/devkeys-pkc/firmware_data_key.vbpubk new file mode 100644 index 00000000..804d566c Binary files /dev/null and b/tests/devkeys-pkc/firmware_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/installer_kernel.keyblock b/tests/devkeys-pkc/installer_kernel.keyblock new file mode 100644 index 00000000..cfa3bd18 Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel.keyblock differ diff --git a/tests/devkeys-pkc/installer_kernel_data_key.vbprivk b/tests/devkeys-pkc/installer_kernel_data_key.vbprivk new file mode 100644 index 00000000..03795952 Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/installer_kernel_data_key.vbpubk b/tests/devkeys-pkc/installer_kernel_data_key.vbpubk new file mode 100644 index 00000000..3e9e67c5 Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/kernel.keyblock b/tests/devkeys-pkc/kernel.keyblock new file mode 100644 index 00000000..9740be4e Binary files /dev/null and b/tests/devkeys-pkc/kernel.keyblock differ diff --git a/tests/devkeys-pkc/kernel_data_key.vbprivk b/tests/devkeys-pkc/kernel_data_key.vbprivk new file mode 100644 index 00000000..8d392fb2 Binary files /dev/null and b/tests/devkeys-pkc/kernel_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/kernel_data_key.vbpubk b/tests/devkeys-pkc/kernel_data_key.vbpubk new file mode 100644 index 00000000..80910b77 Binary files /dev/null and b/tests/devkeys-pkc/kernel_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/kernel_subkey.vbprivk b/tests/devkeys-pkc/kernel_subkey.vbprivk new file mode 100644 index 00000000..195b1bf5 Binary files /dev/null and b/tests/devkeys-pkc/kernel_subkey.vbprivk differ diff --git a/tests/devkeys-pkc/kernel_subkey.vbpubk b/tests/devkeys-pkc/kernel_subkey.vbpubk new file mode 100644 index 00000000..a24a036d Binary files /dev/null and b/tests/devkeys-pkc/kernel_subkey.vbpubk differ diff --git a/tests/devkeys-pkc/key.versions b/tests/devkeys-pkc/key.versions new file mode 100644 index 00000000..59d8748e --- /dev/null +++ b/tests/devkeys-pkc/key.versions @@ -0,0 +1,4 @@ +firmware_key_version=1 +firmware_version=1 +kernel_key_version=1 +kernel_version=1 diff --git a/tests/devkeys-pkc/nv_pkc.pem b/tests/devkeys-pkc/nv_pkc.pem new file mode 100644 index 00000000..cbafc03b --- /dev/null +++ b/tests/devkeys-pkc/nv_pkc.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAs3Lf87UkomlfVHdw/FEz+owzgO+ZFu6/72qT+jSu7aEDZeZj +l2cgTQOnHjlmBYj6KoqwXQmY6ZWPNBT7xDqzGdvimCVRC3OGRee2uD+Itu/Qwo1F +FOb7v+l3v6lODGqDJ06aIxLicEiqK55dk5z+7dP8yyJ3pRhwiDPE4tNtlLOWgmJ/ +hENyqBHbMMzg67Qwb+aa89wfq2FRrvGOpfmrKlhqtikDnwJALBfkr7hsZGZOszHC +ii2L5T3eCaI/me2/VIGlQSjGxmaDkiG/aIZVTuIX/LuOyi4sLXJ9cIFQ7Ty/0PAk +6Ia6VyEGETQt6+JeLETX4Zc+XCnfbE/Flhs5PwIDAQABAoIBAQCMcmM/Xc4PY0Ne +W6FNicyR0vtYda4u2avVGWg50tP6XiPHtDrMO8V3IV3B9RCZUmzhsOx51NIeN5T+ +IVIvcfXNTmCZzdMRkFhODB3hNLCu5SFRs7mWs3Xj7TlxA3R3mUGPGSDgRJ5/XQ/6 +1ZbNunl38IuQ/SgBShCBOWtmUC4ay+ctm1CzBZ/7AYlauOxdoKiU2nzlwpMrX9+C +vaVKRQVYbE7EYJsWKOx6vRPU5Kjoq6StlSW4caG0ReRu9tO+xL7kZnqp1BWl3KHw +OfzLy1CmwDkV3bKFclRWWPR97nN7F95SUFIJ3bOVjU/K2TKuLtMYPPVdG4CBBeB5 +eK2Qae7ZAoGBAOprwiAvcRNWJ2W5JoCkh0L6AHXx2z+S1Bbt0laz4NyqyfPX2SMl +DJRxm/IoYRfwZf7fussI1bG7g4UP8HjfrlAzSEWVgPNMSWftOFzkv4QNr2ySjk0/ +nZRsd+zj2kxhc8ukDhiORkyEEg5gtsEUqbtdZHOiqtkNbKOPD6EGKeP7AoGBAMP3 +q5NUh9pJ2RGSkdKutloXNe0HPI6sjsCX3HHWAaFyqBtXWvRU3fIaMUpGQcPaqDCt +LhzVoNlPXdeQ7vTkBPtiYQBcs0NPI+58pnD5fgR00yTX/5ZIGKbX0NnpZ3spsQAQ +FQTXGy80+JyGMmJCDf32VGC96I9Ey5w49U23kXiNAoGAGEtiqwM/rMlY++ncW6ix +e/d85LxUBJqq8FVlXyb1PulUVLkh/8pvK1M63jXhGiIH8Aovyar4upq8XqXwPhaw +cg9ehhegbZaSZProxHfQgVcJvy7RIKBfLGqxYxOaJCBVZ91wuIrGLlfhpyvOxOPn +U0uyhWluW2BQygKhlAaXgNECgYAKDAif5RWR+3dFj14qjwqKU+ZP4K8aIX6wIRkM +PQyYWmiD/laLcE5wuycLx85XXD6DQF283LcCbS9CfgvCQm5+9OxEOHx4VvZgo8Nk +x2XOlK6+lNRlwAyDgU0T3wOPLPQGLMznEqAyK2UToU2z++77tkVdMF9b+Qr3V3Q8 +J80tgQKBgQCW2OHHUfnfRMns/d1sp/QNMag19flOT+IjvZXI5ZMy9yojlpcTSdSq +NzaahUZKtEankjMlXw2RHMYrXjtAJgwXlV4rMWxkaqUrVqq99v6M1QNx/SHjnVB+ +SYQ8PZHp0mPk/opRPydP/U5WKDcP10KRuSNRSQmvacD5gzs3B6Jhqg== +-----END RSA PRIVATE KEY----- diff --git a/tests/devkeys-pkc/recovery_kernel.keyblock b/tests/devkeys-pkc/recovery_kernel.keyblock new file mode 100644 index 00000000..ad16e399 Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel.keyblock differ diff --git a/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk b/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk new file mode 100644 index 00000000..03795952 Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk differ diff --git a/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk b/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk new file mode 100644 index 00000000..3e9e67c5 Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk differ diff --git a/tests/devkeys-pkc/recovery_key.vbprivk b/tests/devkeys-pkc/recovery_key.vbprivk new file mode 100644 index 00000000..6c7ab363 Binary files /dev/null and b/tests/devkeys-pkc/recovery_key.vbprivk differ diff --git a/tests/devkeys-pkc/recovery_key.vbpubk b/tests/devkeys-pkc/recovery_key.vbpubk new file mode 100644 index 00000000..86d2471a Binary files /dev/null and b/tests/devkeys-pkc/recovery_key.vbpubk differ diff --git a/tests/devkeys-pkc/root_key.vbprivk b/tests/devkeys-pkc/root_key.vbprivk new file mode 100644 index 00000000..74c47dd7 Binary files /dev/null and b/tests/devkeys-pkc/root_key.vbprivk differ diff --git a/tests/devkeys-pkc/root_key.vbpubk b/tests/devkeys-pkc/root_key.vbpubk new file mode 100644 index 00000000..dfca9d05 Binary files /dev/null and b/tests/devkeys-pkc/root_key.vbpubk differ diff --git a/tests/devkeys/nv_pkc.pem b/tests/devkeys/nv_pkc.pem deleted file mode 100644 index cbafc03b..00000000 --- a/tests/devkeys/nv_pkc.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAs3Lf87UkomlfVHdw/FEz+owzgO+ZFu6/72qT+jSu7aEDZeZj -l2cgTQOnHjlmBYj6KoqwXQmY6ZWPNBT7xDqzGdvimCVRC3OGRee2uD+Itu/Qwo1F -FOb7v+l3v6lODGqDJ06aIxLicEiqK55dk5z+7dP8yyJ3pRhwiDPE4tNtlLOWgmJ/ -hENyqBHbMMzg67Qwb+aa89wfq2FRrvGOpfmrKlhqtikDnwJALBfkr7hsZGZOszHC -ii2L5T3eCaI/me2/VIGlQSjGxmaDkiG/aIZVTuIX/LuOyi4sLXJ9cIFQ7Ty/0PAk -6Ia6VyEGETQt6+JeLETX4Zc+XCnfbE/Flhs5PwIDAQABAoIBAQCMcmM/Xc4PY0Ne -W6FNicyR0vtYda4u2avVGWg50tP6XiPHtDrMO8V3IV3B9RCZUmzhsOx51NIeN5T+ -IVIvcfXNTmCZzdMRkFhODB3hNLCu5SFRs7mWs3Xj7TlxA3R3mUGPGSDgRJ5/XQ/6 -1ZbNunl38IuQ/SgBShCBOWtmUC4ay+ctm1CzBZ/7AYlauOxdoKiU2nzlwpMrX9+C -vaVKRQVYbE7EYJsWKOx6vRPU5Kjoq6StlSW4caG0ReRu9tO+xL7kZnqp1BWl3KHw -OfzLy1CmwDkV3bKFclRWWPR97nN7F95SUFIJ3bOVjU/K2TKuLtMYPPVdG4CBBeB5 -eK2Qae7ZAoGBAOprwiAvcRNWJ2W5JoCkh0L6AHXx2z+S1Bbt0laz4NyqyfPX2SMl -DJRxm/IoYRfwZf7fussI1bG7g4UP8HjfrlAzSEWVgPNMSWftOFzkv4QNr2ySjk0/ -nZRsd+zj2kxhc8ukDhiORkyEEg5gtsEUqbtdZHOiqtkNbKOPD6EGKeP7AoGBAMP3 -q5NUh9pJ2RGSkdKutloXNe0HPI6sjsCX3HHWAaFyqBtXWvRU3fIaMUpGQcPaqDCt -LhzVoNlPXdeQ7vTkBPtiYQBcs0NPI+58pnD5fgR00yTX/5ZIGKbX0NnpZ3spsQAQ -FQTXGy80+JyGMmJCDf32VGC96I9Ey5w49U23kXiNAoGAGEtiqwM/rMlY++ncW6ix -e/d85LxUBJqq8FVlXyb1PulUVLkh/8pvK1M63jXhGiIH8Aovyar4upq8XqXwPhaw -cg9ehhegbZaSZProxHfQgVcJvy7RIKBfLGqxYxOaJCBVZ91wuIrGLlfhpyvOxOPn -U0uyhWluW2BQygKhlAaXgNECgYAKDAif5RWR+3dFj14qjwqKU+ZP4K8aIX6wIRkM -PQyYWmiD/laLcE5wuycLx85XXD6DQF283LcCbS9CfgvCQm5+9OxEOHx4VvZgo8Nk -x2XOlK6+lNRlwAyDgU0T3wOPLPQGLMznEqAyK2UToU2z++77tkVdMF9b+Qr3V3Q8 -J80tgQKBgQCW2OHHUfnfRMns/d1sp/QNMag19flOT+IjvZXI5ZMy9yojlpcTSdSq -NzaahUZKtEankjMlXw2RHMYrXjtAJgwXlV4rMWxkaqUrVqq99v6M1QNx/SHjnVB+ -SYQ8PZHp0mPk/opRPydP/U5WKDcP10KRuSNRSQmvacD5gzs3B6Jhqg== ------END RSA PRIVATE KEY----- -- cgit v1.2.1