summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-17 16:00:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-17 16:00:34 -0800
commit0aaf2146ecf00f7932f472ec5aa30d999c89530c (patch)
tree690dd244437f1974b8132fcb1e360213f827bf94 /crypto
parent59331c215daf600a650e281b6e8ef3e1ed1174c2 (diff)
parent3fa71d0f58a9b9df84e8e79196f961bcfbf01b2e (diff)
downloadop-kernel-dev-0aaf2146ecf00f7932f472ec5aa30d999c89530c.zip
op-kernel-dev-0aaf2146ecf00f7932f472ec5aa30d999c89530c.tar.gz
Merge tag 'docs-4.10-2' of git://git.lwn.net/linux
Pull more documentation updates from Jonathan Corbet: "This converts the crypto DocBook to Sphinx" * tag 'docs-4.10-2' of git://git.lwn.net/linux: crypto: doc - optimize compilation crypto: doc - clarify AEAD memory structure crypto: doc - remove crypto_alloc_ablkcipher crypto: doc - add KPP documentation crypto: doc - fix separation of cipher / req API crypto: doc - fix source comments for Sphinx crypto: doc - remove crypto API DocBook crypto: doc - convert crypto API documentation to Sphinx
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_aead.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 668ef40..f849311 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -556,18 +556,8 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)
lock_sock(sk);
/*
- * AEAD memory structure: For encryption, the tag is appended to the
- * ciphertext which implies that the memory allocated for the ciphertext
- * must be increased by the tag length. For decryption, the tag
- * is expected to be concatenated to the ciphertext. The plaintext
- * therefore has a memory size of the ciphertext minus the tag length.
- *
- * The memory structure for cipher operation has the following
- * structure:
- * AEAD encryption input: assoc data || plaintext
- * AEAD encryption output: cipherntext || auth tag
- * AEAD decryption input: assoc data || ciphertext || auth tag
- * AEAD decryption output: plaintext
+ * Please see documentation of aead_request_set_crypt for the
+ * description of the AEAD memory structure expected from the caller.
*/
if (ctx->more) {
OpenPOWER on IntegriCloud