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

Detect support for BitLocker EBOIV and Elephant diffuser.

Browse Source 
If kernel is missing support, print a more friendly error.
This commit is contained in:
Milan Broz
2019-12-30 20:52:36 +01:00
parent 3c189b4183
commit eee46ef2f4
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/bitlk/bitlk.c
View File

@@ -878,6 +878,7 @@ int BITLK_activate(struct crypt_device *cd,
uint64_t next_start = 0;
uint64_t next_end = 0;
uint64_t last_segment = 0;
uint32_t dmt_flags;
next_vmk = params->vmks;
while (next_vmk) {
@@ -962,13 +963,6 @@ int BITLK_activate(struct crypt_device *cd,
next_vmk = next_vmk->next;
}
if (strcmp(params->cipher_mode, "cbc-elephant") == 0) {
log_err(cd, _("Activation of BitLocker devices encrypted using AES-CBC with " \
"the Elephant Diffuser is currently not supported"));
crypt_free_volume_key(open_fvek_key);
return -ENOTSUP;
}
r = device_block_adjust(cd, crypt_data_device(cd), DEV_EXCL,
crypt_get_data_offset(cd), &dmd.size, &dmd.flags);
if (r) {
@@ -1093,6 +1087,17 @@ int BITLK_activate(struct crypt_device *cd,
device_path(crypt_data_device(cd)), name ? " with name " :"", name ?: "");
r = dm_create_device(cd, name, CRYPT_BITLK, &dmd);
if (r < 0) {
dm_flags(cd, DM_CRYPT, &dmt_flags);
if (!strcmp(params->cipher_mode, "cbc-eboiv") && !(dmt_flags & DM_BITLK_EBOIV_SUPPORTED)) {
log_err(cd, _("Cannot activate device, kernel dm-crypt is missing support for BitLocker IV."));
r = -ENOTSUP;
}
if (!strcmp(params->cipher_mode, "cbc-elephant") && !(dmt_flags & DM_BITLK_ELEPHANT_SUPPORTED)) {
log_err(cd, _("Cannot activate device, kernel dm-crypt is missing support for BitLocker Elephant diffuser."));
r = -ENOTSUP;
}
}
out:
dm_targets_free(cd, &dmd);
crypt_free_volume_key(open_fvek_key);