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

Return back check for inactive keyslot for luksKillSlot.

Browse Source
This commit is contained in:
Milan Broz
2018-03-01 13:46:50 +01:00
parent 5968323642
commit b86a652b90
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cryptsetup.c
View File

@@ -1218,6 +1218,18 @@ static int action_luksKillSlot(void)
if ((r = crypt_load(cd, luksType(opt_type), NULL))) if ((r = crypt_load(cd, luksType(opt_type), NULL)))
goto out; goto out;
switch (crypt_keyslot_status(cd, opt_key_slot)) {
case CRYPT_SLOT_ACTIVE_LAST:
case CRYPT_SLOT_ACTIVE:
log_verbose(_("Keyslot %d is selected for deletion.\n"), opt_key_slot);
break;
case CRYPT_SLOT_INACTIVE:
log_err(_("Keyslot %d is not active.\n"), opt_key_slot);
/* pass through */
case CRYPT_SLOT_INVALID:
return -EINVAL;
}
if (!opt_batch_mode || opt_key_file || !isatty(STDIN_FILENO)) { if (!opt_batch_mode || opt_key_file || !isatty(STDIN_FILENO)) {
r = verify_keyslot(cd, opt_key_slot, r = verify_keyslot(cd, opt_key_slot,
_("This is the last keyslot. Device will become unusable after purging this key."), _("This is the last keyslot. Device will become unusable after purging this key."),