eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run keyring test only for recent kernels.

Browse Source
This commit is contained in:
Milan Broz
2019-01-31 16:31:09 +01:00
parent a68f3939cf
commit dc8db34155
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/compat-test2
View File

@@ -183,6 +183,18 @@ function dm_crypt_keyring_flawed()
return 1 return 1
} }
function dm_crypt_keyring_new_kernel()
{
KER_STR=$(uname -r)
[ -z "$KER_STR" ] && fail "Failed to parse kernel version."
KER_MAJ=$(echo $KER_STR | cut -f 1 -d.)
KER_MIN=$(echo $KER_STR | cut -f 2 -d.)
[ $KER_MAJ -ge 5 ] && return 0
[ $KER_MAJ -eq 4 -a $KER_MIN -ge 15 ] && return 0
return 1
}
function test_and_prepare_keyring() { function test_and_prepare_keyring() {
which keyctl > /dev/null 2>&1 || skip "Cannot find keyctl, test skipped" which keyctl > /dev/null 2>&1 || skip "Cannot find keyctl, test skipped"
keyctl list "@s" > /dev/null || skip "Current session keyring is unreachable, test skipped" keyctl list "@s" > /dev/null || skip "Current session keyring is unreachable, test skipped"
@@ -706,15 +718,16 @@ if dm_crypt_keyring_flawed; then
fi fi
fi fi
if dm_crypt_keyring_support; then if dm_crypt_keyring_support && dm_crypt_keyring_new_kernel; then
prepare "[32] LUKS2 key in keyring" wipe prepare "[32] LUKS2 key in keyring" wipe
echo $PWD1 | $CRYPTSETUP luksFormat $FAST_PBKDF_OPT --type luks2 $LOOPDEV --header $HEADER_IMG || fail echo $PWD1 | $CRYPTSETUP luksFormat $FAST_PBKDF_OPT --type luks2 $LOOPDEV --header $HEADER_IMG || fail
# check keyring support detection works as expected # check keyring support detection works as expected
rmmod dm-crypt > /dev/null 2>&1 || true rmmod dm-crypt > /dev/null 2>&1 || true
echo $PWD1 | $CRYPTSETUP open $LOOPDEV --header $HEADER_IMG $DEV_NAME || fail echo $PWD1 | $CRYPTSETUP open $LOOPDEV --header $HEADER_IMG $DEV_NAME || fail
$CRYPTSETUP -q status $DEV_NAME | grep "key location:" | grep -q "keyring" || fail $CRYPTSETUP -q status $DEV_NAME | grep "key location:" | grep -q "keyring" || fail
$CRYPTSETUP close $DEV_NAME || fail $CRYPTSETUP close $DEV_NAME || fail
echo $PWD1 | $CRYPTSETUP open $LOOPDEV --disable-keyring --header $HEADER_IMG $DEV_NAME || fail echo $PWD1 | $CRYPTSETUP open $LOOPDEV --disable-keyring --header $HEADER_IMG $DEV_NAME || fail
$CRYPTSETUP -q status $DEV_NAME | grep "key location:" | grep -q "dm-crypt" || fail $CRYPTSETUP -q status $DEV_NAME | grep "key location:" | grep -q "dm-crypt" || fail
$CRYPTSETUP close $DEV_NAME || fail $CRYPTSETUP close $DEV_NAME || fail