diff options
| author | Hans Nilsson <[email protected]> | 2019-02-25 10:02:04 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-02-25 10:02:04 +0100 |
| commit | 2c06e174d6515b6a842906de9e6ebc70bd2f2ec0 (patch) | |
| tree | c197e1682ecdea385f93b5bbeee540e444b84e06 /lib/crypto/doc/src | |
| parent | b3dbf45fdbe8c584c89b5e061f6e9a28a5d3ea86 (diff) | |
| parent | c7cab680b80ef9220832151ed2c8c23a5d590b8b (diff) | |
| download | otp-2c06e174d6515b6a842906de9e6ebc70bd2f2ec0.tar.gz otp-2c06e174d6515b6a842906de9e6ebc70bd2f2ec0.tar.bz2 otp-2c06e174d6515b6a842906de9e6ebc70bd2f2ec0.zip | |
Merge branch 'hans/crypto/new_api_rc1/OTP-15451'
* hans/crypto/new_api_rc1/OTP-15451:
crypto: New experimental api
Diffstat (limited to 'lib/crypto/doc/src')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index e0794a080e..83e10c4c78 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -193,10 +193,12 @@ <datatype_title>Ciphers</datatype_title> <datatype> <name name="stream_cipher"/> + <name name="stream_cipher_iv"/> + <name name="stream_cipher_no_iv"/> <desc> <p>Stream ciphers for - <seealso marker="#stream_encrypt-2">stream_encrypt/2</seealso> and - <seealso marker="#stream_decrypt-2">stream_decrypt/2</seealso> . + <seealso marker="#stream_init-3">stream_init/3</seealso> and + <seealso marker="#stream_init-2">stream_init/2</seealso> . </p> </desc> </datatype> @@ -214,6 +216,18 @@ </datatype> <datatype> + <name name="alias_cfb"/> + <name name="alias_cbc"/> + <desc> + <p>Names that are replaced by more common names. They may deprecated in futer releases.</p> + <p><c>des3_cbc</c> and <c>des_ede3</c> should be replaced by <c>des_ede3_cbc</c></p> + <p><c>des_ede3_cbf</c>, <c>des3_cbf</c> and <c>des3_cfb</c> should be replaced by <c>des_ede3_cfb</c>.</p> + <p><c>aes_cbc128</c> should be replaced by <c>aes_128_cbc</c>.</p> + <p><c>aes_cbc256</c> should be replaced by <c>aes_256_cbc</c>.</p> + </desc> + </datatype> + + <datatype> <name name="block_cipher_without_iv"/> <name name="ecb_cipher"/> <desc> |