diff options
| author | Hans Nilsson <[email protected]> | 2017-07-07 11:48:35 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-07-07 11:48:35 +0200 |
| commit | 60b478cb8398e834668b664e361aa9b6b461e708 (patch) | |
| tree | e5fbe85e422c57b8bd75eae02ed1b864a3de4c17 /lib/crypto/doc/src/crypto.xml | |
| parent | 6a213853cb0e8ba730e5ea64371c535e59280a4c (diff) | |
| parent | b1ced30ade0bf3f2d04ef3320bc0deb519f98283 (diff) | |
| download | otp-60b478cb8398e834668b664e361aa9b6b461e708.tar.gz otp-60b478cb8398e834668b664e361aa9b6b461e708.tar.bz2 otp-60b478cb8398e834668b664e361aa9b6b461e708.zip | |
Merge branch 'hans/crypto/supports_macs/OTP-14504' into maint
Diffstat (limited to 'lib/crypto/doc/src/crypto.xml')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 89ef529c5d..ecc33aafc3 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -165,6 +165,7 @@ <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_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> <p>Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported with ecdsa and ecdh. @@ -835,7 +836,8 @@ _FloatValue = rand:uniform(). % [0.0; 1.0[</pre> <type> <v> AlgorithmList = [{hashs, [hash_algorithms()]}, {ciphers, [cipher_algorithms()]}, - {public_keys, [public_key_algorithms()]} + {public_keys, [public_key_algorithms()]}, + {macs, [mac_algorithms()]}] </v> </type> <desc> |