diff options
| author | Raimo Niskanen <[email protected]> | 2016-09-07 17:25:08 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-09-07 17:25:08 +0200 |
| commit | ef94653b7f20bd8e02a64a73137cf10ee738ba4e (patch) | |
| tree | a99f7a8e2691732cef913c1bfc0933d7f1e1d074 /lib/crypto/doc/src/crypto.xml | |
| parent | 6dcffaa4f5f617c3a368bb40688e6753270de22f (diff) | |
| parent | 970309e0cfa8450837ace53caa13dd2301b378b6 (diff) | |
| download | otp-ef94653b7f20bd8e02a64a73137cf10ee738ba4e.tar.gz otp-ef94653b7f20bd8e02a64a73137cf10ee738ba4e.tar.bz2 otp-ef94653b7f20bd8e02a64a73137cf10ee738ba4e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/crypto/doc/src/crypto.xml')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 50e3583a94..ce8bf2216a 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -139,7 +139,7 @@ <code>stream_cipher() = rc4 | aes_ctr </code> <code>block_cipher() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc | - blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | rc2_cbc </code> + blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc </code> <code>aead_cipher() = aes_gcm | chacha20_poly1305 </code> @@ -164,7 +164,7 @@ </p> <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm | aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc | des_cfb | - des3_cbc | des3_cbf | des_ede3 | rc2_cbc | rc4 </code> + des3_cbc | des3_cfb | des_ede3 | rc2_cbc | rc4 </code> <code> public_key_algorithms() = rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code> <p>Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported with ecdsa and ecdh. |