aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorJulien Barbot <[email protected]>2013-11-03 21:30:03 +0100
committerFredrik Gustafsson <[email protected]>2013-11-06 11:13:59 +0100
commitd370fe05f5884691a89784aa73bfb4eb2176edab (patch)
treee7f1fcff06fa24a17a904159def346506765822e /lib/ssl/doc/src
parentbc8b6bf58c96f8d5a07146ddea145f71fe8c8956 (diff)
downloadotp-d370fe05f5884691a89784aa73bfb4eb2176edab.tar.gz
otp-d370fe05f5884691a89784aa73bfb4eb2176edab.tar.bz2
otp-d370fe05f5884691a89784aa73bfb4eb2176edab.zip
Add a new server_name_indication option to ssl:connect
- Set to disable to explicitly disable SNI support. - Set to a hostname when upgrading from TCP to TLS.
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/ssl.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index aac04095b4..b4182e6d61 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -89,7 +89,7 @@
{ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()}
{next_protocols_advertised, [binary()]} |
{client_preferred_next_protocols, {client | server, [binary()]} | {client | server, [binary()], binary()}} |
- {log_alert, boolean()}
+ {log_alert, boolean()} | {server_name_indication, hostname() | disable}
</c></p>
<p><c>transportoption() = {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom(), ErrTag:atom()}}
@@ -384,6 +384,14 @@ fun(srp, Username :: string(), UserState :: term()) ->
<tag>{srp_identity, {Username :: string(), Password :: string()}</tag>
<item>Specifies the Username and Password to use to authenticate to the server.
</item>
+ <tag>{server_name_indication, hostname()}</tag>
+ <tag>{server_name_indication, disable}</tag>
+ <item>
+ <p>This option can be specified when upgrading a tcp socket to a tls
+ socket to use the TLS Server Name Indication extension.</p>
+ <p>This option can also be set to disable to explicitly disable usage of
+ the Server Name Indication extension.</p>
+ </item>
</taglist>
</section>