diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
| commit | c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (patch) | |
| tree | b341037c365875680be3c5752e0fca748851b84b /lib/ssl/doc/src | |
| parent | b9872a64b863c424c4d548d4454e6e1b3153ddc4 (diff) | |
| parent | 748d502138a941ddf79accd8dffc398ce84a21a7 (diff) | |
| download | otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.gz otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.bz2 otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.zip | |
Merge branch 'ingela/ssl/no-sslv2-hello-support/OTP-14824'
* ingela/ssl/no-sslv2-hello-support/OTP-14824:
ssl: Remove interoperability option v2_hello_compatible
Diffstat (limited to 'lib/ssl/doc/src')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 6 | ||||
| -rw-r--r-- | lib/ssl/doc/src/ssl_app.xml | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 7267083e32..8c1b1541c7 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -821,12 +821,6 @@ fun(srp, Username :: string(), UserState :: term()) -> client certificate is requested. For more details see the <seealso marker="#client_signature_algs">corresponding client option</seealso>. </p> </item> - <tag><c>{v2_hello_compatible, boolean()}</c></tag> - <item>If true, the server accepts clients that send hello messages on SSL-2.0 format but offers - supported SSL/TLS versions. Defaults to false, that is the server will not interoperate with clients that - offers SSL-2.0. - </item> - </taglist> </section> diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml index 51070bb083..e22d43db0e 100644 --- a/lib/ssl/doc/src/ssl_app.xml +++ b/lib/ssl/doc/src/ssl_app.xml @@ -40,7 +40,8 @@ <list type="bulleted"> <item>Supported SSL/TLS/DTLS-versions are SSL-3.0, TLS-1.0, TLS-1.1, TLS-1.2, DTLS-1.0 (based on TLS-1.1), DTLS-1.2 (based on TLS-1.2)</item> - <item>For security reasons SSL-2.0 is not supported.</item> + <item>For security reasons SSL-2.0 is not supported. + Interoperability with SSL-2.0 enabled clients dropped. (OTP 21) </item> <item>For security reasons SSL-3.0 is no longer supported by default, but can be configured. (OTP 19) </item> <item>For security reasons RSA key exchange cipher suites are no longer supported by default, |