mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
Merge tag 'efi-2020-07-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc1 This pull request * provides an implementation of UEFI secure booting * fixes a problem with the rsa_mod_exp driver which stops some boards from booting when CONFIG_RSA is enabled which is needed for UEFI secure booting * enables the EFI_RNG_PROTOCOL if DM_RNG is enabled * fixes some function comments
This commit is contained in:
Tom Rini
@@ -37,7 +37,15 @@ will be required. The following is an incomplete list:
|
||||
| openssl |
|
||||
| sudo OR guestmount |
|
||||
| e2fsprogs |
|
||||
| util-linux |
|
||||
| coreutils |
|
||||
| dosfstools |
|
||||
| efitools |
|
||||
| mount |
|
||||
| mtools |
|
||||
| sbsigntool |
|
||||
| udisks2 |
|
||||
|
||||
|
||||
Please use the apporirate commands for your distribution to match these tools
|
||||
up with the package that provides them.
|
||||
|
||||
151
test/py/tests/test_efi_secboot/conftest.py
Normal file
151
test/py/tests/test_efi_secboot/conftest.py
Normal file
@@ -0,0 +1,151 @@
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
# Copyright (c) 2019, Linaro Limited
|
||||
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import pytest
|
||||
import re
|
||||
from subprocess import call, check_call, check_output, CalledProcessError
|
||||
from defs import *
|
||||
|
||||
# from test/py/conftest.py
|
||||
def tool_is_in_path(tool):
|
||||
for path in os.environ["PATH"].split(os.pathsep):
|
||||
fn = os.path.join(path, tool)
|
||||
if os.path.isfile(fn) and os.access(fn, os.X_OK):
|
||||
return True
|
||||
return False
|
||||
|
||||
#
|
||||
# Fixture for UEFI secure boot test
|
||||
#
|
||||
@pytest.fixture(scope='session')
|
||||
def efi_boot_env(request, u_boot_config):
|
||||
"""Set up a file system to be used in UEFI secure boot test.
|
||||
|
||||
Args:
|
||||
request: Pytest request object.
|
||||
u_boot_config: U-boot configuration.
|
||||
|
||||
Return:
|
||||
A path to disk image to be used for testing
|
||||
"""
|
||||
global HELLO_PATH
|
||||
|
||||
image_path = u_boot_config.persistent_data_dir
|
||||
image_path = image_path + '/' + EFI_SECBOOT_IMAGE_NAME
|
||||
image_size = EFI_SECBOOT_IMAGE_SIZE
|
||||
part_size = EFI_SECBOOT_PART_SIZE
|
||||
fs_type = EFI_SECBOOT_FS_TYPE
|
||||
|
||||
if HELLO_PATH == '':
|
||||
HELLO_PATH = u_boot_config.build_dir + '/lib/efi_loader/helloworld.efi'
|
||||
|
||||
try:
|
||||
non_root = tool_is_in_path('udisksctl')
|
||||
|
||||
# create a disk/partition
|
||||
check_call('dd if=/dev/zero of=%s bs=1MiB count=%d'
|
||||
% (image_path, image_size), shell=True)
|
||||
check_call('sgdisk %s -n 1:0:+%dMiB'
|
||||
% (image_path, part_size), shell=True)
|
||||
# create a file system
|
||||
check_call('dd if=/dev/zero of=%s.tmp bs=1MiB count=%d'
|
||||
% (image_path, part_size), shell=True)
|
||||
check_call('mkfs -t %s %s.tmp' % (fs_type, image_path), shell=True)
|
||||
check_call('dd if=%s.tmp of=%s bs=1MiB seek=1 count=%d conv=notrunc'
|
||||
% (image_path, image_path, 1), shell=True)
|
||||
check_call('rm %s.tmp' % image_path, shell=True)
|
||||
if non_root:
|
||||
out_data = check_output('udisksctl loop-setup -f %s -o %d'
|
||||
% (image_path, 1048576), shell=True).decode()
|
||||
m = re.search('(?<= as )(.*)\.', out_data)
|
||||
loop_dev = m.group(1)
|
||||
# print 'loop device is: %s' % loop_dev
|
||||
out_data = check_output('udisksctl info -b %s'
|
||||
% loop_dev, shell=True).decode()
|
||||
m = re.search('MountPoints:[ \t]+(.*)', out_data)
|
||||
mnt_point = m.group(1)
|
||||
else:
|
||||
loop_dev = check_output('sudo losetup -o 1MiB --sizelimit %dMiB --show -f %s | tr -d "\n"'
|
||||
% (part_size, image_path), shell=True).decode()
|
||||
mnt_point = '/mnt'
|
||||
check_output('sudo mount -t %s -o umask=000 %s %s'
|
||||
% (fs_type, loop_dev, mnt_point), shell=True)
|
||||
|
||||
# print 'mount point is: %s' % mnt_point
|
||||
|
||||
# suffix
|
||||
# *.key: RSA private key in PEM
|
||||
# *.crt: X509 certificate (self-signed) in PEM
|
||||
# *.esl: signature list
|
||||
# *.hash: message digest of image as signature list
|
||||
# *.auth: signed signature list in signature database format
|
||||
# *.efi: UEFI image
|
||||
# *.efi.signed: signed UEFI image
|
||||
|
||||
# Create signature database
|
||||
## 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'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
## PK_null for deletion
|
||||
check_call('cd %s; sleep 2; 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)
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s KEK.crt KEK.esl; %ssign-efi-sig-list -c PK.crt -k PK.key KEK KEK.esl KEK.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
## db
|
||||
check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_db/ -keyout db.key -out db.crt -nodes -days 365'
|
||||
% mnt_point, shell=True)
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s db.crt db.esl; %ssign-efi-sig-list -c KEK.crt -k KEK.key db db.esl db.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
## db1
|
||||
check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_db1/ -keyout db1.key -out db1.crt -nodes -days 365'
|
||||
% mnt_point, shell=True)
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s db1.crt db1.esl; %ssign-efi-sig-list -c KEK.crt -k KEK.key db db1.esl db1.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
## db1-update
|
||||
check_call('cd %s; %ssign-efi-sig-list -a -c KEK.crt -k KEK.key db db1.esl db1-update.auth'
|
||||
% (mnt_point, EFITOOLS_PATH), shell=True)
|
||||
## dbx
|
||||
check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_dbx/ -keyout dbx.key -out dbx.crt -nodes -days 365'
|
||||
% mnt_point, shell=True)
|
||||
check_call('cd %s; %scert-to-efi-sig-list -g %s dbx.crt dbx.esl; %ssign-efi-sig-list -c KEK.crt -k KEK.key dbx dbx.esl dbx.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, GUID, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
|
||||
# Copy image
|
||||
check_call('cp %s %s' % (HELLO_PATH, mnt_point), shell=True)
|
||||
|
||||
## Sign image
|
||||
check_call('cd %s; sbsign --key db.key --cert db.crt helloworld.efi'
|
||||
% mnt_point, shell=True)
|
||||
## Digest image
|
||||
check_call('cd %s; %shash-to-efi-sig-list helloworld.efi db_hello.hash; %ssign-efi-sig-list -c KEK.crt -k KEK.key db db_hello.hash db_hello.auth'
|
||||
% (mnt_point, EFITOOLS_PATH, EFITOOLS_PATH),
|
||||
shell=True)
|
||||
|
||||
if non_root:
|
||||
check_call('udisksctl unmount -b %s' % loop_dev, shell=True)
|
||||
# not needed
|
||||
# check_call('udisksctl loop-delete -b %s' % loop_dev, shell=True)
|
||||
else:
|
||||
check_call('sudo umount %s' % loop_dev, shell=True)
|
||||
check_call('sudo losetup -d %s' % loop_dev, shell=True)
|
||||
|
||||
except CalledProcessError as e:
|
||||
pytest.skip('Setup failed: %s' % e.cmd)
|
||||
return
|
||||
else:
|
||||
yield image_path
|
||||
finally:
|
||||
call('rm -f %s' % image_path, shell=True)
|
||||
21
test/py/tests/test_efi_secboot/defs.py
Normal file
21
test/py/tests/test_efi_secboot/defs.py
Normal file
@@ -0,0 +1,21 @@
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
|
||||
# Disk image name
|
||||
EFI_SECBOOT_IMAGE_NAME='test_efi_secboot.img'
|
||||
|
||||
# Size in MiB
|
||||
EFI_SECBOOT_IMAGE_SIZE=16
|
||||
EFI_SECBOOT_PART_SIZE=8
|
||||
|
||||
# Partition file system type
|
||||
EFI_SECBOOT_FS_TYPE='vfat'
|
||||
|
||||
# Owner guid
|
||||
GUID='11111111-2222-3333-4444-123456789abc'
|
||||
|
||||
# v1.5.1 or earlier of efitools has a bug in sha256 calculation, and
|
||||
# you need build a newer version on your own.
|
||||
EFITOOLS_PATH=''
|
||||
|
||||
# Hello World application for sandbox
|
||||
HELLO_PATH=''
|
||||
282
test/py/tests/test_efi_secboot/test_authvar.py
Normal file
282
test/py/tests/test_efi_secboot/test_authvar.py
Normal file
@@ -0,0 +1,282 @@
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
# Copyright (c) 2019, Linaro Limited
|
||||
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
||||
#
|
||||
# U-Boot UEFI: Variable Authentication Test
|
||||
|
||||
"""
|
||||
This test verifies variable authentication
|
||||
"""
|
||||
|
||||
import pytest
|
||||
import re
|
||||
from defs import *
|
||||
|
||||
@pytest.mark.boardspec('sandbox')
|
||||
@pytest.mark.buildconfigspec('efi_secure_boot')
|
||||
@pytest.mark.buildconfigspec('cmd_fat')
|
||||
@pytest.mark.buildconfigspec('cmd_nvedit_efi')
|
||||
@pytest.mark.slow
|
||||
class TestEfiAuthVar(object):
|
||||
def test_efi_var_auth1(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 1 - Install signature database
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 1a'):
|
||||
# Test Case 1a, Initial secure state
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'printenv -e SecureBoot'])
|
||||
assert('00000000: 00' in ''.join(output))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SetupMode')
|
||||
assert('00000000: 01' in output)
|
||||
|
||||
with u_boot_console.log.section('Test Case 1b'):
|
||||
# Test Case 1b, PK without AUTHENTICATED_WRITE_ACCESS
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -i 4000000,$filesize PK'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 1c'):
|
||||
# Test Case 1c, install PK
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'printenv -e -n PK'])
|
||||
assert(re.search('PK:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SecureBoot')
|
||||
assert('00000000: 01' in output)
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SetupMode')
|
||||
assert('00000000: 00' in output)
|
||||
|
||||
with u_boot_console.log.section('Test Case 1d'):
|
||||
# Test Case 1d, db/dbx without KEK
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize dbx'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 1e'):
|
||||
# Test Case 1e, install KEK
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -i 4000000,$filesize KEK'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize KEK',
|
||||
'printenv -e -n KEK'])
|
||||
assert(re.search('KEK:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SecureBoot')
|
||||
assert('00000000: 01' in output)
|
||||
|
||||
with u_boot_console.log.section('Test Case 1f'):
|
||||
# Test Case 1f, install db
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SecureBoot')
|
||||
assert('00000000: 01' in output)
|
||||
|
||||
with u_boot_console.log.section('Test Case 1g'):
|
||||
# Test Case 1g, install dbx
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SecureBoot')
|
||||
assert('00000000: 01' in output)
|
||||
|
||||
def test_efi_var_auth2(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 2 - Update database by overwriting
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 2a'):
|
||||
# Test Case 2a, update without AUTHENTICATED_WRITE_ACCESS
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize KEK',
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db1.auth',
|
||||
'setenv -e -nv -bs -rt -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 2b'):
|
||||
# Test Case 2b, update without correct signature
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.esl',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 2c'):
|
||||
# Test Case 2c, update with correct signature
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db1.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
def test_efi_var_auth3(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 3 - Append database
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 3a'):
|
||||
# Test Case 3a, update without AUTHENTICATED_WRITE_ACCESS
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize KEK',
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db1.auth',
|
||||
'setenv -e -nv -bs -rt -a -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 3b'):
|
||||
# Test Case 3b, update without correct signature
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.esl',
|
||||
'setenv -e -nv -bs -rt -at -a -i 4000000,$filesize db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 3c'):
|
||||
# Test Case 3c, update with correct signature
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db1.auth',
|
||||
'setenv -e -nv -bs -rt -at -a -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
def test_efi_var_auth4(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 4 - Delete database without authentication
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 4a'):
|
||||
# Test Case 4a, update without AUTHENTICATED_WRITE_ACCESS
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize KEK',
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'setenv -e -nv -bs -rt db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 4b'):
|
||||
# Test Case 4b, update without correct signature/data
|
||||
output = u_boot_console.run_command_list([
|
||||
'setenv -e -nv -bs -rt -at db',
|
||||
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('db:', ''.join(output)))
|
||||
|
||||
def test_efi_var_auth5(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 5 - Uninstall(delete) PK
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 5a'):
|
||||
# Test Case 5a, Uninstall PK without correct signature
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'fatload host 0:1 4000000 PK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'fatload host 0:1 4000000 KEK.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize KEK',
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db',
|
||||
'printenv -e -n PK'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('PK:', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 PK_null.esl',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize PK',
|
||||
'printenv -e -n PK'])
|
||||
assert(re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('PK:', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 5b'):
|
||||
# Test Case 5b, Uninstall PK with correct signature
|
||||
output = u_boot_console.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
assert(re.search('\"PK\" not defined', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SecureBoot')
|
||||
assert('00000000: 00' in output)
|
||||
output = u_boot_console.run_command(
|
||||
'printenv -e SetupMode')
|
||||
assert('00000000: 01' in output)
|
||||
117
test/py/tests/test_efi_secboot/test_signed.py
Normal file
117
test/py/tests/test_efi_secboot/test_signed.py
Normal file
@@ -0,0 +1,117 @@
|
||||
# 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 signed images.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
import re
|
||||
from defs import *
|
||||
|
||||
@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 TestEfiSignedImage(object):
|
||||
def test_efi_signed_image_auth1(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 1 - authenticated by db
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 1a'):
|
||||
# Test Case 1a, run signed image if no db/dbx
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'efidebug boot add 1 HELLO1 host 0:1 /helloworld.efi.signed ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('Hello, world!', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 1b'):
|
||||
# Test Case 1b, run unsigned image if no db/dbx
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 2 HELLO2 host 0:1 /helloworld.efi ""',
|
||||
'efidebug boot next 2',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('Hello, world!', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 1c'):
|
||||
# Test Case 1c, not authenticated by db
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 2',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO2\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 2',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 1d'):
|
||||
# Test Case 1d, authenticated by db
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('Hello, world!', ''.join(output)))
|
||||
|
||||
def test_efi_signed_image_auth2(self, u_boot_console, efi_boot_env):
|
||||
"""
|
||||
Test Case 2 - rejected by dbx
|
||||
"""
|
||||
u_boot_console.restart_uboot()
|
||||
disk_img = efi_boot_env
|
||||
with u_boot_console.log.section('Test Case 2a'):
|
||||
# Test Case 2a, rejected by dbx
|
||||
output = u_boot_console.run_command_list([
|
||||
'host bind 0 %s' % disk_img,
|
||||
'fatload host 0:1 4000000 db.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 1 HELLO host 0:1 /helloworld.efi.signed ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.join(output)))
|
||||
|
||||
with u_boot_console.log.section('Test Case 2b'):
|
||||
# Test Case 2b, rejected by dbx even if db allows
|
||||
output = u_boot_console.run_command_list([
|
||||
'fatload host 0:1 4000000 db.auth',
|
||||
'setenv -e -nv -bs -rt -at -i 4000000,$filesize db'])
|
||||
assert(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.join(output)))
|
||||
121
test/py/tests/test_efi_secboot/test_unsigned.py
Normal file
121
test/py/tests/test_efi_secboot/test_unsigned.py
Normal file
@@ -0,0 +1,121 @@
|
||||
# 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
|
||||
import re
|
||||
from defs import *
|
||||
|
||||
@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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 1 HELLO host 0:1 /helloworld.efi ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 1 HELLO host 0:1 /helloworld.efi ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('Hello, world!', ''.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 1 HELLO host 0:1 /helloworld.efi ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.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(not re.search('Failed to set EFI variable', ''.join(output)))
|
||||
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot add 1 HELLO host 0:1 /helloworld.efi ""',
|
||||
'efidebug boot next 1',
|
||||
'bootefi bootmgr'])
|
||||
assert(re.search('\'HELLO\' failed', ''.join(output)))
|
||||
output = u_boot_console.run_command_list([
|
||||
'efidebug boot next 1',
|
||||
'efidebug test bootmgr'])
|
||||
assert(re.search('efi_start_image[(][)] returned: 26',
|
||||
''.join(output)))
|
||||
assert(not re.search('Hello, world!', ''.join(output)))
|
||||
Reference in New Issue
Block a user