aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-07 10:17:40 +0200
committerIngela Anderton Andin <[email protected]>2016-06-07 10:17:40 +0200
commit58beb31dc61edb16fb669317097242f9865149ca (patch)
tree762c43af5cf79a400a014d6178ff6d6f0eef69c6 /lib/ssl/doc
parentac18b8705c78be8bec5bdc14c412af2ced740916 (diff)
parent33afe108de9cf24be47b9ebd740a8f5e19daca79 (diff)
downloadotp-58beb31dc61edb16fb669317097242f9865149ca.tar.gz
otp-58beb31dc61edb16fb669317097242f9865149ca.tar.bz2
otp-58beb31dc61edb16fb669317097242f9865149ca.zip
Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'
* ingela/ssl/phase-out-sslv2-hello/OTP-13465: ssl: Add option to phase out support for sslv2 client hello
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 178e22f2fd..62f6263e9e 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -706,6 +706,12 @@ 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>