From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 13 Dec 2013 14:41:32 +0000 (+0000)
Subject: Backport TLS padding extension from master.
X-Git-Tag: OpenSSL_1_0_1g~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0071215832e09c77f62193cec8f00db22854f3b8;p=thirdparty%2Fopenssl.git

Backport TLS padding extension from master.
(cherry picked from commit 8c6d8c2a498146992123ef5407d7ba01a1e7224d)

Conflicts:

	CHANGES
	ssl/t1_lib.c
---

diff --git a/NEWS b/NEWS
index 2d14535174c..ce1c04c9361 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@
 
   Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [under development]
 
-      o
+      o Add TLS padding extension workaround for broken servers.
 
   Known issues in OpenSL 1.0.1f