Make all returned kernel key ids key_serial_t type.

mbroz · Sep 27, 2023 · 57bd4e0 · 57bd4e0
1 parent fde3e88
commit 57bd4e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/utils_keyring.c b/lib/utils_keyring.c
@@ -286,9 +286,9 @@ const char *key_type_name(key_type_t type)
 	return NULL;
 }
 
-int32_t keyring_find_key_id_by_name(const char *key_name)
+key_serial_t keyring_find_key_id_by_name(const char *key_name)
 {
-	int32_t id = 0;
+	key_serial_t id = 0;
 	char *end;
 	char *name_copy, *name_copy_p;
 
@@ -360,7 +360,7 @@ static bool numbered(const char *str)
 	return *endp == '\0' ? true : false;
 }
 
-int32_t keyring_find_keyring_id_by_name(const char *keyring_name)
+key_serial_t keyring_find_keyring_id_by_name(const char *keyring_name)
 {
 	assert(keyring_name);
 
@@ -434,12 +434,12 @@ const char *key_type_name(key_type_t type)
 	return NULL;
 }
 
-int32_t keyring_find_key_id_by_name(const char *key_name)
+key_serial_t keyring_find_key_id_by_name(const char *key_name)
 {
 	return 0;
 }
 
-int32_t keyring_find_keyring_id_by_name(const char *keyring_name)
+key_serial_t keyring_find_keyring_id_by_name(const char *keyring_name)
 {
 	return 0;
 }

diff --git a/lib/utils_keyring.h b/lib/utils_keyring.h
@@ -34,8 +34,8 @@ typedef enum { LOGON_KEY = 0, USER_KEY, BIG_KEY, TRUSTED_KEY, ENCRYPTED_KEY, INV
 
 const char *key_type_name(key_type_t ktype);
 key_type_t key_type_by_name(const char *name);
-int32_t keyring_find_key_id_by_name(const char *key_name);
-int32_t keyring_find_keyring_id_by_name(const char *keyring_name);
+key_serial_t keyring_find_key_id_by_name(const char *key_name);
+key_serial_t keyring_find_keyring_id_by_name(const char *keyring_name);
 
 int keyring_check(void);