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

Use crypt_get_old_volume_key_size in action reencrypt.

Browse Source
This commit is contained in:
Ondrej Kozina
2025-05-16 14:12:18 +02:00
committed by Milan Broz
parent 4e94c8d809
commit ae2a7cfc33
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/utils_reencrypt.c
View File

@@ -248,38 +248,6 @@ static int reencrypt_hint_force_offline_reencrypt(const char *data_device)
return 0; return 0;
} }
/* libcryptsetup API does not provide function to get old volume key size directly */
static int reencrypt_get_decrypt_volume_key_size(struct crypt_device *cd, int keyslot)
{
int i;
crypt_keyslot_info ki;
if (keyslot != CRYPT_ANY_SLOT) {
ki = crypt_keyslot_status(cd, keyslot);
if (ki == CRYPT_SLOT_INVALID)
return -EINVAL;
if (ki != CRYPT_SLOT_ACTIVE && ki != CRYPT_SLOT_ACTIVE_LAST)
return -ENOENT;
return crypt_keyslot_get_key_size(cd, keyslot);
}
for (i = 0; i < crypt_keyslot_max(CRYPT_LUKS2); i++) {
switch (crypt_keyslot_status(cd, keyslot)) {
case CRYPT_SLOT_INACTIVE:
case CRYPT_SLOT_UNBOUND:
break;
case CRYPT_SLOT_ACTIVE:
case CRYPT_SLOT_ACTIVE_LAST:
return crypt_keyslot_get_key_size(cd, keyslot);
default:
return -EINVAL;
}
}
return -ENOENT;
}
static int reencrypt_single_key_unlock(struct crypt_device *cd, static int reencrypt_single_key_unlock(struct crypt_device *cd,
const struct crypt_params_reencrypt *params, const struct crypt_params_reencrypt *params,
struct crypt_keyslot_context **r_kc) struct crypt_keyslot_context **r_kc)
@@ -290,16 +258,16 @@ static int reencrypt_single_key_unlock(struct crypt_device *cd,
assert(params); assert(params);
assert(r_kc); assert(r_kc);
if (ARG_SET(OPT_KEY_SIZE_ID))
keysize = ARG_UINT32(OPT_KEY_SIZE_ID) / 8;
if (ARG_SET(OPT_VOLUME_KEY_FILE_ID) || ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) { if (ARG_SET(OPT_VOLUME_KEY_FILE_ID) || ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) {
if (!keysize && params->mode == CRYPT_REENCRYPT_DECRYPT) if (params->mode == CRYPT_REENCRYPT_DECRYPT)
keysize = reencrypt_get_decrypt_volume_key_size(cd, ARG_INT32(OPT_KEY_SLOT_ID)); keysize = crypt_get_old_volume_key_size(cd);
else if (!keysize && params->mode == CRYPT_REENCRYPT_ENCRYPT) else if (params->mode == CRYPT_REENCRYPT_ENCRYPT)
keysize = crypt_get_volume_key_size(cd); keysize = crypt_get_volume_key_size(cd);
if (keysize <= 0 && !ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) { if (!keysize && ARG_SET(OPT_KEY_SIZE_ID))
keysize = ARG_UINT32(OPT_KEY_SIZE_ID) / 8;
if (!keysize && !ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) {
log_err(_("Cannot determine volume key size for LUKS without keyslots, please use --key-size option.")); log_err(_("Cannot determine volume key size for LUKS without keyslots, please use --key-size option."));
return -EINVAL; return -EINVAL;
} }