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

Commit 614d8c39 authored by David Howells's avatar David Howells
Browse files

KEYS: Remove key_type::def_lookup_type 



Remove key_type::def_lookup_type as it's no longer used.  The information now
defaults to KEYRING_SEARCH_LOOKUP_DIRECT but may be overridden by
type->match_preparse().

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

crypto/asymmetric_keys/asymmetric_type.c

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ struct key_type key_type_asymmetric = { 
	.match_free	= asymmetric_key_match_free,

	.destroy	= asymmetric_key_destroy,

	.describe	= asymmetric_key_describe,

	.def_lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE,

};

EXPORT_SYMBOL_GPL(key_type_asymmetric);

crypto/asymmetric_keys/pkcs7_key_type.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep) 
 */

static struct key_type key_type_pkcs7 = {

	.name			= "pkcs7_test",

	.def_lookup_type	= KEYRING_SEARCH_LOOKUP_DIRECT,

	.preparse		= pkcs7_preparse,

	.free_preparse		= user_free_preparse,

	.instantiate		= generic_key_instantiate,

include/linux/key-type.h

+0 −3
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ struct key_type { 
	 */

	size_t def_datalen;



	/* Default key search algorithm. */

	unsigned def_lookup_type;



	/* vet a description */

	int (*vet_description)(const char *description);

security/keys/big_key.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ MODULE_LICENSE("GPL"); 
 */

struct key_type key_type_big_key = {

	.name			= "big_key",

	.def_lookup_type	= KEYRING_SEARCH_LOOKUP_DIRECT,

	.preparse		= big_key_preparse,

	.free_preparse		= big_key_free_preparse,

	.instantiate		= generic_key_instantiate,

security/keys/internal.h

+5 −6
Original line number Diff line number Diff line
@@ -112,12 +112,11 @@ struct keyring_search_context { 
	const struct cred	*cred;

	struct key_match_data	match_data;

	unsigned		flags;

#define KEYRING_SEARCH_LOOKUP_TYPE	0x0001	/* [as type->def_lookup_type] */

#define KEYRING_SEARCH_NO_STATE_CHECK	0x0002	/* Skip state checks */

#define KEYRING_SEARCH_DO_STATE_CHECK	0x0004	/* Override NO_STATE_CHECK */

#define KEYRING_SEARCH_NO_UPDATE_TIME	0x0008	/* Don't update times */

#define KEYRING_SEARCH_NO_CHECK_PERM	0x0010	/* Don't check permissions */

#define KEYRING_SEARCH_DETECT_TOO_DEEP	0x0020	/* Give an error on excessive depth */

#define KEYRING_SEARCH_NO_STATE_CHECK	0x0001	/* Skip state checks */

#define KEYRING_SEARCH_DO_STATE_CHECK	0x0002	/* Override NO_STATE_CHECK */

#define KEYRING_SEARCH_NO_UPDATE_TIME	0x0004	/* Don't update times */

#define KEYRING_SEARCH_NO_CHECK_PERM	0x0008	/* Don't check permissions */

#define KEYRING_SEARCH_DETECT_TOO_DEEP	0x0010	/* Give an error on excessive depth */



	int (*iterator)(const void *object, void *iterator_data);