summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-04-18 10:54:58 +0100
committerMatt Caswell <matt@openssl.org>2019-04-19 09:42:31 +0100
commitd0a2b73b9c823d155ac3880bf193a2fb08a4b4bb (patch)
tree1804321e9843dcf9e306d72936ec64467c34273e /doc
parent18111b130abc0f53b41abbbf82b27d7232ec99f2 (diff)
Clarify the documentation on the use of ChaCha20
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8780) (cherry picked from commit 6f3aae256d62cfcc48c07cc0ead5080b070f371b)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/EVP_chacha20.pod10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/man3/EVP_chacha20.pod b/doc/man3/EVP_chacha20.pod
index 96da825cde..4636a1e9cc 100644
--- a/doc/man3/EVP_chacha20.pod
+++ b/doc/man3/EVP_chacha20.pod
@@ -21,7 +21,15 @@ The ChaCha20 stream cipher for EVP.
=item EVP_chacha20()
-The ChaCha20 stream cipher. The key length is 256 bits, the IV is 96 bits long.
+The ChaCha20 stream cipher. The key length is 256 bits, the IV is 128 bits long.
+The first 32 bits consists of a counter in little-endian order followed by a 96
+bit nonce. For example a nonce of:
+
+000000000000000000000002
+
+With an initial counter of 42 (2a in hex) would be expressed as:
+
+2a000000000000000000000000000002
=item EVP_chacha20_poly1305()