| Index: net/third_party/nss/patches/versionskew.patch
|
| ===================================================================
|
| --- net/third_party/nss/patches/versionskew.patch (revision 196870)
|
| +++ net/third_party/nss/patches/versionskew.patch (working copy)
|
| @@ -1,6 +1,6 @@
|
| -diff -pu -r a/net/third_party/nss/ssl/sslsecur.c b/net/third_party/nss/ssl/sslsecur.c
|
| ---- a/net/third_party/nss/ssl/sslsecur.c 2012-05-24 13:34:51.000000000 -0700
|
| -+++ b/net/third_party/nss/ssl/sslsecur.c 2012-11-09 15:15:21.901558709 -0800
|
| +diff -pu a/nss/lib/ssl/sslsecur.c b/nss/lib/ssl/sslsecur.c
|
| +--- a/nss/lib/ssl/sslsecur.c 2013-04-27 09:17:17.216390477 -0700
|
| ++++ b/nss/lib/ssl/sslsecur.c 2013-04-27 09:18:33.277467610 -0700
|
| @@ -1312,6 +1312,10 @@ SSL_SetURL(PRFileDesc *fd, const char *u
|
| SECStatus
|
| SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList)
|
| @@ -20,10 +20,10 @@
|
| }
|
|
|
| /*
|
| -diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
|
| ---- a/net/third_party/nss/ssl/sslsock.c 2012-09-24 16:57:42.000000000 -0700
|
| -+++ b/net/third_party/nss/ssl/sslsock.c 2012-11-09 15:15:21.901558709 -0800
|
| -@@ -1603,6 +1603,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint
|
| +diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
|
| +--- a/nss/lib/ssl/sslsock.c 2013-04-27 09:17:17.226390616 -0700
|
| ++++ b/nss/lib/ssl/sslsock.c 2013-04-27 09:18:33.277467610 -0700
|
| +@@ -1622,6 +1622,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint
|
| PRFileDesc *
|
| SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
|
| {
|
| @@ -35,7 +35,7 @@
|
| sslSocket * sm = NULL, *ss = NULL;
|
| int i;
|
| sslServerCerts * mc = NULL;
|
| -@@ -1711,6 +1716,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile
|
| +@@ -1737,6 +1742,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile
|
| return fd;
|
| loser:
|
| return NULL;
|
|
|