diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-10-07 10:17:16 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-10-07 10:17:16 +0200 |
| commit | 4c3b3d3762fc00ddddf24ac0277ecbb8760e257f (patch) | |
| tree | 4f176bb5b84e07d47c2cc3335fa2a26da5faed72 /lib | |
| parent | 672c14dc0ed9e681856932c58b26d08f3d449e71 (diff) | |
| parent | 992bc0dad066bdec66996acae40b370b5377a161 (diff) | |
| download | otp-4c3b3d3762fc00ddddf24ac0277ecbb8760e257f.tar.gz otp-4c3b3d3762fc00ddddf24ac0277ecbb8760e257f.tar.bz2 otp-4c3b3d3762fc00ddddf24ac0277ecbb8760e257f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index abba5aaf59..68f2f97b6e 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -155,7 +155,7 @@ <tag><c>cipher() =</c></tag> <item><p><c>rc4_128 | des_cbc | '3des_ede_cbc' - | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm</c></p></item> + | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305</c></p></item> <tag><c>hash() =</c></tag> <item><p><c>md5 | sha | sha224 | sha256 | sha348 | sha512</c></p></item> diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 02873ce522..542dab11b8 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -46,9 +46,9 @@ erl_cipher_suite/0, openssl_cipher_suite/0, hash/0, key_algo/0, sign_algo/0]). --type cipher() :: null |rc4_128 | idea_cbc | des40_cbc | des_cbc | '3des_ede_cbc' +-type cipher() :: null |rc4_128 | des_cbc | '3des_ede_cbc' | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305. --type hash() :: null | sha | md5 | sha224 | sha256 | sha384 | sha512. +-type hash() :: null | md5 | sha | sha224 | sha256 | sha384 | sha512. -type sign_algo() :: rsa | dsa | ecdsa. -type key_algo() :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon. |