Looks good. Reviewed-by: Vladimir Serbinenko<phco...@gmail.com>

Regards
Vladimir 'phcoder' Serbinenko

Le mer. 6 août 2025, 10:16, Gary Lin <g...@suse.com> a écrit :

> 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 <g...@suse.com>
> Tested-By: Waldemar Brodkorb <w...@openadk.org>
> ---
>  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.43.0
>
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to