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

Add new functions for kernel keyring handling.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-02-22 11:30:49 +01:00
committed by Milan Broz
parent 37f5bda227
commit 4bb1fff15d
2 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/utils_keyring.c
View File

@@ -101,6 +101,45 @@ int keyring_add_logon_key_in_thread_keyring(const char *key_desc, const void *ke
#endif
}
int keyring_add_user_key_in_thread_keyring(const char *key_desc, const void *key, size_t key_size)
{
#ifdef KERNEL_KEYRING
key_serial_t kid;
kid = add_key("user", key_desc, key, key_size, KEY_SPEC_THREAD_KEYRING);
if (kid < 0)
return -errno;
return 0;
#else
return -ENOTSUP;
#endif
}
/* currently used in client utilities only */
int keyring_add_key_in_user_keyring(const char *type, const char *key_desc, const void *key, size_t key_size)
{
#ifdef KERNEL_KEYRING
key_serial_t kid;
kid = add_key(type, key_desc, key, key_size, KEY_SPEC_USER_KEYRING);
if (kid < 0)
return -errno;
return 0;
#else
return -ENOTSUP;
#endif
}
/* alias for the same code */
int keyring_get_key(const char *key_desc,
char **key,
size_t *key_size)
{
return keyring_get_passphrase(key_desc, key, key_size);
}
int keyring_get_passphrase(const char *key_desc,
char **passphrase,
size_t *passphrase_len)
@@ -148,13 +187,13 @@ int keyring_get_passphrase(const char *key_desc,
#endif
}
int keyring_revoke_and_unlink_logon_key(const char *key_desc)
static int keyring_revoke_and_unlink_key_type(const char *type, const char *key_desc)
{
#ifdef KERNEL_KEYRING
key_serial_t kid;
do
kid = request_key("logon", key_desc, NULL, 0);
kid = request_key(type, key_desc, NULL, 0);
while (kid < 0 && errno == EINTR);
if (kid < 0)
@@ -177,3 +216,13 @@ int keyring_revoke_and_unlink_logon_key(const char *key_desc)
return -ENOTSUP;
#endif
}
int keyring_revoke_and_unlink_logon_key(const char *key_desc)
{
return keyring_revoke_and_unlink_key_type("logon", key_desc);
}
int keyring_revoke_and_unlink_user_key(const char *key_desc)
{
return keyring_revoke_and_unlink_key_type("user", key_desc);
}

16
lib/utils_keyring.h
View File

@@ -26,6 +26,10 @@
int keyring_check(void);
int keyring_get_key(const char *key_desc,
char **key,
size_t *key_size);
int keyring_get_passphrase(const char *key_desc,
char **passphrase,
size_t *passphrase_len);
@@ -35,6 +39,18 @@ int keyring_add_logon_key_in_thread_keyring(
const void *key,
size_t key_size);
int keyring_add_user_key_in_thread_keyring(
const char *key_desc,
const void *key,
size_t key_size);
int keyring_add_key_in_user_keyring(
const char *type,
const char *key_desc,
const void *key,
size_t key_size);
int keyring_revoke_and_unlink_logon_key(const char *key_desc);
int keyring_revoke_and_unlink_user_key(const char *key_desc);
#endif