aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-09-16 12:36:04 -0400
committerDavid Howells <dhowells@redhat.com>2014-09-16 12:36:04 -0400
commit614d8c39014c185aa0f7254f0a470cc33fc1b284 (patch)
treee6408d142b72dda0420b0f96a58a05d1e4a309b8 /crypto
parent462919591a1791e76042dc5c1e0148715df59beb (diff)
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: David Howells <dhowells@redhat.com> Acked-by: Vivek Goyal <vgoyal@redhat.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/asymmetric_keys/asymmetric_type.c1
-rw-r--r--crypto/asymmetric_keys/pkcs7_key_type.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index f666b4e8d256..9d78ad7754d9 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -228,7 +228,6 @@ struct key_type key_type_asymmetric = {
228 .match_free = asymmetric_key_match_free, 228 .match_free = asymmetric_key_match_free,
229 .destroy = asymmetric_key_destroy, 229 .destroy = asymmetric_key_destroy,
230 .describe = asymmetric_key_describe, 230 .describe = asymmetric_key_describe,
231 .def_lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE,
232}; 231};
233EXPORT_SYMBOL_GPL(key_type_asymmetric); 232EXPORT_SYMBOL_GPL(key_type_asymmetric);
234 233
diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index 3de5fb011de0..d1faa1df1dec 100644
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -72,7 +72,6 @@ error:
72 */ 72 */
73static struct key_type key_type_pkcs7 = { 73static struct key_type key_type_pkcs7 = {
74 .name = "pkcs7_test", 74 .name = "pkcs7_test",
75 .def_lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT,
76 .preparse = pkcs7_preparse, 75 .preparse = pkcs7_preparse,
77 .free_preparse = user_free_preparse, 76 .free_preparse = user_free_preparse,
78 .instantiate = generic_key_instantiate, 77 .instantiate = generic_key_instantiate,