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

Drop unused type parameter from LUKS2_keyslot_find_empty()

Browse Source
This commit is contained in:
Ondrej Kozina
2019-04-10 15:54:20 +02:00
committed by Milan Broz
parent cfe2fb66ab
commit 86b2736480
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -396,7 +396,7 @@ static int keyslot_verify_or_find_empty(struct crypt_device *cd, int *keyslot)
if (isLUKS1(cd->type))
*keyslot = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
else
*keyslot = LUKS2_keyslot_find_empty(&cd->u.luks2.hdr, "luks2");
*keyslot = LUKS2_keyslot_find_empty(&cd->u.luks2.hdr);
if (*keyslot < 0) {
log_err(cd, _("All key slots full."));
return -EINVAL;
@@ -3228,7 +3228,7 @@ int crypt_keyslot_change_by_passphrase(struct crypt_device *cd,
if (isLUKS1(cd->type))
keyslot_new = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
else if (isLUKS2(cd->type))
keyslot_new = LUKS2_keyslot_find_empty(&cd->u.luks2.hdr, "luks2"); // FIXME
keyslot_new = LUKS2_keyslot_find_empty(&cd->u.luks2.hdr);
if (keyslot_new < 0)
keyslot_new = keyslot_old;
}