* [PATCH 0/2] Expect success for argon2 cryptomount test
@ 2025-11-17 6:40 Glenn Washburn
2025-11-17 6:40 ` [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2 Glenn Washburn
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Glenn Washburn @ 2025-11-17 6:40 UTC (permalink / raw)
To: grub-devel; +Cc: Daniel Kiper, Leo Sandoval, Glenn Washburn
Patch #1 fixes a fialing test caused by argon2 integration (which is
expected because it was written to verify that GRUB could not open
LUKS2 volumes using an Argon2 keyslot).
The second patch, fixes potential issues with having spaces in the
builddir path and puts the builddir autoconf macro into a variable
so it only gets expanded once.
Glenn
Glenn Washburn (2):
tests/grub_cmd_cryptomount: Expect test success, now that GRUB
supports Argon2
tests/grub_cmd_cryptomount: Use builddir shell variable and quote
tests/grub_cmd_cryptomount.in | 50 +++++++++++++++++------------------
1 file changed, 25 insertions(+), 25 deletions(-)
--
2.34.1
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2
2025-11-17 6:40 [PATCH 0/2] Expect success for argon2 cryptomount test Glenn Washburn
@ 2025-11-17 6:40 ` Glenn Washburn
2025-11-18 6:35 ` Sudhakar Kuppusamy
2025-11-17 6:40 ` [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote Glenn Washburn
2025-11-17 17:46 ` [PATCH 0/2] Expect success for argon2 cryptomount test Daniel Kiper
2 siblings, 1 reply; 6+ messages in thread
From: Glenn Washburn @ 2025-11-17 6:40 UTC (permalink / raw)
To: grub-devel; +Cc: Daniel Kiper, Leo Sandoval, Glenn Washburn
This test was included to verify that, while GRUB did not have Argon2
support, trying to open a LUKS2 volume with an Argon2 keyslot would fail
Now that Argon2 support is included, the test is failing because it
expected a failure, but is now getting success. Change the test to expect
success.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/grub_cmd_cryptomount.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/grub_cmd_cryptomount.in b/tests/grub_cmd_cryptomount.in
index eaa187efad0a..a4fababa0a80 100644
--- a/tests/grub_cmd_cryptomount.in
+++ b/tests/grub_cmd_cryptomount.in
@@ -178,8 +178,7 @@ eval testcase "'LUKS2 test with different metadata size:'" \
@builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--luks2-metadata-size 512k'"
-# TODO: Expect a failure with LUKS2 volumes with argon2 key derivation
-eval testcase_fail "'LUKS2 test with argon2 pbkdf:'" \
+eval testcase "'LUKS2 test with argon2 pbkdf:'" \
@builddir@/grub-shell-luks-tester --luks=2 $COMMON_OPTS \
"--cs-opts='--pbkdf-memory 32'" "--cs-opts='--pbkdf-parallel 1'"
--
2.34.1
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2
2025-11-17 6:40 ` [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2 Glenn Washburn
@ 2025-11-18 6:35 ` Sudhakar Kuppusamy
0 siblings, 0 replies; 6+ messages in thread
From: Sudhakar Kuppusamy @ 2025-11-18 6:35 UTC (permalink / raw)
To: The development of GNU GRUB; +Cc: Daniel Kiper, Leo Sandoval, Glenn Washburn
> On 17 Nov 2025, at 12:10 PM, Glenn Washburn <development@efficientek.com> wrote:
>
> This test was included to verify that, while GRUB did not have Argon2
> support, trying to open a LUKS2 volume with an Argon2 keyslot would fail
> Now that Argon2 support is included, the test is failing because it
> expected a failure, but is now getting success. Change the test to expect
> success.
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
Thanks,
Sudhakar
> ---
> tests/grub_cmd_cryptomount.in | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tests/grub_cmd_cryptomount.in b/tests/grub_cmd_cryptomount.in
> index eaa187efad0a..a4fababa0a80 100644
> --- a/tests/grub_cmd_cryptomount.in
> +++ b/tests/grub_cmd_cryptomount.in
> @@ -178,8 +178,7 @@ eval testcase "'LUKS2 test with different metadata size:'" \
> @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--luks2-metadata-size 512k'"
>
> -# TODO: Expect a failure with LUKS2 volumes with argon2 key derivation
> -eval testcase_fail "'LUKS2 test with argon2 pbkdf:'" \
> +eval testcase "'LUKS2 test with argon2 pbkdf:'" \
> @builddir@/grub-shell-luks-tester --luks=2 $COMMON_OPTS \
> "--cs-opts='--pbkdf-memory 32'" "--cs-opts='--pbkdf-parallel 1'"
>
> --
> 2.34.1
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote
2025-11-17 6:40 [PATCH 0/2] Expect success for argon2 cryptomount test Glenn Washburn
2025-11-17 6:40 ` [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2 Glenn Washburn
@ 2025-11-17 6:40 ` Glenn Washburn
2025-11-18 6:35 ` Sudhakar Kuppusamy
2025-11-17 17:46 ` [PATCH 0/2] Expect success for argon2 cryptomount test Daniel Kiper
2 siblings, 1 reply; 6+ messages in thread
From: Glenn Washburn @ 2025-11-17 6:40 UTC (permalink / raw)
To: grub-devel; +Cc: Daniel Kiper, Leo Sandoval, Glenn Washburn
Using a shell variable instead of an autoconf macro creates less changes
to the file, which can be desirable when modifying by hand later and
then diffing with the unexpanded file. It also makes it simpler to
change the builddir after expansion, which may need to happen when
moving the build dir to a different path and not being able to rerun
the autoconf expansion.
Also, add quoting around the builddir variable as there may be spaces
in the path.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/grub_cmd_cryptomount.in | 47 ++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/tests/grub_cmd_cryptomount.in b/tests/grub_cmd_cryptomount.in
index a4fababa0a80..bcba7c74c1a5 100644
--- a/tests/grub_cmd_cryptomount.in
+++ b/tests/grub_cmd_cryptomount.in
@@ -38,6 +38,7 @@ fi
COMMON_OPTS='${V:+--debug=$V} --cs-opts="--pbkdf-force-iterations 1000"'
debug=${GRUB_SHELL_DEFAULT_DEBUG:-$GRUB_TEST_DEFAULT_DEBUG}
+builddir="@builddir@"
_testcase() {
local EXPECTEDRES=$1
@@ -92,94 +93,94 @@ testcase_fail() { _testcase 1 "$@"; }
### LUKS1 tests
eval testcase "'LUKS1 test cryptsetup defaults:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS
eval testcase "'LUKS1 test with twofish cipher:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
"--cs-opts='--cipher twofish-xts-plain64'"
eval testcase "'LUKS1 test key file support:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
--keyfile
eval testcase "'LUKS1 test key file with offset:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
--keyfile --cs-opts="--keyfile-offset=237"
eval testcase "'LUKS1 test key file with offset and size:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
--keyfile "--cs-opts='--keyfile-offset=237 --keyfile-size=1023'"
eval testcase "'LUKS1 test detached header support:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
--detached-header
eval testcase "'LUKS1 test both detached header and key file:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
--keyfile --detached-header
### LUKS2 tests (mirroring the LUKS1 tests above)
LUKS2_COMMON_OPTS="--luks=2 --cs-opts=--pbkdf=pbkdf2"
eval testcase "'LUKS2 test cryptsetup defaults:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS
eval testcase "'LUKS2 test with twofish cipher:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--cipher twofish-xts-plain64'"
eval testcase "'LUKS2 test key file support:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
--keyfile
eval testcase "'LUKS2 test key file with offset:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
--keyfile --cs-opts="--keyfile-offset=237"
eval testcase "'LUKS2 test key file with offset and size:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
--keyfile "--cs-opts='--keyfile-offset=237 --keyfile-size=1023'"
eval testcase "'LUKS2 test detached header support:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
--detached-header
eval testcase "'LUKS2 test both detached header and key file:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
--keyfile --detached-header
### LUKS1 specific tests
# Tests for xts-plain and xts-plain64 modes
eval testcase "'LUKS1 test cryptsetup xts-plain:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
"--cs-opts='--cipher aes-xts-plain'"
eval testcase "'LUKS1 test cryptsetup xts-plain64:'" \
- @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
"--cs-opts='--cipher aes-xts-plain64'"
### LUKS2 specific tests
eval testcase "'LUKS2 test with 1k sector size:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--sector-size 1024'"
eval testcase "'LUKS2 test with 2k sector size:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--sector-size 2048'"
eval testcase "'LUKS2 test with 4k sector size:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--sector-size 4096'"
eval testcase "'LUKS2 test with non-default key slot:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--key-slot 5'"
eval testcase "'LUKS2 test with different metadata size:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-opts='--luks2-metadata-size 512k'"
eval testcase "'LUKS2 test with argon2 pbkdf:'" \
- @builddir@/grub-shell-luks-tester --luks=2 $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" --luks=2 $COMMON_OPTS \
"--cs-opts='--pbkdf-memory 32'" "--cs-opts='--pbkdf-parallel 1'"
# Add good password to second slot and change first slot to unchecked password
@@ -191,7 +192,7 @@ cat >$csscript <<'EOF'
EOF
eval testcase "'LUKS2 test with second key slot and first slot using different password:'" \
- @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
+ "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
"--cs-script='$csscript'"
test -n "$debug" || rm "$csscript"
--
2.34.1
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote
2025-11-17 6:40 ` [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote Glenn Washburn
@ 2025-11-18 6:35 ` Sudhakar Kuppusamy
0 siblings, 0 replies; 6+ messages in thread
From: Sudhakar Kuppusamy @ 2025-11-18 6:35 UTC (permalink / raw)
To: The development of GNU GRUB; +Cc: Daniel Kiper, Leo Sandoval, Glenn Washburn
> On 17 Nov 2025, at 12:10 PM, Glenn Washburn <development@efficientek.com> wrote:
>
> Using a shell variable instead of an autoconf macro creates less changes
> to the file, which can be desirable when modifying by hand later and
> then diffing with the unexpanded file. It also makes it simpler to
> change the builddir after expansion, which may need to happen when
> moving the build dir to a different path and not being able to rerun
> the autoconf expansion.
>
> Also, add quoting around the builddir variable as there may be spaces
> in the path.
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
Thanks,
Sudhakar
> ---
> tests/grub_cmd_cryptomount.in | 47 ++++++++++++++++++-----------------
> 1 file changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/tests/grub_cmd_cryptomount.in b/tests/grub_cmd_cryptomount.in
> index a4fababa0a80..bcba7c74c1a5 100644
> --- a/tests/grub_cmd_cryptomount.in
> +++ b/tests/grub_cmd_cryptomount.in
> @@ -38,6 +38,7 @@ fi
> COMMON_OPTS='${V:+--debug=$V} --cs-opts="--pbkdf-force-iterations 1000"'
>
> debug=${GRUB_SHELL_DEFAULT_DEBUG:-$GRUB_TEST_DEFAULT_DEBUG}
> +builddir="@builddir@"
>
> _testcase() {
> local EXPECTEDRES=$1
> @@ -92,94 +93,94 @@ testcase_fail() { _testcase 1 "$@"; }
>
> ### LUKS1 tests
> eval testcase "'LUKS1 test cryptsetup defaults:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS
>
> eval testcase "'LUKS1 test with twofish cipher:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> "--cs-opts='--cipher twofish-xts-plain64'"
>
> eval testcase "'LUKS1 test key file support:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> --keyfile
>
> eval testcase "'LUKS1 test key file with offset:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> --keyfile --cs-opts="--keyfile-offset=237"
>
> eval testcase "'LUKS1 test key file with offset and size:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> --keyfile "--cs-opts='--keyfile-offset=237 --keyfile-size=1023'"
>
> eval testcase "'LUKS1 test detached header support:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> --detached-header
>
> eval testcase "'LUKS1 test both detached header and key file:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> --keyfile --detached-header
>
> ### LUKS2 tests (mirroring the LUKS1 tests above)
> LUKS2_COMMON_OPTS="--luks=2 --cs-opts=--pbkdf=pbkdf2"
> eval testcase "'LUKS2 test cryptsetup defaults:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS
>
> eval testcase "'LUKS2 test with twofish cipher:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--cipher twofish-xts-plain64'"
>
> eval testcase "'LUKS2 test key file support:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> --keyfile
>
> eval testcase "'LUKS2 test key file with offset:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> --keyfile --cs-opts="--keyfile-offset=237"
>
> eval testcase "'LUKS2 test key file with offset and size:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> --keyfile "--cs-opts='--keyfile-offset=237 --keyfile-size=1023'"
>
> eval testcase "'LUKS2 test detached header support:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> --detached-header
>
> eval testcase "'LUKS2 test both detached header and key file:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> --keyfile --detached-header
>
> ### LUKS1 specific tests
> # Tests for xts-plain and xts-plain64 modes
> eval testcase "'LUKS1 test cryptsetup xts-plain:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> "--cs-opts='--cipher aes-xts-plain'"
>
> eval testcase "'LUKS1 test cryptsetup xts-plain64:'" \
> - @builddir@/grub-shell-luks-tester --luks=1 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=1 $COMMON_OPTS \
> "--cs-opts='--cipher aes-xts-plain64'"
>
> ### LUKS2 specific tests
> eval testcase "'LUKS2 test with 1k sector size:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--sector-size 1024'"
>
> eval testcase "'LUKS2 test with 2k sector size:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--sector-size 2048'"
>
> eval testcase "'LUKS2 test with 4k sector size:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--sector-size 4096'"
>
> eval testcase "'LUKS2 test with non-default key slot:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--key-slot 5'"
>
> eval testcase "'LUKS2 test with different metadata size:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-opts='--luks2-metadata-size 512k'"
>
> eval testcase "'LUKS2 test with argon2 pbkdf:'" \
> - @builddir@/grub-shell-luks-tester --luks=2 $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" --luks=2 $COMMON_OPTS \
> "--cs-opts='--pbkdf-memory 32'" "--cs-opts='--pbkdf-parallel 1'"
>
> # Add good password to second slot and change first slot to unchecked password
> @@ -191,7 +192,7 @@ cat >$csscript <<'EOF'
> EOF
>
> eval testcase "'LUKS2 test with second key slot and first slot using different password:'" \
> - @builddir@/grub-shell-luks-tester $LUKS2_COMMON_OPTS $COMMON_OPTS \
> + "$builddir/grub-shell-luks-tester" $LUKS2_COMMON_OPTS $COMMON_OPTS \
> "--cs-script='$csscript'"
>
> test -n "$debug" || rm "$csscript"
> --
> 2.34.1
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Expect success for argon2 cryptomount test
2025-11-17 6:40 [PATCH 0/2] Expect success for argon2 cryptomount test Glenn Washburn
2025-11-17 6:40 ` [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2 Glenn Washburn
2025-11-17 6:40 ` [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote Glenn Washburn
@ 2025-11-17 17:46 ` Daniel Kiper
2 siblings, 0 replies; 6+ messages in thread
From: Daniel Kiper @ 2025-11-17 17:46 UTC (permalink / raw)
To: Glenn Washburn; +Cc: grub-devel, Leo Sandoval
On Mon, Nov 17, 2025 at 12:40:24AM -0600, Glenn Washburn wrote:
> Patch #1 fixes a fialing test caused by argon2 integration (which is
> expected because it was written to verify that GRUB could not open
> LUKS2 volumes using an Argon2 keyslot).
>
> The second patch, fixes potential issues with having spaces in the
> builddir path and puts the builddir autoconf macro into a variable
> so it only gets expanded once.
>
> Glenn
>
> Glenn Washburn (2):
> tests/grub_cmd_cryptomount: Expect test success, now that GRUB
> supports Argon2
> tests/grub_cmd_cryptomount: Use builddir shell variable and quote
For both patches Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>...
Daniel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-11-18 6:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-17 6:40 [PATCH 0/2] Expect success for argon2 cryptomount test Glenn Washburn
2025-11-17 6:40 ` [PATCH 1/2] tests/grub_cmd_cryptomount: Expect test success, now that GRUB supports Argon2 Glenn Washburn
2025-11-18 6:35 ` Sudhakar Kuppusamy
2025-11-17 6:40 ` [PATCH 2/2] tests/grub_cmd_cryptomount: Use builddir shell variable and quote Glenn Washburn
2025-11-18 6:35 ` Sudhakar Kuppusamy
2025-11-17 17:46 ` [PATCH 0/2] Expect success for argon2 cryptomount test Daniel Kiper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox