diff options
Diffstat (limited to 'chromium/net/third_party/nss/patches/tlsunique.patch')
| -rw-r--r-- | chromium/net/third_party/nss/patches/tlsunique.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/net/third_party/nss/patches/tlsunique.patch b/chromium/net/third_party/nss/patches/tlsunique.patch index 69370a35e30..5b094a7c811 100644 --- a/chromium/net/third_party/nss/patches/tlsunique.patch +++ b/chromium/net/third_party/nss/patches/tlsunique.patch @@ -1,7 +1,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c ---- a/nss/lib/ssl/ssl3con.c 2013-07-31 14:10:00.332814714 -0700 -+++ b/nss/lib/ssl/ssl3con.c 2013-07-31 14:10:12.202988980 -0700 -@@ -11732,6 +11732,68 @@ ssl3_InitSocketPolicy(sslSocket *ss) +--- a/nss/lib/ssl/ssl3con.c 2014-01-17 17:59:03.242109996 -0800 ++++ b/nss/lib/ssl/ssl3con.c 2014-01-17 17:59:45.862816905 -0800 +@@ -12383,6 +12383,68 @@ ssl3_InitSocketPolicy(sslSocket *ss) PORT_Memcpy(ss->cipherSuites, cipherSuites, sizeof cipherSuites); } @@ -71,9 +71,9 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c * the caller of this function. */ diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h ---- a/nss/lib/ssl/ssl.h 2013-07-31 14:10:00.342814862 -0700 -+++ b/nss/lib/ssl/ssl.h 2013-07-31 14:10:12.202988980 -0700 -@@ -249,6 +249,27 @@ SSL_IMPORT SECStatus SSL_CipherPrefGetDe +--- a/nss/lib/ssl/ssl.h 2014-01-17 17:59:03.242109996 -0800 ++++ b/nss/lib/ssl/ssl.h 2014-01-17 17:59:45.862816905 -0800 +@@ -282,6 +282,27 @@ SSL_IMPORT SECStatus SSL_CipherPrefGetDe SSL_IMPORT SECStatus SSL_CipherPolicySet(PRInt32 cipher, PRInt32 policy); SSL_IMPORT SECStatus SSL_CipherPolicyGet(PRInt32 cipher, PRInt32 *policy); @@ -102,9 +102,9 @@ diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h ** ** This API should be used to control SSL 3.0 & TLS support instead of the diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h ---- a/nss/lib/ssl/sslimpl.h 2013-07-31 14:10:00.342814862 -0700 -+++ b/nss/lib/ssl/sslimpl.h 2013-07-31 14:10:12.202988980 -0700 -@@ -1770,6 +1770,11 @@ extern PRBool ssl_GetSessionTicketKeysPK +--- a/nss/lib/ssl/sslimpl.h 2014-01-17 17:59:03.242109996 -0800 ++++ b/nss/lib/ssl/sslimpl.h 2014-01-17 17:59:45.862816905 -0800 +@@ -1853,6 +1853,11 @@ extern PRBool ssl_GetSessionTicketKeysPK extern SECStatus ssl3_ValidateNextProtoNego(const unsigned char* data, unsigned int length); @@ -117,9 +117,9 @@ diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h extern PRFileDesc *ssl_NewPRSocket(sslSocket *ss, PRFileDesc *fd); extern void ssl_FreePRSocket(PRFileDesc *fd); diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c ---- a/nss/lib/ssl/sslsock.c 2013-07-31 14:10:00.342814862 -0700 -+++ b/nss/lib/ssl/sslsock.c 2013-07-31 14:10:12.202988980 -0700 -@@ -1366,6 +1366,27 @@ NSS_SetFrancePolicy(void) +--- a/nss/lib/ssl/sslsock.c 2014-01-17 17:59:03.252110162 -0800 ++++ b/nss/lib/ssl/sslsock.c 2014-01-17 17:59:45.872817074 -0800 +@@ -1308,6 +1308,27 @@ NSS_SetFrancePolicy(void) return NSS_SetDomesticPolicy(); } |