Imported Upstream version 1.6.7

[platform/upstream/cryptsetup.git] / tests / tcrypt-compat-test

diff --git a/tests/tcrypt-compat-test b/tests/tcrypt-compat-test
index 26ba816..efb0e06 100755 (executable)
--- a/tests/tcrypt-compat-test
+++ b/tests/tcrypt-compat-test
@@ -44,7 +44,7 @@ function test_required()
        $CRYPTSETUP benchmark -h whirlpool | grep "N/A" && skip
 
        echo "REQUIRED CIPHERS TEST"
-       echo "#  Algorithm | Key | Encryption | Decryption"
+       echo "#  Algorithm | Key |  Encryption |  Decryption"
 
        test_one aes-cbc 256
        test_one aes-lrw 384
@@ -65,27 +65,28 @@ function test_required()
 }
 
 test_required
+export LANG=C
 
 [ ! -d $TST_DIR ] && tar xjf tcrypt-images.tar.bz2
 
 echo "HEADER CHECK"
-for file in $(ls $TST_DIR/tc_*) ; do
+for file in $(ls $TST_DIR/[tv]c_*) ; do
        echo -n " $file"
-       echo $PASSWORD | $CRYPTSETUP tcryptDump $file >/dev/null || fail
+       echo $PASSWORD | $CRYPTSETUP tcryptDump --veracrypt $file >/dev/null || fail
        echo " [OK]"
 done
 
 echo "HEADER CHECK (HIDDEN)"
-for file in $(ls $TST_DIR/tc_*-hidden) ; do
+for file in $(ls $TST_DIR/[tv]c_*-hidden) ; do
        echo -n " $file (hidden)"
-       echo $PASSWORD_HIDDEN | $CRYPTSETUP tcryptDump --tcrypt-hidden $file >/dev/null || fail
+       echo $PASSWORD_HIDDEN | $CRYPTSETUP tcryptDump --tcrypt-hidden --veracrypt $file >/dev/null || fail
        echo " [OK]"
 done
 
 echo "HEADER KEYFILES CHECK"
-for file in $(ls $TST_DIR/tck_*) ; do
+for file in $(ls $TST_DIR/[tv]ck_*) ; do
        echo -n " $file"
-       echo $PASSWORD | $CRYPTSETUP tcryptDump -d $TST_DIR/keyfile1 -d $TST_DIR/keyfile2 $file >/dev/null || fail
+       echo $PASSWORD | $CRYPTSETUP tcryptDump --veracrypt -d $TST_DIR/keyfile1 -d $TST_DIR/keyfile2 $file >/dev/null || fail
        echo " [OK]"
 done
 
@@ -95,10 +96,14 @@ if [ $(id -u) != 0 ]; then
        exit 0
 fi
 
-echo "ACTIVATION FS UUID CHECK (LRW/XTS modes only)"
-for file in $(ls $TST_DIR/tc_*-lrw-* $TST_DIR/tc_*-xts-*) ; do
+echo "ACTIVATION FS UUID CHECK"
+for file in $(ls $TST_DIR/[tv]c_*) ; do
        echo -n " $file"
-       echo $PASSWORD | $CRYPTSETUP tcryptOpen -r $file $MAP || fail
+       out=$(echo $PASSWORD | $CRYPTSETUP tcryptOpen --veracrypt -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
        UUID=$(lsblk -n -o UUID /dev/mapper/$MAP)
@@ -107,10 +112,14 @@ for file in $(ls $TST_DIR/tc_*-lrw-* $TST_DIR/tc_*-xts-*) ; do
        echo " [OK]"
 done
 
-echo "ACTIVATION FS UUID (HIDDEN) CHECK (LRW/XTS modes only)"
-for file in $(ls $TST_DIR/tc_*-lrw-*-hidden $TST_DIR/tc_*-xts-*-hidden) ; do
+echo "ACTIVATION FS UUID (HIDDEN) CHECK"
+for file in $(ls $TST_DIR/[tv]c_*-hidden) ; do
        echo -n " $file"
-       echo $PASSWORD_HIDDEN | $CRYPTSETUP tcryptOpen -r $file $MAP --tcrypt-hidden || fail
+       out=$(echo $PASSWORD_HIDDEN | $CRYPTSETUP tcryptOpen --veracrypt -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
        [ "$UUID" != "CAFE-BABE" ] && fail "UUID check failed."