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

Explicitly print error message if keyslot open failed.

Browse Source 
The only quiet message now is EPERM (wrong password) that is
processed by the caller.

Fixes #488.
This commit is contained in:
Milan Broz
2019-10-11 14:06:49 +02:00
parent bb857dcef2
commit 206b70c837
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/luks2/luks2_keyslot.c
View File

@@ -547,6 +547,11 @@ out:
if (r < 0) { if (r < 0) {
crypt_free_volume_key(*vks); crypt_free_volume_key(*vks);
*vks = NULL; *vks = NULL;
if (r == -ENOMEM)
log_err(cd, _("Not enough available memory to open a keyslot."));
else if (r != -EPERM)
log_err(cd, _("Keyslot open failed."));
} }
return r; return r;
} }
@@ -579,6 +584,13 @@ int LUKS2_keyslot_open(struct crypt_device *cd,
} else } else
r = LUKS2_open_and_verify(cd, hdr, keyslot, segment, password, password_len, vk); r = LUKS2_open_and_verify(cd, hdr, keyslot, segment, password, password_len, vk);
if (r < 0) {
if (r == -ENOMEM)
log_err(cd, _("Not enough available memory to open a keyslot."));
else if (r != -EPERM)
log_err(cd, _("Keyslot open failed."));
}
return r; return r;
} }