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

Add explicit key type name in keyring functions.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-02-22 11:06:13 +01:00
committed by Milan Broz
parent 56b571fcaa
commit 37f5bda227
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/setup.c
View File

@@ -5384,11 +5384,11 @@ int crypt_volume_key_load_in_keyring(struct crypt_device *cd, struct volume_key
return -EINVAL; return -EINVAL;
} }
log_dbg(cd, "Loading key (%zu bytes) in thread keyring.", vk->keylength); log_dbg(cd, "Loading key (%zu bytes, type %s) in thread keyring.", vk->keylength, "logon");
r = keyring_add_key_in_thread_keyring(vk->key_description, vk->key, vk->keylength); r = keyring_add_logon_key_in_thread_keyring(vk->key_description, vk->key, vk->keylength);
if (r) { if (r) {
log_dbg(cd, "keyring_add_key_in_thread_keyring failed (error %d)", r); log_dbg(cd, "keyring_add_logon_key_in_thread_keyring failed (error %d)", r);
log_err(cd, _("Failed to load key in kernel keyring.")); log_err(cd, _("Failed to load key in kernel keyring."));
} else } else
crypt_set_key_in_keyring(cd, 1); crypt_set_key_in_keyring(cd, 1);
@@ -5419,11 +5419,11 @@ void crypt_drop_keyring_key(struct crypt_device *cd, const char *key_description
if (!key_description) if (!key_description)
return; return;
log_dbg(cd, "Requesting keyring key for revoke and unlink."); log_dbg(cd, "Requesting keyring logon key for revoke and unlink.");
r = keyring_revoke_and_unlink_key(key_description); r = keyring_revoke_and_unlink_logon_key(key_description);
if (r) if (r)
log_dbg(cd, "keyring_revoke_and_unlink failed (error %d)", r); log_dbg(cd, "keyring_revoke_and_unlink_logon_key failed (error %d)", r);
crypt_set_key_in_keyring(cd, 0); crypt_set_key_in_keyring(cd, 0);
} }

4
lib/utils_keyring.c
View File

@@ -86,7 +86,7 @@ int keyring_check(void)
#endif #endif
} }
int keyring_add_key_in_thread_keyring(const char *key_desc, const void *key, size_t key_size) int keyring_add_logon_key_in_thread_keyring(const char *key_desc, const void *key, size_t key_size)
{ {
#ifdef KERNEL_KEYRING #ifdef KERNEL_KEYRING
key_serial_t kid; key_serial_t kid;
@@ -148,7 +148,7 @@ int keyring_get_passphrase(const char *key_desc,
#endif #endif
} }
int keyring_revoke_and_unlink_key(const char *key_desc) int keyring_revoke_and_unlink_logon_key(const char *key_desc)
{ {
#ifdef KERNEL_KEYRING #ifdef KERNEL_KEYRING
key_serial_t kid; key_serial_t kid;

4
lib/utils_keyring.h
View File

@@ -30,11 +30,11 @@ int keyring_get_passphrase(const char *key_desc,
char **passphrase, char **passphrase,
size_t *passphrase_len); size_t *passphrase_len);
int keyring_add_key_in_thread_keyring( int keyring_add_logon_key_in_thread_keyring(
const char *key_desc, const char *key_desc,
const void *key, const void *key,
size_t key_size); size_t key_size);
int keyring_revoke_and_unlink_key(const char *key_desc); int keyring_revoke_and_unlink_logon_key(const char *key_desc);
#endif #endif