From 872becdbbd95544dc31c575ef09c79e29bafa3d1 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 27 Jul 2014 19:39:53 +0200 Subject: [PATCH] Handle also missing support for tcrypt test in kernel properly. --- tests/tcrypt-compat-test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tcrypt-compat-test b/tests/tcrypt-compat-test index c978b83f..8214e8e4 100755 --- a/tests/tcrypt-compat-test +++ b/tests/tcrypt-compat-test @@ -102,6 +102,7 @@ for file in $(ls $TST_DIR/tc_*) ; do out=$(echo $PASSWORD | $CRYPTSETUP tcryptOpen -r $file $MAP 2>&1) ret=$? [ $ret -eq 1 ] && ( echo "$out" | grep -q -e "TCRYPT legacy mode" ) && echo " [N/A]" && continue + [ $ret -eq 1 ] && ( echo "$out" | grep -q -e "TCRYPT compatible mapping" ) && echo " [N/A]" && continue [ $ret -ne 0 ] && fail $CRYPTSETUP status $MAP >/dev/null || fail $CRYPTSETUP status /dev/mapper/$MAP >/dev/null || fail @@ -117,6 +118,7 @@ for file in $(ls $TST_DIR/tc_*-hidden) ; do out=$(echo $PASSWORD_HIDDEN | $CRYPTSETUP tcryptOpen -r $file $MAP --tcrypt-hidden 2>&1) ret=$? [ $ret -eq 1 ] && ( echo "$out" | grep -q -e "TCRYPT legacy mode" ) && echo " [N/A]" && continue + [ $ret -eq 1 ] && ( echo "$out" | grep -q -e "TCRYPT compatible mapping" ) && echo " [N/A]" && continue [ $ret -ne 0 ] && fail UUID=$(lsblk -n -o UUID /dev/mapper/$MAP) $CRYPTSETUP remove $MAP || fail