aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-04-27 10:38:50 +0200
committerHenrik Nord <[email protected]>2016-04-27 10:38:50 +0200
commit0ad440a44a799be9b2943c82197cb808cddba87d (patch)
tree40850a1b7d3c9b4b4aedc08e3d6b6336a965a553 /lib/ssl/doc
parent75fa8578cb847c15a10360523ecdbaabf507128d (diff)
parentfea24ae8d37b33e97ef1897d0d3b6cdb2338c051 (diff)
downloadotp-0ad440a44a799be9b2943c82197cb808cddba87d.tar.gz
otp-0ad440a44a799be9b2943c82197cb808cddba87d.tar.bz2
otp-0ad440a44a799be9b2943c82197cb808cddba87d.zip
Merge branch 'maint-18'
Conflicts: OTP_VERSION lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl_cipher.erl lib/ssl/src/tls_v1.erl lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/notes.xml30
1 files changed, 30 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 7c55dd4c96..00419b63db 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -28,6 +28,36 @@
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 7.3.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Corrections to cipher suite handling using the 3 and 4
+ tuple format in addition to commit
+ 89d7e21cf4ae988c57c8ef047bfe85127875c70c</p>
+ <p>
+ Own Id: OTP-13511</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Make values for the TLS-1.2 signature_algorithms
+ extension configurable</p>
+ <p>
+ Own Id: OTP-13261</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 7.3</title>
<section><title>Fixed Bugs and Malfunctions</title>