|
@@ -38,14 +38,14 @@ class TestEfiAuthVar(object):
|
|
|
# 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'])
|
|
|
+ 'setenv -e -nv -bs -rt -i 4000000:$filesize PK'])
|
|
|
assert 'Failed to set EFI variable' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK',
|
|
|
'printenv -e -n PK'])
|
|
|
assert 'PK:' in ''.join(output)
|
|
|
|
|
@@ -60,24 +60,24 @@ class TestEfiAuthVar(object):
|
|
|
# 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'])
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize dbx'])
|
|
|
assert 'Failed to set EFI variable' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -i 4000000:$filesize KEK'])
|
|
|
assert 'Failed to set EFI variable' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize KEK',
|
|
|
'printenv -e -n KEK'])
|
|
|
assert 'KEK:' in ''.join(output)
|
|
|
|
|
@@ -89,12 +89,12 @@ class TestEfiAuthVar(object):
|
|
|
# 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'])
|
|
|
+ 'setenv -e -nv -bs -rt -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.join(output)
|
|
@@ -107,12 +107,12 @@ class TestEfiAuthVar(object):
|
|
|
# Test Case 1g, install dbx
|
|
|
output = u_boot_console.run_command_list([
|
|
|
'fatload host 0:1 4000000 dbx.auth',
|
|
|
- 'setenv -e -nv -bs -rt -i 4000000,$filesize dbx'])
|
|
|
+ 'setenv -e -nv -bs -rt -i 4000000:$filesize dbx'])
|
|
|
assert 'Failed to set EFI variable' in ''.join(output)
|
|
|
|
|
|
output = u_boot_console.run_command_list([
|
|
|
'fatload host 0:1 4000000 dbx.auth',
|
|
|
- 'setenv -e -nv -bs -rt -at -i 4000000,$filesize dbx',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize dbx',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f dbx'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'dbx:' in ''.join(output)
|
|
@@ -132,32 +132,32 @@ class TestEfiAuthVar(object):
|
|
|
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',
|
|
|
+ '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',
|
|
|
+ '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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.join(output)
|
|
@@ -173,32 +173,32 @@ class TestEfiAuthVar(object):
|
|
|
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',
|
|
|
+ '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',
|
|
|
+ '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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -a -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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'])
|
|
|
+ 'setenv -e -nv -bs -rt -at -a -i 4000000:$filesize db'])
|
|
|
assert 'Failed to set EFI variable' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -a -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.join(output)
|
|
@@ -214,11 +214,11 @@ class TestEfiAuthVar(object):
|
|
|
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',
|
|
|
+ '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',
|
|
|
+ '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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n -guid d719b2cb-3d3a-4596-a3bc-dad00e67656f db'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'db:' in ''.join(output)
|
|
@@ -248,18 +248,18 @@ class TestEfiAuthVar(object):
|
|
|
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',
|
|
|
+ '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',
|
|
|
+ '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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db',
|
|
|
'printenv -e -n PK'])
|
|
|
assert 'Failed to set EFI variable' not in ''.join(output)
|
|
|
assert 'PK:' in ''.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',
|
|
|
+ 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK',
|
|
|
'printenv -e -n PK'])
|
|
|
assert 'Failed to set EFI variable' in ''.join(output)
|
|
|
assert 'PK:' in ''.join(output)
|
|
@@ -268,7 +268,7 @@ class TestEfiAuthVar(object):
|
|
|
# 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',
|
|
|
+ '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)
|