diff options
| author | Hans Nilsson <[email protected]> | 2018-08-23 14:28:37 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 14:28:37 +0200 |
| commit | 3ce7755593390478c13c78b683aabc915853b1bf (patch) | |
| tree | c2aaca13cbe60a33229c189c6c99a5e422bba9df /lib/crypto/doc | |
| parent | d3e7e665d8b687094c0857dd086654350bec9055 (diff) | |
| parent | 99818214c45ebbe9e7a20f739ab1f9e801d61d98 (diff) | |
| download | otp-3ce7755593390478c13c78b683aabc915853b1bf.tar.gz otp-3ce7755593390478c13c78b683aabc915853b1bf.tar.bz2 otp-3ce7755593390478c13c78b683aabc915853b1bf.zip | |
Merge branch 'hans/crypto/SHA3/OTP-15153' into maint
* hans/crypto/SHA3/OTP-15153:
crypto: Disable non-working SHA3_224 and SHA3_256
crypto: doc SHA3 (hash & hmac)
crypto: Tests for SHA3
crypto: SHA3 hash on OpenSSL-1.1.1
Diffstat (limited to 'lib/crypto/doc')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 889e5616dd..21580932ca 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -161,6 +161,7 @@ blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc </code> <code>aead_cipher() = aes_gcm | chacha20_poly1305 </code> + <p>Note that the actual supported algorithms depends on the underlying crypto library.</p> <code>stream_key() = aes_key() | rc4_key() </code> @@ -189,8 +190,11 @@ <code>rsa_sign_padding() = rsa_pkcs1_padding | rsa_pkcs1_pss_padding</code> - <code> hash_algorithms() = md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512 </code> <p>md4 is also supported for hash_init/1 and hash/2. + <code> hash_algorithms() = md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512 | + sha3_224 | sha3_256 | sha3_384 | sha3_512 </code> + <p>md4 is also supported for hash_init/1 and hash/2. Note that both md4 and md5 are recommended only for compatibility with existing applications. + Note that the actual supported hash_algorithms depends on the underlying crypto library. </p> <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm | aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20 | chacha20_poly1305 | des_cbc | |