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

Add error message when assigning token to inactive keyslot.

Browse Source 
While adding or importing new token and assigning immediately to
keyslot it would be useful to provide specific error message
directly from cryptsetup utility when keyslot does not exist.
This commit is contained in:
Ondrej Kozina
2021-08-23 14:42:46 +02:00
committed by Milan Broz
parent 8c28774917
commit 46b70d7317
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cryptsetup.c
View File

@@ -2624,6 +2624,11 @@ static int _token_add(struct crypt_device *cd)
}
}
if (crypt_keyslot_status(cd, ARG_INT32(OPT_KEY_SLOT_ID)) == CRYPT_SLOT_INACTIVE) {
log_err(_("Keyslot %d is not active."), ARG_INT32(OPT_KEY_SLOT_ID));
return -EINVAL;
}
r = crypt_token_luks2_keyring_set(cd, ARG_INT32(OPT_TOKEN_ID_ID), &params);
if (r < 0) {
log_err(_("Failed to add luks2-keyring token %d."), ARG_INT32(OPT_TOKEN_ID_ID));
@@ -2676,6 +2681,11 @@ static int _token_import(struct crypt_device *cd)
}
}
if (crypt_keyslot_status(cd, ARG_INT32(OPT_KEY_SLOT_ID)) == CRYPT_SLOT_INACTIVE) {
log_err(_("Keyslot %d is not active."), ARG_INT32(OPT_KEY_SLOT_ID));
return -EINVAL;
}
r = tools_read_json_file(ARG_STR(OPT_JSON_FILE_ID), &json, &json_length, ARG_SET(OPT_BATCH_MODE_ID));
if (r)
return r;