mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-30 19:48:19 +00:00 
			
		
		
		
	commit cbea241e935e("efidebug: add multiple device path instances on Boot####")
slightly tweaked the efidebug syntax adding -b, -i and -s for the boot
image, initrd and optional data.
The pytests using this command were adapted as well. However I completely
missed the last "" argument, which at the time indicated the optional data
and needed conversion as well.  This patch is adding the missing -s flag
and the tests are back to normal.
Fixes: cbea241e935e("efidebug: add multiple device path instances on Boot####")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviwed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
		
	
			
		
			
				
	
	
		
			118 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			118 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| # SPDX-License-Identifier:      GPL-2.0+
 | |
| # Copyright (c) 2019, Linaro Limited
 | |
| # Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
 | |
| #
 | |
| # U-Boot UEFI: Signed Image Authentication Test
 | |
| 
 | |
| """
 | |
| This test verifies image authentication for unsigned images.
 | |
| """
 | |
| 
 | |
| import pytest
 | |
| 
 | |
| 
 | |
| @pytest.mark.boardspec('sandbox')
 | |
| @pytest.mark.buildconfigspec('efi_secure_boot')
 | |
| @pytest.mark.buildconfigspec('cmd_efidebug')
 | |
| @pytest.mark.buildconfigspec('cmd_fat')
 | |
| @pytest.mark.buildconfigspec('cmd_nvedit_efi')
 | |
| @pytest.mark.slow
 | |
| class TestEfiUnsignedImage(object):
 | |
|     def test_efi_unsigned_image_auth1(self, u_boot_console, efi_boot_env):
 | |
|         """
 | |
|         Test Case 1 - rejected when not digest in db or dbx
 | |
|         """
 | |
|         u_boot_console.restart_uboot()
 | |
|         disk_img = efi_boot_env
 | |
|         with u_boot_console.log.section('Test Case 1'):
 | |
|             # Test Case 1
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'host bind 0 %s' % disk_img,
 | |
|                 'fatload host 0:1 4000000 KEK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize KEK',
 | |
|                 'fatload host 0:1 4000000 PK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK'])
 | |
|             assert 'Failed to set EFI variable' not in ''.join(output)
 | |
| 
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot add -b 1 HELLO host 0:1 /helloworld.efi -s ""',
 | |
|                 'efidebug boot next 1',
 | |
|                 'bootefi bootmgr'])
 | |
|             assert '\'HELLO\' failed' in ''.join(output)
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot next 1',
 | |
|                 'efidebug test bootmgr'])
 | |
|             assert 'efi_start_image() returned: 26' in ''.join(output)
 | |
|             assert 'Hello, world!' not in ''.join(output)
 | |
| 
 | |
|     def test_efi_unsigned_image_auth2(self, u_boot_console, efi_boot_env):
 | |
|         """
 | |
|         Test Case 2 - authenticated by digest in db
 | |
|         """
 | |
|         u_boot_console.restart_uboot()
 | |
|         disk_img = efi_boot_env
 | |
|         with u_boot_console.log.section('Test Case 2'):
 | |
|             # Test Case 2
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'host bind 0 %s' % disk_img,
 | |
|                 'fatload host 0:1 4000000 db_hello.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
 | |
|                 'fatload host 0:1 4000000 KEK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize KEK',
 | |
|                 'fatload host 0:1 4000000 PK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK'])
 | |
|             assert 'Failed to set EFI variable' not in ''.join(output)
 | |
| 
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot add -b 1 HELLO host 0:1 /helloworld.efi -s ""',
 | |
|                 'efidebug boot next 1',
 | |
|                 'bootefi bootmgr'])
 | |
|             assert 'Hello, world!' in ''.join(output)
 | |
| 
 | |
|     def test_efi_unsigned_image_auth3(self, u_boot_console, efi_boot_env):
 | |
|         """
 | |
|         Test Case 3 - rejected by digest in dbx
 | |
|         """
 | |
|         u_boot_console.restart_uboot()
 | |
|         disk_img = efi_boot_env
 | |
|         with u_boot_console.log.section('Test Case 3a'):
 | |
|             # Test Case 3a, rejected by dbx
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'host bind 0 %s' % disk_img,
 | |
|                 'fatload host 0:1 4000000 db_hello.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize dbx',
 | |
|                 'fatload host 0:1 4000000 KEK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize KEK',
 | |
|                 'fatload host 0:1 4000000 PK.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK'])
 | |
|             assert 'Failed to set EFI variable' not in ''.join(output)
 | |
| 
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot add -b 1 HELLO host 0:1 /helloworld.efi -s ""',
 | |
|                 'efidebug boot next 1',
 | |
|                 'bootefi bootmgr'])
 | |
|             assert '\'HELLO\' failed' in ''.join(output)
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot next 1',
 | |
|                 'efidebug test bootmgr'])
 | |
|             assert 'efi_start_image() returned: 26' in ''.join(output)
 | |
|             assert 'Hello, world!' not in ''.join(output)
 | |
| 
 | |
|         with u_boot_console.log.section('Test Case 3b'):
 | |
|             # Test Case 3b, rejected by dbx even if db allows
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'fatload host 0:1 4000000 db_hello.auth',
 | |
|                 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db'])
 | |
|             assert 'Failed to set EFI variable' not in ''.join(output)
 | |
| 
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot add -b 1 HELLO host 0:1 /helloworld.efi -s ""',
 | |
|                 'efidebug boot next 1',
 | |
|                 'bootefi bootmgr'])
 | |
|             assert '\'HELLO\' failed' in ''.join(output)
 | |
|             output = u_boot_console.run_command_list([
 | |
|                 'efidebug boot next 1',
 | |
|                 'efidebug test bootmgr'])
 | |
|             assert 'efi_start_image() returned: 26' in ''.join(output)
 | |
|             assert 'Hello, world!' not in ''.join(output)
 |