aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-01-20 16:00:28 +0100
committerIngela Anderton Andin <[email protected]>2011-01-20 16:00:28 +0100
commit4c70b07402581cbcdc1204961344cb28bf383d20 (patch)
treedbc7cd3d708cd78b4f4e130c6370e588d4e4e026 /lib/ssl/doc/src
parente0120ba9ae60392cff67d7f17649353f516b1ab3 (diff)
parent6deca2a989772f261b59f11da031832f1ea9c45d (diff)
downloadotp-4c70b07402581cbcdc1204961344cb28bf383d20.tar.gz
otp-4c70b07402581cbcdc1204961344cb28bf383d20.tar.bz2
otp-4c70b07402581cbcdc1204961344cb28bf383d20.zip
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/notes.xml24
1 files changed, 23 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 2ccbc5348c..8f81ccb567 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -31,7 +31,29 @@
<p>This document describes the changes made to the SSL application.
</p>
- <section><title>SSL 4.1.2</title>
+ <section><title>SSL 4.1.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed error in cache-handling fix from ssl-4.1.2</p>
+ <p>
+ Own Id: OTP-9018 Aux Id: seq11739 </p>
+ </item>
+ <item>
+ <p>
+ Verification of a critical extended_key_usage-extension
+ corrected</p>
+ <p>
+ Own Id: OTP-9029 Aux Id: seq11541 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SSL 4.1.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>