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

Do not run reencryption recovery when not needed.

Browse Source
This commit is contained in:
Milan Broz
2022-01-02 16:57:31 +01:00
parent 750afe309f
commit c522996edc
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cryptsetup.c
View File

@@ -1028,6 +1028,7 @@ static int _do_luks2_reencrypt_recovery(struct crypt_device *cd)
{ {
int r; int r;
size_t passwordLen; size_t passwordLen;
const char *msg;
char *password = NULL; char *password = NULL;
struct crypt_params_reencrypt recovery_params = { struct crypt_params_reencrypt recovery_params = {
.flags = CRYPT_REENCRYPT_RECOVERY .flags = CRYPT_REENCRYPT_RECOVERY
@@ -1036,12 +1037,8 @@ static int _do_luks2_reencrypt_recovery(struct crypt_device *cd)
crypt_reencrypt_info ri = crypt_reencrypt_status(cd, NULL); crypt_reencrypt_info ri = crypt_reencrypt_status(cd, NULL);
switch (ri) { switch (ri) {
case CRYPT_REENCRYPT_NONE: case CRYPT_REENCRYPT_NONE:
/* fall through */ return 0;
case CRYPT_REENCRYPT_CLEAN: case CRYPT_REENCRYPT_CLEAN:
if (ARG_SET(OPT_BATCH_MODE_ID) ||
!noDialog(_("Seems device does not require reencryption recovery.\n"
"Do you want to proceed anyway?"), NULL))
return 0;
break; break;
case CRYPT_REENCRYPT_CRASH: case CRYPT_REENCRYPT_CRASH:
if (!ARG_SET(OPT_BATCH_MODE_ID) && if (!ARG_SET(OPT_BATCH_MODE_ID) &&
@@ -1053,8 +1050,12 @@ static int _do_luks2_reencrypt_recovery(struct crypt_device *cd)
return -EINVAL; return -EINVAL;
} }
r = tools_get_key(_("Enter passphrase for reencryption recovery: "), if (ri == CRYPT_REENCRYPT_CLEAN)
&password, &passwordLen, ARG_UINT64(OPT_KEYFILE_OFFSET_ID), msg = _("Enter passphrase to verify reencryption metadata digest: ");
else
msg = _("Enter passphrase for reencryption recovery: ");
r = tools_get_key(msg, &password, &passwordLen, ARG_UINT64(OPT_KEYFILE_OFFSET_ID),
ARG_UINT32(OPT_KEYFILE_SIZE_ID), ARG_STR(OPT_KEY_FILE_ID), ARG_UINT32(OPT_TIMEOUT_ID), ARG_UINT32(OPT_KEYFILE_SIZE_ID), ARG_STR(OPT_KEY_FILE_ID), ARG_UINT32(OPT_TIMEOUT_ID),
verify_passphrase(0), 0, cd); verify_passphrase(0), 0, cd);
if (r < 0) if (r < 0)
@@ -1065,6 +1066,11 @@ static int _do_luks2_reencrypt_recovery(struct crypt_device *cd)
if (r < 0) if (r < 0)
goto out; goto out;
if (ri == CRYPT_REENCRYPT_CLEAN) {
r = 0;
goto out;
}
r = crypt_reencrypt_init_by_passphrase(cd, NULL, password, passwordLen, r = crypt_reencrypt_init_by_passphrase(cd, NULL, password, passwordLen,
ARG_INT32(OPT_KEY_SLOT_ID), ARG_INT32(OPT_KEY_SLOT_ID), NULL, NULL, &recovery_params); ARG_INT32(OPT_KEY_SLOT_ID), ARG_INT32(OPT_KEY_SLOT_ID), NULL, NULL, &recovery_params);
if (r > 0) if (r > 0)