From c020fafd66606bf1209c7cb24ba0eed00603dd1d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 20 Apr 2021 18:14:49 +0200 Subject: [PATCH] Fix LUKS2 detached header reencryption test. --- tests/luks2-reencryption-test | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test index c9e4faa6..a8079657 100755 --- a/tests/luks2-reencryption-test +++ b/tests/luks2-reencryption-test @@ -947,13 +947,15 @@ $CRYPTSETUP status $DEV_NAME >/dev/null 2>&1 && fail preparebig 64 ln -s $DEV $DEV_LINK || fail echo $PWD1 | $CRYPTSETUP luksFormat --type luks2 -c serpent-xts-plain -q $FAST_PBKDF_ARGON $DEV || fail -$CRYPTSETUP reencrypt --decrypt $DEV -q 2>/dev/null && fail -$CRYPTSETUP reencrypt --decrypt $DEV --header $DEV -q 2>/dev/null && fail -$CRYPTSETUP reencrypt --decrypt $DEV --header $DEV_LINK -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt $DEV -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt $DEV --header $DEV -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt $DEV --header $DEV_LINK -q 2>/dev/null && fail open_crypt $PWD1 -$CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME -q 2>/dev/null && fail -$CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME --header $DEV -q 2>/dev/null && fail -$CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME --header $DEV_LINK -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME --header $DEV -q 2>/dev/null && fail +echo $PWD1 | $CRYPTSETUP reencrypt --decrypt --active-name $DEV_NAME --header $DEV_LINK -q 2>/dev/null && fail +$CRYPTSETUP status $DEV_NAME | grep -q "reencryption: in-progress" && fail +$CRYPTSETUP close $DEV_NAME if ! dm_delay_features; then echo "dm-delay target is missing, skipping recovery tests."