From f39289291f9fcbb7b813584edb7d465e480be212 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 15 Apr 2010 13:50:44 +0000
Subject: ** Empty commit message **

---
 lib/public_key/doc/src/notes.xml | 21 ++++++++++++++
 lib/public_key/vsn.mk            |  3 +-
 lib/ssl/doc/src/notes.xml        | 61 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index a5fbc81093..33a424f432 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -33,6 +33,27 @@
     <rev>A</rev>
     <file>notes.xml</file>
   </header>
+<section><title>Public_Key 0.6</title>
+
+<section><title>Improvements and New Features</title>
+<list>
+  <item>
+    <p>
+      Support for Diffie-Hellman. ssl-3.11 requires
+    public_key-0.6.</p>
+    <p>
+    Own Id: OTP-7046</p>
+  </item>
+  <item>
+    <p>
+    Moved extended key usage test for ssl values to ssl.</p>
+    <p>
+    Own Id: OTP-8553 Aux Id: seq11541, OTP-8554 </p>
+  </item>
+</list>
+</section>
+
+</section>
 
 <section><title>Public_Key 0.5</title>
 
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index f395b919c6..da1465d538 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1,5 +1,6 @@
 PUBLIC_KEY_VSN = 0.6
-TICKETS = OTP-7046
+TICKETS = OTP-7046 \
+	  OTP-8553
 #TICKETS_o.5 = OTP-8372
 #TICKETS_0.4 = OTP-8250
 #TICKETS_0.3 = OTP-8100 OTP-8142
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 2dd11bc88e..9d13427677 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -30,6 +30,67 @@
   </header>
   <p>This document describes the changes made to the SSL application.
     </p>
+<section><title>SSL 3.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Fixes handling of the option fail_if_no_peer_cert and
+            some undocumented options. Thanks to Rory Byrne.</p>
+          <p>
+            Own Id: OTP-8557</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Support for Diffie-Hellman. ssl-3.11 requires
+            public_key-0.6.</p>
+          <p>
+            Own Id: OTP-7046</p>
+        </item>
+        <item>
+          <p>
+            New ssl now properly handles ssl renegotiation, and
+            initiates a renegotiation if ssl/ltls-sequence numbers
+            comes close to the max value. However RFC-5746 is not yet
+            supported, but will be in an upcoming release.</p>
+          <p>
+            Own Id: OTP-8517</p>
+        </item>
+        <item>
+          <p>
+            When gen_tcp is configured with the {packet,http} option,
+            it automatically switches to expect HTTP Headers after a
+            HTTP Request/Response line has been received. This update
+            fixes ssl to behave in the same way. Thanks to Rory
+            Byrne.</p>
+          <p>
+            Own Id: OTP-8545</p>
+        </item>
+        <item>
+          <p>
+            Ssl now correctly verifies the extended_key_usage
+            extension and also allows the user to verify application
+            specific extensions by supplying an appropriate fun.</p>
+          <p>
+            Own Id: OTP-8554 Aux Id: OTP-8553 </p>
+        </item>
+        <item>
+          <p>
+            Fixed ssl:transport_accept/2 to return properly when
+            socket is closed. Thanks to Rory Byrne.</p>
+          <p>
+            Own Id: OTP-8560</p>
+        </item>
+      </list>
+    </section>
+
+</section>
 
 <section><title>SSL 3.10.9</title>
 
-- 
cgit v1.2.3