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

Add keyring linking API placeholders for multi-key scenarios.

Browse Source
This commit is contained in:
Daniel Zatovic
2023-12-18 16:48:52 +01:00
parent f87f6226aa
commit d1b32a3b64
4 changed files with 87 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptsetup.c
View File

@@ -113,7 +113,7 @@ static int _try_token_unlock(struct crypt_device *cd,
return r;
if (activation)
r = crypt_activate_by_keyslot_context(cd, activated_name, keyslot, kc, activate_flags);
r = crypt_activate_by_keyslot_context(cd, activated_name, keyslot, kc, CRYPT_ANY_SLOT, NULL, activate_flags);
else
r = crypt_resume_by_keyslot_context(cd, activated_name, keyslot, kc);
@@ -147,7 +147,7 @@ static int _try_token_unlock(struct crypt_device *cd,
if (activation)
r = crypt_activate_by_keyslot_context(cd, activated_name, keyslot,
kc, activate_flags);
kc, CRYPT_ANY_SLOT, NULL, activate_flags);
else
r = crypt_resume_by_keyslot_context(cd, activated_name, keyslot, kc);
@@ -1759,7 +1759,7 @@ static int parse_vk_and_keyring_description(
goto out;
}
r = crypt_set_keyring_to_link(cd, key_part, type_part, keyring_part);
r = crypt_set_keyring_to_link(cd, key_part, NULL, type_part, keyring_part);
out:
if (r == -EINVAL)
log_err(_("Invalid --link-vk-to-keyring value."));
@@ -1854,7 +1854,7 @@ static int action_open_luks(void)
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description_activation, &kc);
if (r)
goto out;
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT, kc, activate_flags);
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT, kc, CRYPT_ANY_SLOT, NULL, activate_flags);
if (r)
goto out;
} else {