diff mbox series

[Concept,15/24] luks: Encrypt the mmc11 test image

Message ID	20251031065439.3251464-16-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Fri, 31 Oct 2025 00:54:11 -0600 Message-ID: <20251031065439.3251464-16-sjg@u-boot.org> In-Reply-To: <20251031065439.3251464-1-sjg@u-boot.org> References: <20251031065439.3251464-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: DWCATFOGQZ5Q2K53ZONVEMLUQ3ZWBCIB CC: Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH 15/24] luks: Encrypt the mmc11 test image Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/DWCATFOGQZ5Q2K53ZONVEMLUQ3ZWBCIB/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	luks: Provide basic support for unlocking a LUKS1 partition \| [Concept,00/24] luks: Provide basic support for unlocking a LUKS1 partition [Concept,01/24] aes: Fix key size handling for AES-192 and AES-256 [Concept,02/24] doc: Provide documentation for the blkmap command [Concept,03/24] log: Provide a macro to log a hex string [Concept,04/24] panic: Provide a way to poweroff on panic [Concept,05/24] sandbox: Enable CONFIG_PANIC_POWEROFF [Concept,06/24] sandbox: Add devon and devoff subcommands to sb command [Concept,07/24] mbedtls: hash: Provide the mbedtls hash type in the hash interface [Concept,08/24] mbedtls: Allow use of PKCS#5 functions [Concept,09/24] test/py: Support creating space after a filesystem [Concept,10/24] test/py: Support FDE with the extlinux image [Concept,11/24] test/py: Set up an Ubuntu image with space for FDE [Concept,12/24] docker: Add cryptsetup package for LUKS testing [Concept,13/24] CI: Update Docker image to including luks tools [Concept,14/24] luks: Add a way to create an encrypted partition [Concept,15/24] luks: Encrypt the mmc11 test image [Concept,16/24] luks: Add the beginning of LUKS support [Concept,17/24] luks: Add a simple command [Concept,18/24] luks: Create a very simple JSON library [Concept,19/24] luks: Create a disk image with LUKS2 encryption [Concept,20/24] luks: Show the JSON information for LUKSv2 [Concept,21/24] luks: Enhance blkmap to support LUKSv1 [Concept,22/24] luks: Provide a way to unlock and map encrypted partitions [Concept,23/24] luks: Add a subcommand to unlock an encrypted partition

Commit Message

Simon Glass Oct. 31, 2025, 6:54 a.m. UTC

  From: Simon Glass <sjg@chromium.org>

Encrypt the ext4 partition in this image so that we can use it for
tests.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 test/py/img/common.py | 6 ++++--
 test/py/img/ubuntu.py | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/test/py/img/common.py b/test/py/img/common.py
index a08744fbb76..01745ce73b3 100644
--- a/test/py/img/common.py
+++ b/test/py/img/common.py
@@ -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):
+                         script, part2_size=1, use_fde=False):
     """Create a 20MB disk image with a single FAT partition
 
     Args:
@@ -46,6 +46,7 @@  def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
         dtbdir (str or None): Devicetree filename
         script (str): Script to place in the extlinux.conf file
         part2_size (int): Size of second partition in MB (default: 1)
+        use_fde (bool): True to encrypt the ext4 partition with LUKS1
     """
     fsh = FsHelper(config, 'vfat', 18, prefix=basename)
     fsh.setup()
@@ -80,7 +81,8 @@  def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
     img.add_fs(fsh, DiskHelper.VFAT, bootable=True)
 
     ext4 = FsHelper(config, 'ext4', max(1, part2_size - 30), prefix=basename,
-                    part_mb=part2_size)
+                    part_mb=part2_size,
+                    encrypt_passphrase='test' if use_fde else None)
     ext4.setup()
 
     bindir = os.path.join(ext4.srcdir, 'bin')
diff --git a/test/py/img/ubuntu.py b/test/py/img/ubuntu.py
index c60da4a0c41..58ee9f20277 100644
--- a/test/py/img/ubuntu.py
+++ b/test/py/img/ubuntu.py
@@ -49,4 +49,5 @@  label l0r
 	initrd /boot/%s
 ''' % ((version, vmlinux, initrd) * 2)
     setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
-                         script, part2_size=60 if use_fde else 1)
+                         script, part2_size=60 if use_fde else 1,
+                         use_fde=use_fde)