]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
KEYS: Remove key_type::match in favour of overriding default by match_preparse
authorDavid Howells <dhowells@redhat.com>
Tue, 16 Sep 2014 16:36:06 +0000 (17:36 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 16 Sep 2014 16:36:06 +0000 (17:36 +0100)
commitc06cfb08b88dfbe13be44a69ae2fdc3a7c902d81
tree8bc0e3794ffb426b3cbb2c0d7c2dbbd4b28e3054
parent614d8c39014c185aa0f7254f0a470cc33fc1b284
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: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
19 files changed:
crypto/asymmetric_keys/asymmetric_type.c
crypto/asymmetric_keys/pkcs7_key_type.c
fs/cifs/cifs_spnego.c
fs/cifs/cifsacl.c
fs/nfs/idmap.c
include/keys/user-type.h
include/linux/key-type.h
net/ceph/crypto.c
net/dns_resolver/dns_key.c
net/rxrpc/ar-key.c
security/keys/big_key.c
security/keys/encrypted-keys/encrypted.c
security/keys/internal.h
security/keys/key.c
security/keys/keyring.c
security/keys/request_key.c
security/keys/request_key_auth.c
security/keys/trusted.c
security/keys/user_defined.c