diff options
| author | James Morris | 2014-09-22 14:54:56 +0200 |
|---|---|---|
| committer | James Morris | 2014-09-22 14:54:56 +0200 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /security/keys/big_key.c | |
| parent | Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel in... (diff) | |
| parent | KEYS: Check hex2bin()'s return when generating an asymmetric key ID (diff) | |
| download | kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.gz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.zip | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/big_key.c')
| -rw-r--r-- | security/keys/big_key.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/keys/big_key.c b/security/keys/big_key.c index c2f91a0cf889..b6adb94f6d52 100644 --- a/security/keys/big_key.c +++ b/security/keys/big_key.c @@ -33,11 +33,9 @@ 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, - .match = user_match, .revoke = big_key_revoke, .destroy = big_key_destroy, .describe = big_key_describe, |