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

Support specifying keyring and key using keyctl syntax.

Browse Source 
When using the --link-vk-to-keyring option, allow specifying the keyring
using the same syntax as keyctl (see "man keyctl"). E.g. "@u" for user
keyring and "%:testring" for a user-created keyring.
This commit is contained in:
Daniel Zatovic
2023-03-09 14:32:15 +01:00
parent a674fb968c
commit 1f2dac34d0
6 changed files with 222 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/setup.c
View File

@@ -61,7 +61,7 @@ struct crypt_device {
unsigned key_in_keyring:1;
bool link_vk_to_keyring;
int keyring_to_link_vk;
int32_t keyring_to_link_vk;
key_type_t keyring_key_type;
uint64_t data_offset;
@@ -7254,12 +7254,25 @@ void crypt_drop_keyring_key_by_description(struct crypt_device *cd, const char *
crypt_set_key_in_keyring(cd, 0);
}
void crypt_set_keyring_to_link(struct crypt_device *cd, int keyring_to_link_vk)
int crypt_set_keyring_to_link(struct crypt_device *cd, const char *keyring_to_link_vk)
{
if (cd) {
cd->link_vk_to_keyring = true;
cd->keyring_to_link_vk = keyring_to_link_vk;
int32_t id = 0;
if (!cd)
return -EINVAL;
if (keyring_to_link_vk) {
id = keyring_by_name(keyring_to_link_vk);
if (id == 0) {
log_err(cd, _("Invalid keyring format \"%s\"."), keyring_to_link_vk);
return -EINVAL;
}
}
cd->keyring_to_link_vk = id;
cd->link_vk_to_keyring = id != 0;
return 0;
}
int crypt_set_vk_keyring_type(struct crypt_device *cd, const char *key_type_desc)