aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-02 09:09:10 +0200
committerHenrik Nord <[email protected]>2015-06-02 09:09:10 +0200
commitb37c4e256dfd827cdfcb92078c1217a13aa2e656 (patch)
tree7c53916cfa4b16db12fe0b8492755caa5b50c2f7 /lib/ssl/doc/src
parente0e2a98d63f73121a56ae199cbfeba42b3a67fa6 (diff)
parent21b8941d83516e381000387c47758bc7f040ae8b (diff)
downloadotp-b37c4e256dfd827cdfcb92078c1217a13aa2e656.tar.gz
otp-b37c4e256dfd827cdfcb92078c1217a13aa2e656.tar.bz2
otp-b37c4e256dfd827cdfcb92078c1217a13aa2e656.zip
Merge branch 'maint'
Conflicts: OTP_VERSION lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/notes.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 352563700b..fe0606b1a3 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -25,7 +25,23 @@
<file>notes.xml</file>
</header>
<p>This document describes the changes made to the SSL application.</p>
- <section><title>SSL 6.0</title>
+ <section><title>SSL 6.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Terminate gracefully when receving bad input to premaster
+ secret calculation</p>
+ <p>
+ Own Id: OTP-12783</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SSL 6.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>