diff --git a/lib/setup.c b/lib/setup.c index 3a724332..5e3121c9 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -5384,11 +5384,11 @@ int crypt_volume_key_load_in_keyring(struct crypt_device *cd, struct volume_key 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) { - 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.")); } else 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) 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) - 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); } diff --git a/lib/utils_keyring.c b/lib/utils_keyring.c index 475cfbc8..18b38d89 100644 --- a/lib/utils_keyring.c +++ b/lib/utils_keyring.c @@ -86,7 +86,7 @@ int keyring_check(void) #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 key_serial_t kid; @@ -148,7 +148,7 @@ int keyring_get_passphrase(const char *key_desc, #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 key_serial_t kid; diff --git a/lib/utils_keyring.h b/lib/utils_keyring.h index 1a92b5f1..ea8ac03a 100644 --- a/lib/utils_keyring.h +++ b/lib/utils_keyring.h @@ -30,11 +30,11 @@ int keyring_get_passphrase(const char *key_desc, char **passphrase, size_t *passphrase_len); -int keyring_add_key_in_thread_keyring( +int keyring_add_logon_key_in_thread_keyring( const char *key_desc, const void *key, 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