diff options
| author | Sverker Eriksson <[email protected]> | 2014-05-07 20:38:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-05-07 20:39:27 +0200 |
| commit | 20062bd75168934cc33acf4673e78f2ade5055d5 (patch) | |
| tree | e6a058dcc6ffc7683a4869d18147121059acc390 /lib/crypto/doc/src/crypto.xml | |
| parent | 37cf63439deea06fc4975c3bacab220389936192 (diff) | |
| parent | 4237524a0d3eb26c244e78539de84c78b828c3c3 (diff) | |
| download | otp-20062bd75168934cc33acf4673e78f2ade5055d5.tar.gz otp-20062bd75168934cc33acf4673e78f2ade5055d5.tar.bz2 otp-20062bd75168934cc33acf4673e78f2ade5055d5.zip | |
Merge branch 'bernardd/crypto-aes-cfb-8' into maint
* bernardd/crypto-aes-cfb-8:
Add AES-CBF8 cypher to crypto module
OTP-11911
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 e88bf01491..7712173ed8 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -128,7 +128,7 @@ <p><code>stream_cipher() = rc4 | aes_ctr </code></p> - <p><code>block_cipher() = aes_cbc128 | aes_cfb128 | aes_ige256 | blowfish_cbc | + <p><code>block_cipher() = aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc | blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | rc2_cbc </code></p> @@ -152,7 +152,7 @@ Note that both md4 and md5 are recommended only for compatibility with existing applications. </p> <p><code> cipher_algorithms() = des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | - blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb128| aes_cbc256 | aes_ige256 | rc2_cbc | aes_ctr| rc4 </code> </p> + blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb8 | aes_cfb128| aes_cbc256 | aes_ige256 | rc2_cbc | aes_ctr| rc4 </code> </p> <p><code> public_key_algorithms() = rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code> Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported with ecdsa and ecdh. |