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

Simplify reencrypt_update_flag usage due to version support.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-06-08 16:48:03 +02:00
parent 7b4d5fe067
commit ee5a7d19c9
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/luks2/luks2_reencrypt.c
View File

@@ -1209,22 +1209,14 @@ static int reencrypt_update_flag(struct crypt_device *cd, uint32_t version,
uint32_t reqs; uint32_t reqs;
struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2); struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2);
if (LUKS2_config_get_requirements(cd, hdr, &reqs))
return -EINVAL;
/* nothing to do */
if (enable && (reqs & CRYPT_REQUIREMENT_ONLINE_REENCRYPT))
return -EINVAL;
/* nothing to do */
if (!enable && !(reqs & CRYPT_REQUIREMENT_ONLINE_REENCRYPT))
return -EINVAL;
if (enable) { if (enable) {
log_dbg(cd, "Going to store reencryption requirement flag (version: %u).", version); log_dbg(cd, "Going to store reencryption requirement flag (version: %u).", version);
return LUKS2_config_set_requirement_version(cd, hdr, CRYPT_REQUIREMENT_ONLINE_REENCRYPT, version, commit); return LUKS2_config_set_requirement_version(cd, hdr, CRYPT_REQUIREMENT_ONLINE_REENCRYPT, version, commit);
} }
if (LUKS2_config_get_requirements(cd, hdr, &reqs))
return -EINVAL;
reqs &= ~CRYPT_REQUIREMENT_ONLINE_REENCRYPT; reqs &= ~CRYPT_REQUIREMENT_ONLINE_REENCRYPT;
log_dbg(cd, "Going to wipe reencryption requirement flag."); log_dbg(cd, "Going to wipe reencryption requirement flag.");
@@ -3076,11 +3068,7 @@ static int reencrypt_repair_by_passphrase(
if (r < 0) if (r < 0)
goto out; goto out;
/* removes online-reencrypt flag v1 */ /* replaces old online-reencrypt flag with updated version and commits metadata */
if ((r = reencrypt_update_flag(cd, 0, false, false)))
goto out;
/* adds online-reencrypt flag v2 and commits metadata */
r = reencrypt_update_flag(cd, LUKS2_REENCRYPT_REQ_VERSION, true, true); r = reencrypt_update_flag(cd, LUKS2_REENCRYPT_REQ_VERSION, true, true);
out: out:
LUKS2_reencrypt_unlock(cd, reencrypt_lock); LUKS2_reencrypt_unlock(cd, reencrypt_lock);