diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:21:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:21:52 +0100 |
| commit | ccbf6811b1e0379df30e35bd6265f9221632732c (patch) | |
| tree | ad1439f0720651c794935f1abb877faff5a7750c /lib/ssl/doc/src | |
| parent | ac82610a03c8b17b6bcae91aa4252a1930c51e85 (diff) | |
| parent | 549785976441514377e1da14c5c1e7fb289456e0 (diff) | |
| download | otp-ccbf6811b1e0379df30e35bd6265f9221632732c.tar.gz otp-ccbf6811b1e0379df30e35bd6265f9221632732c.tar.bz2 otp-ccbf6811b1e0379df30e35bd6265f9221632732c.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_cipher.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/ssl/doc/src')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 9e6d294f09..7a5f72710a 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -427,6 +427,23 @@ fun(srp, Username :: string(), UserState :: term()) -> Indication extension will be sent if possible, this option may also be used to disable that behavior.</p> </item> + <tag>{fallback, boolean()}</tag> + <item> + <p> Send special cipher suite TLS_FALLBACK_SCSV to avoid undesired TLS version downgrade. + Defaults to false</p> + <warning><p>Note this option is not needed in normal TLS usage and should not be used + to implement new clients. But legacy clients that that retries connections in the following manner</p> + + <p><c> ssl:connect(Host, Port, [...{versions, ['tlsv2', 'tlsv1.1', 'tlsv1', 'sslv3']}])</c></p> + <p><c> ssl:connect(Host, Port, [...{versions, [tlsv1.1', 'tlsv1', 'sslv3']}, {fallback, true}])</c></p> + <p><c> ssl:connect(Host, Port, [...{versions, ['tlsv1', 'sslv3']}, {fallback, true}]) </c></p> + <p><c> ssl:connect(Host, Port, [...{versions, ['sslv3']}, {fallback, true}]) </c></p> + + <p>may use it to avoid undesired TLS version downgrade. Note that TLS_FALLBACK_SCSV must also + be supported by the server for the prevention to work. + </p></warning> + </item> + </taglist> </section> |