From c9edd942e8425bec2726207e25a338c1bd6a41cf Mon Sep 17 00:00:00 2001
From: Ondrej Kozina <okozina@redhat.com>
Date: Mon, 24 Feb 2025 14:02:00 +0100
Subject: [PATCH] Remove keyring_add_key_to_custom_keyring function.

The was identical function in keyring utilities already,
except the function name.
---
 lib/setup.c         | 10 +++++-----
 lib/utils_keyring.c | 28 +++++++---------------------
 lib/utils_keyring.h |  2 +-
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/lib/setup.c b/lib/setup.c
index 5025595e..f82f7591 100644
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -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,
-						crypt_volume_key_get_key(vk),
-						crypt_volume_key_length(vk),
-						cd->keyring_to_link_vk);
+	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;
 }
diff --git a/lib/utils_keyring.c b/lib/utils_keyring.c
index c8dd8cbe..8c5e5a59 100644
--- a/lib/utils_keyring.c
+++ b/lib/utils_keyring.c
@@ -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,11 +460,11 @@ 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)
+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)
 {
 	return -ENOTSUP;
 }
diff --git a/lib/utils_keyring.h b/lib/utils_keyring.h
index 1a9f5a2b..572bef97 100644
--- a/lib/utils_keyring.h
+++ b/lib/utils_keyring.h
@@ -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);