From da01eb0c55a06fd89516d159e8310d80fcc610b9 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Wed, 15 Oct 2025 11:00:26 +0800 Subject: [PATCH] tests/util/grub-fs-tester: Use Argon2id for LUKS2 test Given that the LUKS1 test already covers PBKDF2, the default KDF for the LUKS2 test has been switched to Argon2id to ensure both algorithms are validated. Signed-off-by: Gary Lin Tested-By: Waldemar Brodkorb Reviewed-by: Vladimir Serbinenko Reviewed-by: Daniel Kiper --- tests/util/grub-fs-tester.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index cac58dafa..126f19a7e 100644 --- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -860,8 +860,14 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do MOUNTDEVICE="/dev/mapper/grub_test-testvol" MOUNTFS=ext2 "mkfs.ext2" -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; - x"luks"*) - echo -n "$PASS" | cryptsetup luksFormat --type "$fs" --sector-size $SECSIZE --pbkdf pbkdf2 --force-password --disable-locks $LODEVICE + xluks1) + echo -n "$PASS" | cryptsetup luksFormat --type luks1 --sector-size $SECSIZE --pbkdf pbkdf2 --force-password --disable-locks $LODEVICE + echo -n "$PASS" | cryptsetup open --disable-locks $LODEVICE "$DMNAME" + MOUNTDEVICE="/dev/mapper/${DMNAME}" + MOUNTFS=ext2 + "mkfs.ext2" -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; + xluks2) + echo -n "$PASS" | cryptsetup luksFormat --type luks2 --sector-size $SECSIZE --pbkdf argon2id --force-password --disable-locks $LODEVICE echo -n "$PASS" | cryptsetup open --disable-locks $LODEVICE "$DMNAME" MOUNTDEVICE="/dev/mapper/${DMNAME}" MOUNTFS=ext2 -- 2.47.3