diff options
| author | Stephan Mueller <smueller@chronox.de> | 2016-02-16 10:33:13 (GMT) |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-02-16 20:07:54 (GMT) |
| commit | 3981d37ff380f1033fef839935bbf9774ed48f00 (patch) | |
| tree | 59648eb643d47aba89dbcc3427682e701db5baf1 | |
| parent | 649e2007d9ce81d67ad985aff28b3a9d243c4c22 (diff) | |
| download | linux-3981d37ff380f1033fef839935bbf9774ed48f00.tar.xz | |
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>
| -rw-r--r-- | Documentation/DocBook/crypto-API.tmpl | 1 | ||||
| -rw-r--r-- | include/crypto/aead.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/DocBook/crypto-API.tmpl b/Documentation/DocBook/crypto-API.tmpl index a2986b2..50efc5a 100644 --- a/Documentation/DocBook/crypto-API.tmpl +++ b/Documentation/DocBook/crypto-API.tmpl @@ -1736,7 +1736,6 @@ read(opfd, out, outlen); !Finclude/crypto/aead.h aead_request_free !Finclude/crypto/aead.h aead_request_set_callback !Finclude/crypto/aead.h aead_request_set_crypt -!Finclude/crypto/aead.h aead_request_set_assoc !Finclude/crypto/aead.h aead_request_set_ad </sect1> <sect1><title>Synchronous Block Cipher API</title> diff --git a/include/crypto/aead.h b/include/crypto/aead.h index 84d13b1..957bb87 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 |