aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2016-10-20 22:57:27 -0400
committerJonathan Corbet <corbet@lwn.net>2016-12-13 18:38:05 -0500
commit0184cfe72d2f139c4feed7f3820ba2269f5de322 (patch)
tree5360134f8d64f7b5f3541164dcb146997235d592
parentc441a4781ff1c5b78db1410f708aa96dceec5fa2 (diff)
crypto: doc - fix source comments for Sphinx
Update comments to avoid any complaints from Sphinx during compilation. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--include/crypto/aead.h14
-rw-r--r--include/crypto/hash.h2
-rw-r--r--include/crypto/skcipher.h4
-rw-r--r--include/linux/crypto.h4
4 files changed, 12 insertions, 12 deletions
diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 12f84327ca36..e725155c6389 100644
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -55,14 +55,14 @@
55 * The scatter list pointing to the input data must contain: 55 * The scatter list pointing to the input data must contain:
56 * 56 *
57 * * for RFC4106 ciphers, the concatenation of 57 * * for RFC4106 ciphers, the concatenation of
58 * associated authentication data || IV || plaintext or ciphertext. Note, the 58 * associated authentication data || IV || plaintext or ciphertext. Note, the
59 * same IV (buffer) is also set with the aead_request_set_crypt call. Note, 59 * same IV (buffer) is also set with the aead_request_set_crypt call. Note,
60 * the API call of aead_request_set_ad must provide the length of the AAD and 60 * the API call of aead_request_set_ad must provide the length of the AAD and
61 * the IV. The API call of aead_request_set_crypt only points to the size of 61 * the IV. The API call of aead_request_set_crypt only points to the size of
62 * the input plaintext or ciphertext. 62 * the input plaintext or ciphertext.
63 * 63 *
64 * * for "normal" AEAD ciphers, the concatenation of 64 * * for "normal" AEAD ciphers, the concatenation of
65 * associated authentication data || plaintext or ciphertext. 65 * associated authentication data || plaintext or ciphertext.
66 * 66 *
67 * It is important to note that if multiple scatter gather list entries form 67 * It is important to note that if multiple scatter gather list entries form
68 * the input data mentioned above, the first entry must not point to a NULL 68 * the input data mentioned above, the first entry must not point to a NULL
@@ -452,7 +452,7 @@ static inline void aead_request_free(struct aead_request *req)
452 * completes 452 * completes
453 * 453 *
454 * The callback function is registered with the aead_request handle and 454 * The callback function is registered with the aead_request handle and
455 * must comply with the following template 455 * must comply with the following template::
456 * 456 *
457 * void callback_function(struct crypto_async_request *req, int error) 457 * void callback_function(struct crypto_async_request *req, int error)
458 */ 458 */
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 26605888a199..216a2b876147 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -605,7 +605,7 @@ static inline struct ahash_request *ahash_request_cast(
605 * the cipher operation completes. 605 * the cipher operation completes.
606 * 606 *
607 * The callback function is registered with the &ahash_request handle and 607 * The callback function is registered with the &ahash_request handle and
608 * must comply with the following template 608 * must comply with the following template::
609 * 609 *
610 * void callback_function(struct crypto_async_request *req, int error) 610 * void callback_function(struct crypto_async_request *req, int error)
611 */ 611 */
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index cc4d98a7892e..750b14f1ada4 100644
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -516,7 +516,7 @@ static inline void skcipher_request_zero(struct skcipher_request *req)
516 * skcipher_request_set_callback() - set asynchronous callback function 516 * skcipher_request_set_callback() - set asynchronous callback function
517 * @req: request handle 517 * @req: request handle
518 * @flags: specify zero or an ORing of the flags 518 * @flags: specify zero or an ORing of the flags
519 * CRYPTO_TFM_REQ_MAY_BACKLOG the request queue may back log and 519 * CRYPTO_TFM_REQ_MAY_BACKLOG the request queue may back log and
520 * increase the wait queue beyond the initial maximum size; 520 * increase the wait queue beyond the initial maximum size;
521 * CRYPTO_TFM_REQ_MAY_SLEEP the request processing may sleep 521 * CRYPTO_TFM_REQ_MAY_SLEEP the request processing may sleep
522 * @compl: callback function pointer to be registered with the request handle 522 * @compl: callback function pointer to be registered with the request handle
@@ -533,7 +533,7 @@ static inline void skcipher_request_zero(struct skcipher_request *req)
533 * cipher operation completes. 533 * cipher operation completes.
534 * 534 *
535 * The callback function is registered with the skcipher_request handle and 535 * The callback function is registered with the skcipher_request handle and
536 * must comply with the following template 536 * must comply with the following template::
537 * 537 *
538 * void callback_function(struct crypto_async_request *req, int error) 538 * void callback_function(struct crypto_async_request *req, int error)
539 */ 539 */
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 7cee5551625b..faf8127234e1 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -960,7 +960,7 @@ static inline void ablkcipher_request_free(struct ablkcipher_request *req)
960 * ablkcipher_request_set_callback() - set asynchronous callback function 960 * ablkcipher_request_set_callback() - set asynchronous callback function
961 * @req: request handle 961 * @req: request handle
962 * @flags: specify zero or an ORing of the flags 962 * @flags: specify zero or an ORing of the flags
963 * CRYPTO_TFM_REQ_MAY_BACKLOG the request queue may back log and 963 * CRYPTO_TFM_REQ_MAY_BACKLOG the request queue may back log and
964 * increase the wait queue beyond the initial maximum size; 964 * increase the wait queue beyond the initial maximum size;
965 * CRYPTO_TFM_REQ_MAY_SLEEP the request processing may sleep 965 * CRYPTO_TFM_REQ_MAY_SLEEP the request processing may sleep
966 * @compl: callback function pointer to be registered with the request handle 966 * @compl: callback function pointer to be registered with the request handle
@@ -977,7 +977,7 @@ static inline void ablkcipher_request_free(struct ablkcipher_request *req)
977 * cipher operation completes. 977 * cipher operation completes.
978 * 978 *
979 * The callback function is registered with the ablkcipher_request handle and 979 * The callback function is registered with the ablkcipher_request handle and
980 * must comply with the following template 980 * must comply with the following template::
981 * 981 *
982 * void callback_function(struct crypto_async_request *req, int error) 982 * void callback_function(struct crypto_async_request *req, int error)
983 */ 983 */