aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/ssl_introduction.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-25 17:33:10 +0100
committerIngela Anderton Andin <[email protected]>2018-01-25 17:33:10 +0100
commit29d14ac3cd705d71e68ed42d4b2a0898544ec077 (patch)
treea6030c5388ea800234bfa80fbc7493ec47c90e12 /lib/ssl/doc/src/ssl_introduction.xml
parentf05074ac001a5f81f98c08d8812850a7d0b9ab18 (diff)
parent6a38adea390ff4c04103037a5fbd9044c6da12ad (diff)
downloadotp-29d14ac3cd705d71e68ed42d4b2a0898544ec077.tar.gz
otp-29d14ac3cd705d71e68ed42d4b2a0898544ec077.tar.bz2
otp-29d14ac3cd705d71e68ed42d4b2a0898544ec077.zip
Merge branch 'ingela/DTLS-supported'
* ingela/DTLS-supported: ssl: Fix typo dtls: Add DTLS handling to utility functions ssl: Document enhancment ssl: Document DTLS
Diffstat (limited to 'lib/ssl/doc/src/ssl_introduction.xml')
-rw-r--r--lib/ssl/doc/src/ssl_introduction.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl_introduction.xml b/lib/ssl/doc/src/ssl_introduction.xml
index 25b05a769d..a416924eb1 100644
--- a/lib/ssl/doc/src/ssl_introduction.xml
+++ b/lib/ssl/doc/src/ssl_introduction.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2015</year>
- <year>2015</year>
+ <year>2017</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -41,14 +41,15 @@
authenticate the counterpart with whom they communicate,
and to exchange a symmetric key for payload encryption. The protocol provides
data/message confidentiality (encryption), integrity (through message authentication code checks)
- and host verification (through certificate path validation).</p>
+ and host verification (through certificate path validation). DTLS (Datagram Transport Layer Security) that
+ is based on TLS but datagram oriented instead of stream oriented.</p>
</section>
<section>
<title>Prerequisites</title>
<p>It is assumed that the reader is familiar with the Erlang
programming language, the concepts of OTP, and has a basic
- understanding of SSL/TLS.</p>
+ understanding of SSL/TLS/DTLS.</p>
</section>
</chapter>