X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=CHANGES;h=797c02118c11938899035b19b58ce9ae72034c1c;hp=1df12173dee728e12338d08fe7cda99cb1192b38;hb=73c92dfa0c15d7932d86130a525d1a1bc43c312a;hpb=0467ea68624450ecece4cde0d5803499aaff19c2

diff --git a/CHANGES b/CHANGES
index 1df12173de..797c02118c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,17 +4,8 @@
 
  Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]
 
-  *) Experimental workaround TLS filler (WTF) extension. Based on a suggested
-     workaround for the "TLS hang bug" (see FAQ and PR#2771): if the TLS client
-     Hello record length value would otherwise be > 255 and less that 512
-     pad with a dummy extension containing zeroes so it is at least 512 bytes
-     long.
-
-     To enable it use an unused extension number (for example 0x4242) using
-     e.g. -DTLSEXT_TYPE_wtf=0x4242
-
-     WARNING: EXPERIMENTAL, SUBJECT TO CHANGE.
- 
+  *) Use algorithm specific chains in SSL_CTX_use_certificate_chain_file():
+     this fixes a limiation in previous versions of OpenSSL.
      [Steve Henson]
 
   *) Experimental encrypt-then-mac support.
@@ -286,6 +277,30 @@
 
  Changes between 1.0.1e and 1.0.2 [xx XXX xxxx]
 
+  *) Keep original DTLS digest and encryption contexts in retransmission
+     structures so we can use the previous session parameters if they need
+     to be resent. (CVE-2013-6450)
+     [Steve Henson]
+
+  *) TLS pad extension: draft-agl-tls-padding-02
+
+     Workaround for the "TLS hang bug" (see FAQ and PR#2771): if the
+     TLS client Hello record length value would otherwise be > 255 and
+     less that 512 pad with a dummy extension containing zeroes so it
+     is at least 512 bytes long.
+
+     To enable it use an unused extension number (for example chrome uses
+     35655) using:
+
+     e.g. -DTLSEXT_TYPE_padding=35655
+
+     Since the extension is ignored the actual number doesn't matter as long
+     as it doesn't clash with any existing extension.
+
+     This will be updated when the extension gets an official number.
+
+     [Adam Langley, Steve Henson]
+
   *) Add functions to allocate and set the fields of an ECDSA_METHOD
      structure.
      [Douglas E. Engert, Steve Henson]