Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c06cfb08 authored by David Howells's avatar David Howells
Browse files

KEYS: Remove key_type::match in favour of overriding default by match_preparse 



A previous patch added a ->match_preparse() method to the key type.  This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.

The key_type::match op is then redundant and can be removed, as can the
user_match() function.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
parent 614d8c39

crypto/asymmetric_keys/asymmetric_type.c

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 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_match(const struct key *key,

static int asymmetric_key_cmp(const struct key *key,

			      const struct key_match_data *match_data)

{

	const struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
@@ -110,6 +110,7 @@ static int asymmetric_key_match(const struct key *key, 
static int asymmetric_key_match_preparse(struct key_match_data *match_data)

{

	match_data->lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE;

	match_data->cmp = asymmetric_key_cmp;

	return 0;

}
@@ -224,7 +225,6 @@ struct key_type key_type_asymmetric = { 
	.free_preparse	= asymmetric_key_free_preparse,

	.instantiate	= generic_key_instantiate,

	.match_preparse	= asymmetric_key_match_preparse,

	.match		= asymmetric_key_match,

	.match_free	= asymmetric_key_match_free,

	.destroy	= asymmetric_key_destroy,

	.describe	= asymmetric_key_describe,

crypto/asymmetric_keys/pkcs7_key_type.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static struct key_type key_type_pkcs7 = { 
	.preparse		= pkcs7_preparse,

	.free_preparse		= user_free_preparse,

	.instantiate		= generic_key_instantiate,

	.match			= user_match,

	.revoke			= user_revoke,

	.destroy		= user_destroy,

	.describe		= user_describe,

fs/cifs/cifs_spnego.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ cifs_spnego_key_destroy(struct key *key) 
struct key_type cifs_spnego_key_type = {

	.name		= "cifs.spnego",

	.instantiate	= cifs_spnego_key_instantiate,

	.match		= user_match,

	.destroy	= cifs_spnego_key_destroy,

	.describe	= user_describe,

};

fs/cifs/cifsacl.c

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static struct key_type cifs_idmap_key_type = { 
	.instantiate = cifs_idmap_key_instantiate,

	.destroy     = cifs_idmap_key_destroy,

	.describe    = user_describe,

	.match       = user_match,

};



static char *

fs/nfs/idmap.c

+0 −2
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static struct key_type key_type_id_resolver = { 
	.preparse	= user_preparse,

	.free_preparse	= user_free_preparse,

	.instantiate	= generic_key_instantiate,

	.match		= user_match,

	.revoke		= user_revoke,

	.destroy	= user_destroy,

	.describe	= user_describe,
@@ -401,7 +400,6 @@ static struct key_type key_type_id_resolver_legacy = { 
	.preparse	= user_preparse,

	.free_preparse	= user_free_preparse,

	.instantiate	= generic_key_instantiate,

	.match		= user_match,

	.revoke		= user_revoke,

	.destroy	= user_destroy,

	.describe	= user_describe,