KEYS: Make the key matching functions return bool

Make the key matching functions pointed to by key_match_data::cmp return bool
rather than int.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
David Howells 2014-09-16 17:36:08 +01:00
parent c06cfb08b8
commit 0c903ab64f
6 changed files with 18 additions and 16 deletions

View file

@ -59,8 +59,8 @@ EXPORT_SYMBOL_GPL(asymmetric_keyid_match);
* "id:<id>" - request a key matching the ID
* "<subtype>:<id>" - request a key of a subtype
*/
static int asymmetric_key_cmp(const struct key *key,
const struct key_match_data *match_data)
static bool asymmetric_key_cmp(const struct key *key,
const struct key_match_data *match_data)
{
const struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
const char *description = match_data->raw_data;

View file

@ -56,10 +56,12 @@ typedef int (*request_key_actor_t)(struct key_construction *key,
* Preparsed matching criterion.
*/
struct key_match_data {
/* Comparison function, defaults to type->match, but can be replaced by
* type->match_preparse(). */
int (*cmp)(const struct key *key,
const struct key_match_data *match_data);
/* Comparison function, defaults to exact description match, but can be
* overridden by type->match_preparse(). Should return true if a match
* is found and false if not.
*/
bool (*cmp)(const struct key *key,
const struct key_match_data *match_data);
const void *raw_data; /* Raw match data */
void *preparsed; /* For ->match_preparse() to stash stuff */

View file

@ -176,8 +176,8 @@ static void dns_resolver_free_preparse(struct key_preparsed_payload *prep)
* The domain name may be a simple name or an absolute domain name (which
* should end with a period). The domain name is case-independent.
*/
static int dns_resolver_cmp(const struct key *key,
const struct key_match_data *match_data)
static bool dns_resolver_cmp(const struct key *key,
const struct key_match_data *match_data)
{
int slen, dlen, ret = 0;
const char *src = key->description, *dsp = match_data->raw_data;

View file

@ -127,8 +127,8 @@ struct keyring_search_context {
struct timespec now;
};
extern int key_default_cmp(const struct key *key,
const struct key_match_data *match_data);
extern bool key_default_cmp(const struct key *key,
const struct key_match_data *match_data);
extern key_ref_t keyring_search_aux(key_ref_t keyring_ref,
struct keyring_search_context *ctx);
@ -150,8 +150,8 @@ extern struct key *request_key_and_link(struct key_type *type,
struct key *dest_keyring,
unsigned long flags);
extern int lookup_user_key_possessed(const struct key *key,
const struct key_match_data *match_data);
extern bool lookup_user_key_possessed(const struct key *key,
const struct key_match_data *match_data);
extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
key_perm_t perm);
#define KEY_LOOKUP_CREATE 0x01

View file

@ -513,8 +513,8 @@ EXPORT_SYMBOL(keyring_alloc);
/*
* By default, we keys found by getting an exact match on their descriptions.
*/
int key_default_cmp(const struct key *key,
const struct key_match_data *match_data)
bool key_default_cmp(const struct key *key,
const struct key_match_data *match_data)
{
return strcmp(key->description, match_data->raw_data) == 0;
}

View file

@ -489,8 +489,8 @@ key_ref_t search_process_keyrings(struct keyring_search_context *ctx)
/*
* See if the key we're looking at is the target key.
*/
int lookup_user_key_possessed(const struct key *key,
const struct key_match_data *match_data)
bool lookup_user_key_possessed(const struct key *key,
const struct key_match_data *match_data)
{
return key == match_data->raw_data;
}