mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
test: uninstall PK after secboot tests
The EFI secure boot tests install a security data base. Other EFI tests assume that secure boot is not enabled. Add the missing tear-down at the end of each secboot test sequence. Reported-by: Tom Rini <trini@konsulko.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Tested-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
committed by
Tom Rini
parent
7e65d29b66
commit
ede1186f20
@@ -162,9 +162,12 @@ def efi_boot_env_intca(request, ubman):
|
||||
# PK
|
||||
check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_PK/ -keyout PK.key -out PK.crt -nodes -days 365'
|
||||
% mnt_point, shell=True)
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s PK.crt PK.esl; %ssign-efi-sig-list -c PK.crt -k PK.key PK PK.esl PK.auth'
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s PK.crt PK.esl; %ssign-efi-sig-list -t "2020-04-01" -c PK.crt -k PK.key PK PK.esl PK.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
# PK_null for deletion
|
||||
check_call('cd %s; touch PK_null.esl; %ssign-efi-sig-list -c PK.crt -k PK.key PK PK_null.esl PK_null.auth'
|
||||
% (mnt_point, EFITOOLS_PATH), shell=True)
|
||||
# KEK
|
||||
check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_KEK/ -keyout KEK.key -out KEK.crt -nodes -days 365'
|
||||
% mnt_point, shell=True)
|
||||
|
||||
@@ -369,3 +369,12 @@ class TestEfiSignedImage(object):
|
||||
assert(not 'hELLO, world!' in ''.join(output))
|
||||
assert('\'HELLO1\' failed' in ''.join(output))
|
||||
assert('efi_bootmgr_load() returned: 26' in ''.join(output))
|
||||
|
||||
with ubman.log.section('Test Case 8c'):
|
||||
# Test Case 8c, Uninstall PK
|
||||
output = ubman.run_command_list([
|
||||
'fatload host 0:1 4000000 PK_null.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK',
|
||||
'printenv -e -n PK'])
|
||||
assert 'Failed to set EFI variable' not in ''.join(output)
|
||||
assert '\"PK\" not defined' in ''.join(output)
|
||||
|
||||
@@ -133,3 +133,12 @@ class TestEfiSignedImageIntca(object):
|
||||
'efidebug test bootmgr'])
|
||||
assert '\'HELLO_abc\' failed' in ''.join(output)
|
||||
assert 'efi_bootmgr_load() returned: 26' in ''.join(output)
|
||||
|
||||
with ubman.log.section('Test Case 3c'):
|
||||
# Test Case 3c, Uninstall PK
|
||||
output = ubman.run_command_list([
|
||||
'fatload host 0:1 4000000 PK_null.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK',
|
||||
'printenv -e -n PK'])
|
||||
assert 'Failed to set EFI variable' not in ''.join(output)
|
||||
assert '\"PK\" not defined' in ''.join(output)
|
||||
|
||||
@@ -115,3 +115,12 @@ class TestEfiUnsignedImage(object):
|
||||
'efidebug test bootmgr'])
|
||||
assert 'efi_bootmgr_load() returned: 26' in ''.join(output)
|
||||
assert 'Hello, world!' not in ''.join(output)
|
||||
|
||||
with ubman.log.section('Test Case 3c'):
|
||||
# Test Case 3c, Uninstall PK
|
||||
output = ubman.run_command_list([
|
||||
'fatload host 0:1 4000000 PK_null.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK',
|
||||
'printenv -e -n PK'])
|
||||
assert 'Failed to set EFI variable' not in ''.join(output)
|
||||
assert '\"PK\" not defined' in ''.join(output)
|
||||
|
||||
Reference in New Issue
Block a user