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

Rename 'keyring' member to 'keyring_key_type' in volume_key.

Browse Source 
The keyring field is misleading since the
field indeed contains the type identification
id.
This commit is contained in:
Ondrej Kozina
2024-11-27 11:55:37 +01:00
parent 82bee1c52d
commit 9f1aee46d5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -3357,7 +3357,7 @@ static int _reload_device(struct crypt_device *cd, const char *name,
if (tgt->type == DM_CRYPT && sdmd->flags & CRYPT_ACTIVATE_KEYRING_KEY) {
r = crypt_volume_key_set_description(tgt->u.crypt.vk,
src->u.crypt.vk->key_description,
src->u.crypt.vk->keyring);
src->u.crypt.vk->keyring_key_type);
if (r)
goto out;
} else if (tgt->type == DM_CRYPT) {
@@ -3479,7 +3479,7 @@ static int _reload_device_with_integrity(struct crypt_device *cd,
if (sdmd->flags & CRYPT_ACTIVATE_KEYRING_KEY) {
r = crypt_volume_key_set_description(tgt->u.crypt.vk,
src->u.crypt.vk->key_description,
src->u.crypt.vk->keyring);
src->u.crypt.vk->keyring_key_type);
if (r)
goto out;
} else {