diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-12 20:09:34 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-04-12 20:09:34 +0100 |
| commit | 6e007f3186e398ec4e3b6d4f1c22740d9dc2715e (patch) | |
| tree | 3e5cc20804b646256525cd9c2de7a9681d7e4996 /include | |
| parent | 3c9d6296b7aee536a96ea2b53a15d23511738c1c (diff) | |
| parent | ddbb41148724367394d0880c516bfaeed127b52e (diff) | |
Merge branch 'keys-misc' into keys-next
Miscellaneous keyrings changes.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/keyctl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 840cb990abe2..86eddd6241f3 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -12,6 +12,8 @@ #ifndef _LINUX_KEYCTL_H #define _LINUX_KEYCTL_H +#include <linux/types.h> + /* special process keyring shortcut IDs */ #define KEY_SPEC_THREAD_KEYRING -1 /* - key ID for thread-specific keyring */ #define KEY_SPEC_PROCESS_KEYRING -2 /* - key ID for process-specific keyring */ @@ -57,5 +59,13 @@ #define KEYCTL_INSTANTIATE_IOV 20 /* instantiate a partially constructed key */ #define KEYCTL_INVALIDATE 21 /* invalidate a key */ #define KEYCTL_GET_PERSISTENT 22 /* get a user's persistent keyring */ +#define KEYCTL_DH_COMPUTE 23 /* Compute Diffie-Hellman values */ + +/* keyctl structures */ +struct keyctl_dh_params { + __s32 private; + __s32 prime; + __s32 base; +}; #endif /* _LINUX_KEYCTL_H */ |