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

Emit error message for converting inactive keyslot.

Browse Source 
Fixes: #416.
This commit is contained in:
Ondrej Kozina
2018-09-14 11:18:48 +02:00
committed by Milan Broz
parent 114356ad2e
commit 1c6d66fccc
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptsetup.c
View File

@@ -1535,6 +1535,12 @@ static int action_luksConvertKey(void)
if ((r = crypt_load(cd, CRYPT_LUKS2, NULL))) if ((r = crypt_load(cd, CRYPT_LUKS2, NULL)))
goto out; goto out;
if (crypt_keyslot_status(cd, opt_key_slot) == CRYPT_SLOT_INACTIVE) {
r = -EINVAL;
log_err(_("Keyslot %d is not active."), opt_key_slot);
goto out;
}
r = set_pbkdf_params(cd, crypt_get_type(cd)); r = set_pbkdf_params(cd, crypt_get_type(cd));
if (r) { if (r) {
log_err(_("Failed to set pbkdf parameters.")); log_err(_("Failed to set pbkdf parameters."));