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

Code reshuffle in-before some changes.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-03-09 13:05:34 +01:00
committed by Milan Broz
parent df4ed89141
commit dae91fd9ec
1 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/utils_reencrypt.c
View File

@@ -162,6 +162,66 @@ static int action_reencrypt_load(struct crypt_device *cd, const char *data_devic
return r; return r;
} }
/*
* 1: in-progress
* 0: clean luks2 device
* < 0: error
*/
static int luks2_reencrypt_in_progress(struct crypt_device *cd)
{
uint32_t flags;
struct crypt_params_integrity ip = { 0 };
if (crypt_persistent_flags_get(cd, CRYPT_FLAGS_REQUIREMENTS, &flags))
return -EINVAL;
if (flags & CRYPT_REQUIREMENT_OFFLINE_REENCRYPT) {
log_err(_("Legacy LUKS2 reencryption is no longer supported."));
return -EINVAL;
}
/* raw integrity info is available since 2.0 */
if (crypt_get_integrity_info(cd, &ip) || ip.tag_size) {
log_err(_("Reencryption of device with integrity profile is not supported."));
return -ENOTSUP;
}
return flags & CRYPT_REQUIREMENT_ONLINE_REENCRYPT;
}
static enum device_status_info load_luks(struct crypt_device **r_cd, const char *type, const char *header_device, const char *data_device)
{
int r;
struct crypt_device *cd;
assert(r_cd);
assert(data_device);
if (crypt_init_data_device(&cd, uuid_or_device(header_device ?: data_device), data_device))
return DEVICE_INVALID;
if ((r = crypt_load(cd, type, NULL))) {
crypt_free(cd);
if (r == -EBUSY) /* luks2 locking error (message printed by libcryptsetup) */
return DEVICE_INVALID;
if (!type || isLUKS1(type))
r = reencrypt_luks1_in_progress(uuid_or_device(header_device ?: data_device));
if (!r)
return DEVICE_LUKS1_UNUSABLE;
log_err(_("Device %s is not a valid %s device."),
uuid_or_device(header_device ?: data_device), type ?: "LUKS");
return DEVICE_INVALID;
}
*r_cd = cd;
return isLUKS2(crypt_get_type(cd)) ? DEVICE_LUKS2 : DEVICE_LUKS1;
}
static int action_encrypt_luks2(struct crypt_device **cd, const char *data_device, const char *device_name) static int action_encrypt_luks2(struct crypt_device **cd, const char *data_device, const char *device_name)
{ {
char *tmp; char *tmp;
@@ -765,39 +825,6 @@ out:
return r; return r;
} }
static enum device_status_info load_luks(struct crypt_device **r_cd, const char *type, const char *header_device, const char *data_device)
{
int r;
struct crypt_device *cd;
assert(r_cd);
assert(data_device);
if (crypt_init_data_device(&cd, uuid_or_device(header_device ?: data_device), data_device))
return DEVICE_INVALID;
if ((r = crypt_load(cd, type, NULL))) {
crypt_free(cd);
if (r == -EBUSY) /* luks2 locking error (message printed by libcryptsetup) */
return DEVICE_INVALID;
if (!type || isLUKS1(type))
r = reencrypt_luks1_in_progress(uuid_or_device(header_device ?: data_device));
if (!r)
return DEVICE_LUKS1_UNUSABLE;
log_err(_("Device %s is not a valid %s device."),
uuid_or_device(header_device ?: data_device), type ?: "LUKS");
return DEVICE_INVALID;
}
*r_cd = cd;
return isLUKS2(crypt_get_type(cd)) ? DEVICE_LUKS2 : DEVICE_LUKS1;
}
static enum device_status_info load_luks2_by_name(struct crypt_device **r_cd, const char *active_name, const char *header_device) static enum device_status_info load_luks2_by_name(struct crypt_device **r_cd, const char *active_name, const char *header_device)
{ {
int r; int r;
@@ -819,33 +846,6 @@ static enum device_status_info load_luks2_by_name(struct crypt_device **r_cd, co
return DEVICE_LUKS2; return DEVICE_LUKS2;
} }
/*
* 1: in-progress
* 0: clean luks2 device
* < 0: error
*/
static int luks2_reencrypt_in_progress(struct crypt_device *cd)
{
uint32_t flags;
struct crypt_params_integrity ip = { 0 };
if (crypt_persistent_flags_get(cd, CRYPT_FLAGS_REQUIREMENTS, &flags))
return -EINVAL;
if (flags & CRYPT_REQUIREMENT_OFFLINE_REENCRYPT) {
log_err(_("Legacy LUKS2 reencryption is no longer supported."));
return -EINVAL;
}
/* raw integrity info is available since 2.0 */
if (crypt_get_integrity_info(cd, &ip) || ip.tag_size) {
log_err(_("Reencryption of device with integrity profile is not supported."));
return -ENOTSUP;
}
return flags & CRYPT_REQUIREMENT_ONLINE_REENCRYPT;
}
static int encrypt_luks2(int action_argc, const char **action_argv) static int encrypt_luks2(int action_argc, const char **action_argv)
{ {
enum device_status_info dev_st; enum device_status_info dev_st;