From 005855ce90e1074d0593aa34a64992868eb6dd21 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 10 Mar 2011 22:12:03 +0000 Subject: [PATCH] Allow tests to work with different default cipher/mode. git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@441 36d66b0a-2a48-0410-832c-cd162a569da5 --- tests/align-test | 4 ++-- tests/compat-test | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/align-test b/tests/align-test index 57d8c07..3e2f396 100755 --- a/tests/align-test +++ b/tests/align-test @@ -43,10 +43,10 @@ format() # key_bits expected [forced] { if [ -z "$3" ] ; then echo -n "Formatting using topology info ($1 bits key)...." - echo xxx| $CRYPTSETUP luksFormat $DEV -q -i1 -s $1 + echo xxx| $CRYPTSETUP luksFormat $DEV -q -i1 -c aes-cbc-essiv:sha256 -s $1 else echo -n "Formatting using forced sector alignment $3 ($1 bits key)..." - echo xxx| $CRYPTSETUP luksFormat $DEV -q -i1 -s $1 --align-payload=$2 + echo xxx| $CRYPTSETUP luksFormat $DEV -q -i1 -s $1 -c aes-cbc-essiv:sha256 --align-payload=$2 fi ALIGN=$($CRYPTSETUP luksDump $DEV |grep "Payload offset" | sed -e s/.*\\t//) diff --git a/tests/compat-test b/tests/compat-test index f6c732a..228fc4a 100755 --- a/tests/compat-test +++ b/tests/compat-test @@ -199,7 +199,7 @@ tst=$($CRYPTSETUP -q luksUUID $LOOPDEV) prepare "[16] luksFormat" wipe echo "key0" | $CRYPTSETUP -q luksFormat --master-key-file /dev/urandom $LOOPDEV || fail echo "key0" | $CRYPTSETUP -q luksFormat --master-key-file /dev/urandom $LOOPDEV -d $KEY1 || fail -$CRYPTSETUP -q luksFormat --master-key-file /dev/urandom -s 128 --uuid $TEST_UUID $LOOPDEV $KEY1 || fail +$CRYPTSETUP -q luksFormat --master-key-file /dev/urandom -s 256 --uuid $TEST_UUID $LOOPDEV $KEY1 || fail $CRYPTSETUP luksOpen -d $KEY1 $LOOPDEV $DEV_NAME || fail $CRYPTSETUP -q luksClose $DEV_NAME || fail -- 2.7.4