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

net/third_party/nss/ssl/ssl3ext.c

Index: net/third_party/nss/ssl/ssl3ext.c
===================================================================
--- net/third_party/nss/ssl/ssl3ext.c	(revision 253837)
+++ net/third_party/nss/ssl/ssl3ext.c	(working copy)
@@ -2342,11 +2342,7 @@
 				clientHelloLength;
     unsigned int extensionLength;
 
-    /* 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) {
+    if (recordLength < 256 || recordLength >= 512) {
 	return 0;
     }
 
@@ -2367,7 +2363,7 @@
 			    PRUint32 maxBytes)
 {
     unsigned int paddingLen = extensionLen - 4;
-    static unsigned char padding[512];
+    static unsigned char padding[256];
 
     if (extensionLen == 0) {
 	return 0;