smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Switch mmc12 over to use argon2id

Browse Source 
Use the more common argon2id algorithm for this disk so that we can test
the implementation.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2025-11-11 03:39:10 -07:00
parent b614f6b2a7
commit b2e53c814d
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/py/img/common.py
View File

@@ -33,7 +33,7 @@ def copy_partition(ubman, fsfile, outname):
def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
script, part2_size=1, use_fde=0):
script, part2_size=1, use_fde=0, luks_kdf='pbkdf2'):
"""Create a 20MB disk image with a single FAT partition
Args:
@@ -47,6 +47,8 @@ def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
script (str): Script to place in the extlinux.conf file
part2_size (int): Size of second partition in MB (default: 1)
use_fde (int): LUKS version for full-disk encryption (0=none, 1=LUKS1, 2=LUKS2)
luks_kdf (str): Key derivation function for LUKS2: 'pbkdf2' or 'argon2id'.
Defaults to 'pbkdf2'. Ignored for LUKS1.
"""
fsh = FsHelper(config, 'vfat', 18, prefix=basename)
fsh.setup()
@@ -83,7 +85,8 @@ def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
ext4 = FsHelper(config, 'ext4', max(1, part2_size - 30), prefix=basename,
part_mb=part2_size,
passphrase='test' if use_fde else None,
luks_version=use_fde if use_fde else 2)
luks_version=use_fde if use_fde else 2,
luks_kdf=luks_kdf)
ext4.setup()
bindir = os.path.join(ext4.srcdir, 'bin')

6
test/py/img/ubuntu.py
View File

@@ -7,7 +7,7 @@ from img.common import setup_extlinux_image
def setup_ubuntu_image(config, log, devnum, basename, version='24.04.1 LTS',
use_fde=0):
use_fde=0, luks_kdf='pbkdf2'):
"""Create a Ubuntu disk image with a FAT partition and ext4 partition
This creates a FAT partition containing extlinux files, kernel, etc. and a
@@ -19,6 +19,8 @@ def setup_ubuntu_image(config, log, devnum, basename, version='24.04.1 LTS',
devnum (int): Device number to use, e.g. 1
basename (str): Base name to use in the filename, e.g. 'mmc'
use_fde (int): LUKS version for full-disk encryption (0=none, 1=LUKS1, 2=LUKS2)
luks_kdf (str): Key derivation function for LUKS2: 'pbkdf2' or 'argon2id'.
Defaults to 'pbkdf2'. Ignored for LUKS1.
"""
vmlinux = 'vmlinuz-6.8.0-53-generic'
initrd = 'initrd.img-6.8.0-53-generic'
@@ -50,4 +52,4 @@ label l0r
''' % ((version, vmlinux, initrd) * 2)
setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
script, part2_size=60 if use_fde else 1,
use_fde=use_fde)
use_fde=use_fde, luks_kdf=luks_kdf)

3
test/py/tests/test_ut.py
View File

@@ -84,7 +84,8 @@ def test_ut_dm_init_bootstd(u_boot_config, u_boot_log):
setup_localboot_image(u_boot_config, u_boot_log)
setup_vbe_image(u_boot_config, u_boot_log)
setup_ubuntu_image(u_boot_config, u_boot_log, 11, 'mmc', use_fde=1)
setup_ubuntu_image(u_boot_config, u_boot_log, 12, 'mmc', use_fde=2)
setup_ubuntu_image(u_boot_config, u_boot_log, 12, 'mmc', use_fde=2,
luks_kdf='argon2id')
def test_ut(ubman, ut_subtest):
"""Execute a "ut" subtest.