diff options
| author | Hans Nilsson <[email protected]> | 2018-08-15 10:52:25 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 12:45:26 +0200 |
| commit | 8b7db7f7a3cad9bd44c940a1299b9c593461821d (patch) | |
| tree | 3e121301f5f20caeb7123907f7abf5b5a212d629 /lib | |
| parent | 9aed3ae7f1506d14e6251291db395d598386f0ab (diff) | |
| download | otp-8b7db7f7a3cad9bd44c940a1299b9c593461821d.tar.gz otp-8b7db7f7a3cad9bd44c940a1299b9c593461821d.tar.bz2 otp-8b7db7f7a3cad9bd44c940a1299b9c593461821d.zip | |
crypto: doc chacha20
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index e6147ddffc..c104e29a1e 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -155,7 +155,7 @@ <p>The key's password </p> - <code>stream_cipher() = rc4 | aes_ctr </code> + <code>stream_cipher() = rc4 | aes_ctr | chacha20 </code> <code>block_cipher() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc | blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc </code> @@ -193,7 +193,7 @@ Note that both md4 and md5 are recommended only for compatibility with existing applications. </p> <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm | - aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc | + aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20 | chacha20_poly1305 | des_cbc | des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc | rc4 </code> <code> mac_algorithms() = hmac | cmac</code> <code> public_key_algorithms() = rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code> @@ -958,7 +958,7 @@ _FloatValue = rand:uniform(). % [0.0; 1.0[</pre> <name>stream_init(Type, Key, IVec) -> State</name> <fsummary></fsummary> <type> - <v>Type = aes_ctr </v> + <v>Type = aes_ctr | chacha20</v> <v>State = opaque() </v> <v>Key = iodata()</v> <v>IVec = binary()</v> |