diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-06 09:29:00 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-06 09:29:00 +1000 |
| commit | 0250abcd726b4eba8a6175f09656fe544ed6491a (patch) | |
| tree | 43ded3d5f9b8b5684879c61ff6d03effdb7ea7c0 /security/keys/internal.h | |
| parent | 74f430cd0fdee1bdfb25708ee1e52fc860535a89 (diff) | |
| parent | d55201ce08bfae40ae0062be126f49471a55bcad (diff) | |
Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 5105c2c2da75..8ec7a528365d 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/key-type.h> #include <linux/task_work.h> +#include <linux/keyctl.h> struct iovec; @@ -257,6 +258,17 @@ static inline long keyctl_get_persistent(uid_t uid, key_serial_t destring) } #endif +#ifdef CONFIG_KEY_DH_OPERATIONS +extern long keyctl_dh_compute(struct keyctl_dh_params __user *, char __user *, + size_t); +#else +static inline long keyctl_dh_compute(struct keyctl_dh_params __user *params, + char __user *buffer, size_t buflen) +{ + return -EOPNOTSUPP; +} +#endif + /* * Debugging key validation */ |