| OLD | NEW |
| 1 From 9a71b466147bcd334243d62996558a609657c07c Mon Sep 17 00:00:00 2001 | 1 diff -pu -r a/net/third_party/nss/ssl/sslsecur.c b/net/third_party/nss/ssl/sslse
cur.c |
| 2 From: Adam Langley <agl@chromium.org> | 2 --- a/net/third_party/nss/ssl/sslsecur.c» 2012-05-24 13:34:51.000000000 -0
700 |
| 3 Date: Mon, 3 Oct 2011 12:19:48 -0400 | 3 +++ b/net/third_party/nss/ssl/sslsecur.c» 2012-11-09 15:15:21.901558709 -0
800 |
| 4 Subject: [PATCH] versionskew.patch | 4 @@ -1312,6 +1312,10 @@ SSL_SetURL(PRFileDesc *fd, const char *u |
| 5 | |
| 6 --- | |
| 7 mozilla/security/nss/lib/ssl/sslsecur.c | 5 +++++ | |
| 8 mozilla/security/nss/lib/ssl/sslsock.c | 6 ++++++ | |
| 9 2 files changed, 11 insertions(+), 0 deletions(-) | |
| 10 | |
| 11 diff --git a/mozilla/security/nss/lib/ssl/sslsecur.c b/mozilla/security/nss/lib/
ssl/sslsecur.c | |
| 12 index a0cae54..816b8f6 100644 | |
| 13 --- a/mozilla/security/nss/lib/ssl/sslsecur.c | |
| 14 +++ b/mozilla/security/nss/lib/ssl/sslsecur.c | |
| 15 @@ -1316,6 +1316,10 @@ SSL_SetURL(PRFileDesc *fd, const char *url) | |
| 16 SECStatus | 5 SECStatus |
| 17 SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList) | 6 SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList) |
| 18 { | 7 { |
| 19 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); | 8 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); |
| 20 + PR_NOT_REACHED("not implemented"); | 9 + PR_NOT_REACHED("not implemented"); |
| 21 + return SECFailure; | 10 + return SECFailure; |
| 22 +#if 0 | 11 +#if 0 |
| 23 sslSocket * ss = ssl_FindSocket(fd); | 12 sslSocket * ss = ssl_FindSocket(fd); |
| 24 CERTDistNames *names = NULL; | 13 CERTDistNames *names = NULL; |
| 25 | 14 |
| 26 @@ -1343,6 +1347,7 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList
) | 15 @@ -1339,6 +1343,7 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERT |
| 27 ssl_Release1stHandshakeLock(ss); | 16 ssl_Release1stHandshakeLock(ss); |
| 28 | 17 |
| 29 return SECSuccess; | 18 return SECSuccess; |
| 30 +#endif | 19 +#endif |
| 31 } | 20 } |
| 32 | 21 |
| 33 /* | 22 /* |
| 34 diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/s
sl/sslsock.c | 23 diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsoc
k.c |
| 35 index 4c8fbfd..b7e32a2 100644 | 24 --- a/net/third_party/nss/ssl/sslsock.c»2012-09-24 16:57:42.000000000 -0700 |
| 36 --- a/mozilla/security/nss/lib/ssl/sslsock.c | 25 +++ b/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:15:21.901558709 -0800 |
| 37 +++ b/mozilla/security/nss/lib/ssl/sslsock.c | 26 @@ -1603,6 +1603,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint |
| 38 @@ -1343,6 +1343,11 @@ SSL_GetNextProto(PRFileDesc *fd, int *state, unsigned cha
r *buf, | |
| 39 PRFileDesc * | 27 PRFileDesc * |
| 40 SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd) | 28 SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd) |
| 41 { | 29 { |
| 42 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); | 30 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); |
| 43 + PR_NOT_REACHED("not implemented"); | 31 + PR_NOT_REACHED("not implemented"); |
| 44 + return NULL; | 32 + return NULL; |
| 45 + | 33 + |
| 46 +#if 0 | 34 +#if 0 |
| 47 sslSocket * sm = NULL, *ss = NULL; | 35 sslSocket * sm = NULL, *ss = NULL; |
| 48 int i; | 36 int i; |
| 49 sslServerCerts * mc = sm->serverCerts; | 37 sslServerCerts * mc = NULL; |
| 50 @@ -1445,6 +1450,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd) | 38 @@ -1711,6 +1716,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile |
| 51 return fd; | 39 return fd; |
| 52 loser: | 40 loser: |
| 53 return NULL; | 41 return NULL; |
| 54 +#endif | 42 +#endif |
| 55 } | 43 } |
| 56 | 44 |
| 57 /************************************************************************/ | 45 PRBool |
| OLD | NEW |