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>

2 files changed, 3 insertions, 4 deletions

diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index 9d78ad7754d9..7c0498968975 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -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_match(const struct key *key,
-                                const struct key_match_data *match_data)
+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);
         const char *description = match_data->raw_data;
@@ -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,
diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index d1faa1df1dec..751f8fd7335d 100644
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -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,