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

Reduce code duplication in kernel keyring utilities.

Browse Source
This commit is contained in:
Ondrej Kozina
2023-09-08 11:44:30 +02:00
committed by Milan Broz
parent c497d8baa9
commit f147c823ea
5 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/luks2/luks2_reencrypt.c
View File

@@ -3873,7 +3873,7 @@ int crypt_reencrypt_init_by_keyring(struct crypt_device *cd,
return -EINVAL;
}
r = keyring_get_passphrase(passphrase_description, &passphrase, &passphrase_size);
r = keyring_get_user_key(passphrase_description, &passphrase, &passphrase_size);
if (r < 0) {
log_err(cd, _("Failed to read passphrase from keyring (error %d)."), r);
return -EINVAL;

4
lib/luks2/luks2_token_keyring.c
View File

@@ -40,12 +40,12 @@ int keyring_open(struct crypt_device *cd,
json_object_object_get_ex(jobj_token, "key_description", &jobj_key);
r = keyring_get_passphrase(json_object_get_string(jobj_key), buffer, buffer_len);
r = keyring_get_user_key(json_object_get_string(jobj_key), buffer, buffer_len);
if (r == -ENOTSUP) {
log_dbg(cd, "Kernel keyring features disabled.");
return -ENOENT;
} else if (r < 0) {
log_dbg(cd, "keyring_get_passphrase failed (error %d)", r);
log_dbg(cd, "keyring_get_user_key failed (error %d)", r);
return -EPERM;
}