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

Add error message for missing volume key.

Browse Source 
Add specific error message when user does not provide
all necessary volume keys via --volume-key-file or
--volume-key-keyring parameters.
This commit is contained in:
Ondrej Kozina
2025-05-20 12:36:10 +02:00
parent 4d5aa29955
commit 5689fb46e7
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptsetup.c
View File

@@ -1823,6 +1823,8 @@ static int action_open_luks(void)
/* The ordering of kc1 or kc2 does not matter */
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT,
kc1, CRYPT_ANY_SLOT, kc2, activate_flags);
if (r == -ESRCH)
log_err(_("Device requires two volume keys."));
if (r == -EPERM)
log_err(_("Volume key does not match the volume."));
} else {

2
src/utils_reencrypt.c
View File

@@ -299,6 +299,8 @@ static int reencrypt_multi_key_unlock(struct crypt_device *cd,
r = crypt_activate_by_keyslot_context(cd, NULL, ARG_INT32(OPT_KEY_SLOT_ID),
kc1, ARG_INT32(OPT_NEW_KEY_SLOT_ID), kc2,
0);
if (r == -ESRCH)
log_err(_("Device requires two volume keys."));
if (r == -EPERM)
log_err(_("Volume key does not match the volume."));
} else {