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

Remove keyring_add_key_to_custom_keyring function.

Browse Source 
The was identical function in keyring utilities already,
except the function name.
This commit is contained in:
Ondrej Kozina
2025-02-24 14:02:00 +01:00
committed by Milan Broz
parent d792de66d5
commit c9edd942e8
3 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -4284,12 +4284,12 @@ static key_serial_t crypt_single_volume_key_load_in_user_keyring(struct crypt_de
log_dbg(cd, "Linking volume key (type %s, name %s) to the specified keyring",
type_name, user_key_name);
kid = keyring_add_key_to_custom_keyring(cd->keyring_key_type, user_key_name,
kid = keyring_add_key_to_keyring(cd->keyring_key_type, user_key_name,
crypt_volume_key_get_key(vk),
crypt_volume_key_length(vk),
cd->keyring_to_link_vk);
if (kid <= 0)
log_dbg(cd, "The keyring_link_key_to_keyring function failed (error %d).", errno);
log_dbg(cd, "The keyring_add_key_to_keyring function failed (error %d).", errno);
return kid;
}

20
lib/utils_keyring.c
View File

@@ -191,7 +191,7 @@ int keyring_check(void)
return syscall(__NR_request_key, "logon", "dummy", NULL, 0) == -1l && errno != ENOSYS;
}
static key_serial_t keyring_add_key_in_keyring(key_type_t ktype,
key_serial_t keyring_add_key_to_keyring(key_type_t ktype,
const char *key_desc,
const void *key,
size_t key_size,
@@ -207,7 +207,7 @@ static key_serial_t keyring_add_key_in_keyring(key_type_t ktype,
key_serial_t keyring_add_key_in_thread_keyring(key_type_t ktype, const char *key_desc, const void *key, size_t key_size)
{
return keyring_add_key_in_keyring(ktype, key_desc, key, key_size, KEY_SPEC_THREAD_KEYRING);
return keyring_add_key_to_keyring(ktype, key_desc, key, key_size, KEY_SPEC_THREAD_KEYRING);
}
key_serial_t keyring_request_key_id(key_type_t key_type,
@@ -404,20 +404,6 @@ key_type_t key_type_by_name(const char *name)
return INVALID_KEY;
}
key_serial_t keyring_add_key_to_custom_keyring(key_type_t ktype,
const char *key_desc,
const void *key,
size_t key_size,
key_serial_t keyring_to_link)
{
const char *type_name = key_type_name(ktype);
if (!type_name || !key_desc)
return -EINVAL;
return add_key(type_name, key_desc, key, key_size, keyring_to_link);
}
#else /* KERNEL_KEYRING */
#pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -474,7 +460,7 @@ key_type_t key_type_by_name(const char *name)
return INVALID_KEY;
}
key_serial_t keyring_add_key_to_custom_keyring(key_type_t ktype,
key_serial_t keyring_add_key_to_keyring(key_type_t ktype,
const char *key_desc,
const void *key,
size_t key_size,

2
lib/utils_keyring.h
View File

@@ -40,7 +40,7 @@ key_serial_t keyring_add_key_in_thread_keyring(
const void *key,
size_t key_size);
key_serial_t keyring_add_key_to_custom_keyring(key_type_t ktype, const char *key_desc, const void *key,
key_serial_t keyring_add_key_to_keyring(key_type_t ktype, const char *key_desc, const void *key,
size_t key_size, key_serial_t keyring_to_link);
int keyring_unlink_key_from_keyring(key_serial_t kid, key_serial_t keyring_id);
int keyring_unlink_key_from_thread_keyring(key_serial_t kid);