aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-06-13 12:33:59 +0200
committerIngela Anderton Andin <[email protected]>2017-06-13 12:33:59 +0200
commit698068c2322d6032f46487f56802246198e576f2 (patch)
tree9e5630193b1ed9c2f5231e97383c07c4e6ce619b
parentbcfa6c109f44f5d7d0d51e1a497321fdee8d166a (diff)
parent2726a0bb5e3839913cf9a452ee168e3443f325c6 (diff)
downloadotp-698068c2322d6032f46487f56802246198e576f2.tar.gz
otp-698068c2322d6032f46487f56802246198e576f2.tar.bz2
otp-698068c2322d6032f46487f56802246198e576f2.zip
Merge branch 'ingela/ssl/dtls-doc'
* ingela/ssl/dtls-doc: ssl: Document DTLS
-rw-r--r--lib/ssl/doc/src/ssl.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 2940ccb1e7..ca2dcbb761 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -189,6 +189,11 @@
<taglist>
+ <tag><c>{protocol, tls | dtls}</c></tag>
+ <item><p>Choose TLS or DTLS protocol for the transport layer security.
+ Defaults to <c>tls</c> Introduced in OTP 20, DTLS support is considered
+ experimental in this release. DTLS over other transports than UDP are not yet supported.</p></item>
+
<tag><c>{cert, public_key:der_encoded()}</c></tag>
<item><p>The DER-encoded users certificate. If this option
is supplied, it overrides option <c>certfile</c>.</p></item>