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

Update tests for dm-crypt kernel key bugfix.

Browse Source 
cryptsetup now requires dm-crypt v1.18.1 or higher
to use kernel keyring service for passing VKs.

Also, relevant API functions fail if CRYPT_ACTIVATE_KEYRING_KEY
is set, but library is not allowed to use kernel keyring for
VK.
This commit is contained in:
Ondrej Kozina
2018-01-15 18:36:33 +01:00
committed by Milan Broz
parent de76628539
commit 2f890dea18
4 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/test_utils.c
View File

@@ -286,15 +286,15 @@ int _system(const char *command, int warn)
return r;
}
static int t_dm_satisfies_version(unsigned target_maj, unsigned target_min,
unsigned actual_maj, unsigned actual_min)
static int t_dm_satisfies_version(unsigned target_maj, unsigned target_min, unsigned target_patch,
unsigned actual_maj, unsigned actual_min, unsigned actual_patch)
{
if (actual_maj > target_maj)
return 1;
if (actual_maj == target_maj && actual_min >= target_min)
if (actual_maj == target_maj && actual_min > target_min)
return 1;
if (actual_maj == target_maj && actual_min == target_min && actual_patch >= target_patch)
return 1;
return 0;
}
@@ -309,30 +309,30 @@ static void t_dm_set_crypt_compat(const char *dm_version, unsigned crypt_maj,
dm_patch = 0;
}
if (t_dm_satisfies_version(1, 2, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 2, 0, crypt_maj, crypt_min, 0))
t_dm_crypt_flags |= T_DM_KEY_WIPE_SUPPORTED;
if (t_dm_satisfies_version(1, 10, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 10, 0, crypt_maj, crypt_min, 0))
t_dm_crypt_flags |= T_DM_LMK_SUPPORTED;
if (t_dm_satisfies_version(4, 20, dm_maj, dm_min))
if (t_dm_satisfies_version(4, 20, 0, dm_maj, dm_min, 0))
t_dm_crypt_flags |= T_DM_SECURE_SUPPORTED;
if (t_dm_satisfies_version(1, 8, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 8, 0, crypt_maj, crypt_min, 0))
t_dm_crypt_flags |= T_DM_PLAIN64_SUPPORTED;
if (t_dm_satisfies_version(1, 11, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 11, 0, crypt_maj, crypt_min, 0))
t_dm_crypt_flags |= T_DM_DISCARDS_SUPPORTED;
if (t_dm_satisfies_version(1, 13, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 13, 0, crypt_maj, crypt_min, 0))
t_dm_crypt_flags |= T_DM_TCW_SUPPORTED;
if (t_dm_satisfies_version(1, 14, crypt_maj, crypt_min)) {
if (t_dm_satisfies_version(1, 14, 0, crypt_maj, crypt_min, 0)) {
t_dm_crypt_flags |= T_DM_SAME_CPU_CRYPT_SUPPORTED;
t_dm_crypt_flags |= T_DM_SUBMIT_FROM_CRYPT_CPUS_SUPPORTED;
}
if (t_dm_satisfies_version(1, 15, crypt_maj, crypt_min))
if (t_dm_satisfies_version(1, 18, 1, crypt_maj, crypt_min, crypt_patch))
t_dm_crypt_flags |= T_DM_KERNEL_KEYRING_SUPPORTED;
}
@@ -349,7 +349,7 @@ static void t_dm_set_verity_compat(const char *dm_version, unsigned verity_maj,
* (but some dm-verity targets 1.2 don't support it)
* FEC is added in 1.3 as well.
*/
if (t_dm_satisfies_version(1, 3, verity_maj, verity_min)) {
if (t_dm_satisfies_version(1, 3, 0, verity_maj, verity_min, 0)) {
t_dm_crypt_flags |= T_DM_VERITY_ON_CORRUPTION_SUPPORTED;
t_dm_crypt_flags |= T_DM_VERITY_FEC_SUPPORTED;
}