Merge 252421 "net: don't always add TLS padding."

net/third_party/nss/patches/paddingextensionall.patch

Index: net/third_party/nss/patches/paddingextensionall.patch
===================================================================
--- net/third_party/nss/patches/paddingextensionall.patch	(revision 253837)
+++ net/third_party/nss/patches/paddingextensionall.patch	(working copy)
@@ -1,25 +0,0 @@
-diff -pu a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c
---- a/nss/lib/ssl/ssl3ext.c	2014-01-17 17:59:03.242109996 -0800
-+++ b/nss/lib/ssl/ssl3ext.c	2014-01-17 18:17:39.630620563 -0800
-@@ -2332,7 +2332,11 @@ ssl3_CalculatePaddingExtensionLength(uns
- 				clientHelloLength;
-     unsigned int extensionLength;
- 
--    if (recordLength < 256 || recordLength >= 512) {
-+    /* This condition should be:
-+     *   if (recordLength < 256 || recordLength >= 512) {
-+     * It has been changed, temporarily, to test whether 512 byte ClientHellos
-+     * are a compatibility problem. */
-+    if (recordLength >= 512) {
- 	return 0;
-     }
- 
-@@ -2353,7 +2357,7 @@ ssl3_AppendPaddingExtension(sslSocket *s
- 			    PRUint32 maxBytes)
- {
-     unsigned int paddingLen = extensionLen - 4;
--    static unsigned char padding[256];
-+    static unsigned char padding[512];
- 
-     if (extensionLen == 0) {
- 	return 0;