diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-10-19 10:35:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-10-19 10:35:00 +0200 |
| commit | eb75757a3c8f467a7f17c5be9b63c047cb4e98b5 (patch) | |
| tree | b9a3b3b89a5b63f5805a163b79d21468979e698f /lib/ssl/doc/src/ssl.xml | |
| parent | 42a5c23e7beabf08ac8d9796da63386a8af95456 (diff) | |
| parent | 28984d18b3305c41b4121d93aa0ff41c90691737 (diff) | |
| download | otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.tar.gz otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.tar.bz2 otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.zip | |
Merge branch 'ia/ssl/DH-ANON/OTP-8870' into dev
* ia/ssl/DH-ANON/OTP-8870:
Anonymous cipher suites
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 413703deca..511f1e0bb2 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -114,7 +114,7 @@ <p><c>ciphersuite() = {key_exchange(), cipher(), hash()}</c></p> - <p><c>key_exchange() = rsa | dhe_dss | dhe_rsa + <p><c>key_exchange() = rsa | dhe_dss | dhe_rsa | dh_anon </c></p> <p><c>cipher() = rc4_128 | des_cbc | '3des_ede_cbc' @@ -170,8 +170,13 @@ <tag>{ciphers, ciphers()}</tag> <item>The cipher suites that should be supported. The function - <c>ciphers_suites/0</c> can be used to find all available - ciphers. + <c>cipher_suites/0</c> can be used to find all available + ciphers. Additionally some anonymous cipher suites ({dh_anon, + rc4_128, md5}, {dh_anon, des_cbc, sha}, {dh_anon, + '3des_ede_cbc', sha}, {dh_anon, aes_128_cbc, sha}, {dh_anon, + aes_256_cbc, sha}) are supported for testing purposes and will + only work if explicitly enabled by this option and they are supported/enabled + by the peer also. </item> <tag>{ssl_imp, ssl_imp()}</tag> |