summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2016-02-16 11:33:13 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-02-16 21:07:54 +0100
commit3981d37ff380f1033fef839935bbf9774ed48f00 (patch)
tree59648eb643d47aba89dbcc3427682e701db5baf1 /include/crypto
parentcrypto: doc - add crypto_rng_generate (diff)
downloadlinux-3981d37ff380f1033fef839935bbf9774ed48f00.tar.xz
linux-3981d37ff380f1033fef839935bbf9774ed48f00.zip
crypto: doc - update AEAD AD handling
The associated data handling with the kernel crypto API has been updated. This needs to be reflected in the documentation. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/aead.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 84d13b11ad7b..957bb8763219 100644
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -31,10 +31,10 @@
*
* For example: authenc(hmac(sha256), cbc(aes))
*
- * The example code provided for the asynchronous block cipher operation
- * applies here as well. Naturally all *ablkcipher* symbols must be exchanged
+ * The example code provided for the symmetric key cipher operation
+ * applies here as well. Naturally all *skcipher* symbols must be exchanged
* the *aead* pendants discussed in the following. In addition, for the AEAD
- * operation, the aead_request_set_assoc function must be used to set the
+ * operation, the aead_request_set_ad function must be used to set the
* pointer to the associated data memory location before performing the
* encryption or decryption operation. In case of an encryption, the associated
* data memory is filled during the encryption operation. For decryption, the