Index: net/third_party/nss/patches/aesgcmchromium.patch |
=================================================================== |
--- net/third_party/nss/patches/aesgcmchromium.patch (revision 242942) |
+++ net/third_party/nss/patches/aesgcmchromium.patch (working copy) |
@@ -1,5 +1,6 @@ |
---- net/third_party/nss/ssl/ssl3con.c.orig 2013-08-20 12:00:16.742760827 -0700 |
-+++ net/third_party/nss/ssl/ssl3con.c 2013-08-20 11:59:56.782463207 -0700 |
+diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
+--- a/nss/lib/ssl/ssl3con.c 2014-01-03 19:42:10.424660677 -0800 |
++++ b/nss/lib/ssl/ssl3con.c 2014-01-03 19:42:18.324789858 -0800 |
@@ -44,6 +44,9 @@ |
#ifdef NSS_ENABLE_ZLIB |
#include "zlib.h" |
@@ -10,7 +11,7 @@ |
#ifndef PK11_SETATTRS |
#define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \ |
-@@ -1819,6 +1822,69 @@ ssl3_BuildRecordPseudoHeader(unsigned ch |
+@@ -1842,6 +1845,69 @@ ssl3_BuildRecordPseudoHeader(unsigned ch |
return 13; |
} |
@@ -80,7 +81,7 @@ |
static SECStatus |
ssl3_AESGCM(ssl3KeyMaterial *keys, |
PRBool doDecrypt, |
-@@ -1870,10 +1936,10 @@ ssl3_AESGCM(ssl3KeyMaterial *keys, |
+@@ -1893,10 +1959,10 @@ ssl3_AESGCM(ssl3KeyMaterial *keys, |
gcmParams.ulTagBits = tagSize * 8; |
if (doDecrypt) { |
@@ -93,7 +94,7 @@ |
maxout, in, inlen); |
} |
*outlen += (int) uOutLen; |
-@@ -5023,6 +5089,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBo |
+@@ -5102,6 +5168,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBo |
ssl3_DisableNonDTLSSuites(ss); |
} |
@@ -103,8 +104,8 @@ |
+ |
/* how many suites are permitted by policy and user preference? */ |
num_suites = count_cipher_suites(ss, ss->ssl3.policy, PR_TRUE); |
- if (!num_suites) |
-@@ -7728,6 +7798,10 @@ ssl3_HandleClientHello(sslSocket *ss, SS |
+ if (!num_suites) { |
+@@ -8057,6 +8127,10 @@ ssl3_HandleClientHello(sslSocket *ss, SS |
ssl3_DisableNonDTLSSuites(ss); |
} |