diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-04 09:38:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-04 09:38:56 -0400 |
| commit | 0f259fe79d7f0dca716bc954c211b0e6bc606d72 (patch) | |
| tree | 8b9b58da4604290897131f8cb7fd70ab0ded7b3a /test/py/tests/test_efi_capsule/conftest.py | |
| parent | 90189ecd59cdf14afbe6014be5c068e599b65a72 (diff) | |
| parent | 8645aefc8b699f900d97cbadd55b7f492099c61e (diff) | |
Merge tag 'efi-2022-07-rc4-4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-07-rc4-4
UEFI:
* Fix the implementation of the firmware management protocol
* Fix the unit tests for signed update capsules
Diffstat (limited to 'test/py/tests/test_efi_capsule/conftest.py')
| -rw-r--r-- | test/py/tests/test_efi_capsule/conftest.py | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py index d757415c881..4879f2b5c24 100644 --- a/test/py/tests/test_efi_capsule/conftest.py +++ b/test/py/tests/test_efi_capsule/conftest.py @@ -97,23 +97,40 @@ def efi_capsule_data(request, u_boot_config): shell=True) if capsule_auth_enabled: - # firmware signed with proper key + # raw firmware signed with proper key check_call('cd %s; ' '%s/tools/mkeficapsule --index 1 --monotonic-count 1 ' '--private-key SIGNER.key --certificate SIGNER.crt ' - '--guid 09D7DF52-0720-4710-91D1-08469B7FE9C8 ' + '--guid 09D7CF52-0720-4710-91D1-08469B7FE9C8 ' 'u-boot.bin.new Test11' % (data_dir, u_boot_config.build_dir), shell=True) - # firmware signed with *mal* key + # raw firmware signed with *mal* key check_call('cd %s; ' '%s/tools/mkeficapsule --index 1 --monotonic-count 1 ' '--private-key SIGNER2.key ' '--certificate SIGNER2.crt ' - '--guid 09D7DF52-0720-4710-91D1-08469B7FE9C8 ' + '--guid 09D7CF52-0720-4710-91D1-08469B7FE9C8 ' 'u-boot.bin.new Test12' % (data_dir, u_boot_config.build_dir), shell=True) + # FIT firmware signed with proper key + check_call('cd %s; ' + '%s/tools/mkeficapsule --index 1 --monotonic-count 1 ' + '--private-key SIGNER.key --certificate SIGNER.crt ' + '--guid 3673B45D-6A7C-46F3-9E60-ADABB03F7937 ' + 'uboot_bin_env.itb Test13' + % (data_dir, u_boot_config.build_dir), + shell=True) + # FIT firmware signed with *mal* key + check_call('cd %s; ' + '%s/tools/mkeficapsule --index 1 --monotonic-count 1 ' + '--private-key SIGNER2.key ' + '--certificate SIGNER2.crt ' + '--guid 3673B45D-6A7C-46F3-9E60-ADABB03F7937 ' + 'uboot_bin_env.itb Test14' + % (data_dir, u_boot_config.build_dir), + shell=True) # Create a disk image with EFI system partition check_call('virt-make-fs --partition=gpt --size=+1M --type=vfat %s %s' % |