eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2026-01-10 09:25:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove undeeded version test for BITLK compat tests.

Browse Source 
Otherwise it starts failing with dm-crypt version bump.
This commit is contained in:
Milan Broz
2020-01-03 10:15:59 +01:00
parent 0505c70be2
commit 7b08fd4b7d
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/bitlk-compat-test
View File

@@ -6,7 +6,6 @@
CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
TST_DIR=bitlk-images
MAP=bitlktst
EBOIV_VERSION="1.19.0"
[ -z "$srcdir" ] && srcdir="."
@@ -32,15 +31,6 @@ function skip()
exit 77
}
function check_eboiv()
{
modprobe dm-crypt >/dev/null 2>&1
crypt_version=$(dmsetup targets | grep crypt | cut -d"v" -f2)
[ ! -z "$crypt_version" ] || exit 1
[ "$(printf '%s\n' "$crypt_version" | sort -V | head -1)" = "$EBOIV_VERSION" ]
}
function load_vars()
{
local file=$(echo $1 | sed -e s/^$TST_DIR\\/// | sed -e s/\.img$//)
@@ -97,8 +87,6 @@ if [ $(id -u) != 0 ]; then
exit 0
fi
check_eboiv
has_eboiv=$?
remove_mapping
echo "ACTIVATION FS UUID CHECK"
@@ -112,10 +100,10 @@ for file in $(ls $TST_DIR/bitlk-*) ; do
echo $PASSPHRASE | $CRYPTSETUP bitlkOpen -r $file --test-passphrase >/dev/null 2>&1
ret=$?
[ $ret -eq 1 ] && echo " [N/A]" && continue
[ $has_eboiv -eq 1 ] && [ "$CIPHER" = "aes-cbc-eboiv" ] && echo " eboiv not supported [N/A]" && continue
echo $PASSPHRASE | $CRYPTSETUP bitlkOpen -r $file $MAP >/dev/null 2>&1
ret=$?
[ $ret -eq 1 ] && ( echo "$file" | grep -q -e "cbc-elephant" ) && echo " [N/A]" && continue
[ $ret -eq 1 ] && ( echo "$file" | grep -q -e "aes-cbc" ) && echo " [N/A]" && continue
[ $ret -eq 1 ] && ( echo "$file" | grep -q -e "aes-cbc-elephant" ) && echo " [N/A]" && continue
[ $ret -eq 1 ] && ( echo "$file" | grep -q -e "clearkey" ) && echo " [N/A]" && continue
[ $ret -eq 0 ] || fail " failed to open $file ($ret)"
$CRYPTSETUP status $MAP >/dev/null || fail