path: root/Documentation
diff options
authorLinus Torvalds <>2016-06-05 11:02:00 -0700
committerLinus Torvalds <>2016-06-05 11:02:00 -0700
commitd834502e2fca9380a1579fecd134ef94c063b662 (patch)
tree5f180e522792facbe222c3c28b69df8003c93304 /Documentation
parenteedf265aa003b4781de24cfed40a655a664457e6 (diff)
parent4693fc734d675c5518ea9bd4c9623db45bc37402 (diff)
Merge branch 'for-linus' of git://
Pull key handling update from James Morris: "This alters a new keyctl function added in the current merge window to allow for a future extension planned for the next merge window" * 'for-linus' of git:// KEYS: Add placeholder for KDF usage with DH
Diffstat (limited to 'Documentation')
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt
index 20d05719bceb..3849814bfe6d 100644
--- a/Documentation/security/keys.txt
+++ b/Documentation/security/keys.txt
@@ -826,7 +826,8 @@ The keyctl syscall functions are:
(*) Compute a Diffie-Hellman shared secret or public key
long keyctl(KEYCTL_DH_COMPUTE, struct keyctl_dh_params *params,
- char *buffer, size_t buflen);
+ char *buffer, size_t buflen,
+ void *reserved);
The params struct contains serial numbers for three keys:
@@ -843,6 +844,8 @@ The keyctl syscall functions are:
public key. If the base is the remote public key, the result is
the shared secret.
+ The reserved argument must be set to NULL.
The buffer length must be at least the length of the prime, or zero.
If the buffer length is nonzero, the length of the result is