From e3fb6771d6e2bec8210b376d5fe8a42bff3e95de Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 12 Jul 2019 14:14:59 +0200 Subject: [PATCH] Re-enable mode test for LUKS2. Since release 2.1.0 mode test for LUKS2 is skipped due to small test image. Enforce smaller LUKS2 metadata via --offset to reenable the test. Also detect failure for open action if format pass earlier. --- tests/mode-test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/mode-test b/tests/mode-test index 4322818b..d16482fd 100755 --- a/tests/mode-test +++ b/tests/mode-test @@ -116,14 +116,14 @@ dmcrypt() echo $PASSWORD | $CRYPTSETUP luksFormat --type luks1 -i 1 -c $1 -s 256 /dev/mapper/$DEV_NAME >/dev/null 2>&1 if [ $? -eq 0 ] ; then echo -n -e " LUKS1:" - echo $PASSWORD | $CRYPTSETUP luksOpen /dev/mapper/$DEV_NAME "$DEV_NAME"_tstdev >/dev/null 2>&1 + echo $PASSWORD | $CRYPTSETUP luksOpen /dev/mapper/$DEV_NAME "$DEV_NAME"_tstdev >/dev/null 2>&1 || fail dmcrypt_check "$DEV_NAME"_tstdev $OUT fi - echo $PASSWORD | $CRYPTSETUP luksFormat --type luks2 --pbkdf pbkdf2 -i 1 -c $1 -s 256 /dev/mapper/$DEV_NAME >/dev/null 2>&1 + echo $PASSWORD | $CRYPTSETUP luksFormat --type luks2 --pbkdf pbkdf2 -i 1 -c $1 -s 256 --offset 8192 /dev/mapper/$DEV_NAME >/dev/null 2>&1 if [ $? -eq 0 ] ; then echo -n -e " LUKS2:" - echo $PASSWORD | $CRYPTSETUP luksOpen /dev/mapper/$DEV_NAME "$DEV_NAME"_tstdev >/dev/null 2>&1 + echo $PASSWORD | $CRYPTSETUP luksOpen /dev/mapper/$DEV_NAME "$DEV_NAME"_tstdev >/dev/null 2>&1 || fail dmcrypt_check "$DEV_NAME"_tstdev $OUT fi