Index: net/third_party/nss/patches/aesgcmchromium.patch |
diff --git a/net/third_party/nss/patches/aesgcmchromium.patch b/net/third_party/nss/patches/aesgcmchromium.patch |
index 0cf49a1edc23da711944ac106c819d2690b92e10..e735837ca61058ea5087ed5ff6d3b99c27110172 100644 |
--- a/net/third_party/nss/patches/aesgcmchromium.patch |
+++ b/net/third_party/nss/patches/aesgcmchromium.patch |
@@ -1,6 +1,7 @@ |
-diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
---- a/nss/lib/ssl/ssl3con.c 2014-01-17 18:04:43.127747463 -0800 |
-+++ b/nss/lib/ssl/ssl3con.c 2014-01-17 18:06:21.919386088 -0800 |
+diff --git a/ssl/ssl3con.c b/ssl/ssl3con.c |
+index da0abfb..375ed6a 100644 |
+--- a/ssl/ssl3con.c |
++++ b/ssl/ssl3con.c |
@@ -8,6 +8,7 @@ |
/* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */ |
@@ -19,7 +20,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
#ifndef PK11_SETATTRS |
#define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \ |
-@@ -1842,6 +1846,63 @@ ssl3_BuildRecordPseudoHeader(unsigned ch |
+@@ -1874,6 +1878,63 @@ ssl3_BuildRecordPseudoHeader(unsigned char *out, |
return 13; |
} |
@@ -83,7 +84,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
static SECStatus |
ssl3_AESGCM(ssl3KeyMaterial *keys, |
PRBool doDecrypt, |
-@@ -1893,10 +1960,10 @@ ssl3_AESGCM(ssl3KeyMaterial *keys, |
+@@ -1925,10 +1986,10 @@ ssl3_AESGCM(ssl3KeyMaterial *keys, |
gcmParams.ulTagBits = tagSize * 8; |
if (doDecrypt) { |
@@ -96,7 +97,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
maxout, in, inlen); |
} |
*outlen += (int) uOutLen; |
-@@ -5103,6 +5170,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBo |
+@@ -5147,6 +5208,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending) |
ssl3_DisableNonDTLSSuites(ss); |
} |
@@ -107,7 +108,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c |
/* how many suites are permitted by policy and user preference? */ |
num_suites = count_cipher_suites(ss, ss->ssl3.policy, PR_TRUE); |
if (!num_suites) { |
-@@ -8080,6 +8151,10 @@ ssl3_HandleClientHello(sslSocket *ss, SS |
+@@ -8159,6 +8224,10 @@ ssl3_HandleClientHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length) |
ssl3_DisableNonDTLSSuites(ss); |
} |