net/third_party/nss/patches/versionskew.patch - Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/third_party/nss/patches/versionskew.patch

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Make the changes rsleevi suggested Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff -pu -r a/net/third_party/nss/ssl/sslsecur.c b/net/third_party/nss/ssl/sslse cur.c	1 diff -pu a/nss/lib/ssl/sslsecur.c b/nss/lib/ssl/sslsecur.c

2 --- a/net/third_party/nss/ssl/sslsecur.c» 2012-05-24 13:34:51.000000000 -0 700	2 --- a/nss/lib/ssl/sslsecur.c» 2013-04-27 09:17:17.216390477 -0700

3 +++ b/net/third_party/nss/ssl/sslsecur.c» 2012-11-09 15:15:21.901558709 -0 800	3 +++ b/nss/lib/ssl/sslsecur.c» 2013-04-27 09:18:33.277467610 -0700

4 @@ -1312,6 +1312,10 @@ SSL_SetURL(PRFileDesc fd, const char u	4 @@ -1312,6 +1312,10 @@ SSL_SetURL(PRFileDesc fd, const char u

5 SECStatus	5 SECStatus

6 SSL_SetTrustAnchors(PRFileDesc fd, CERTCertList certList)	6 SSL_SetTrustAnchors(PRFileDesc fd, CERTCertList certList)

7 {	7 {

8 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);	8 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);

9 + PR_NOT_REACHED("not implemented");	9 + PR_NOT_REACHED("not implemented");

10 + return SECFailure;	10 + return SECFailure;

11 +#if 0	11 +#if 0

12 sslSocket * ss = ssl_FindSocket(fd);	12 sslSocket * ss = ssl_FindSocket(fd);

13 CERTDistNames *names = NULL;	13 CERTDistNames *names = NULL;

14	14

15 @@ -1339,6 +1343,7 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERT	15 @@ -1339,6 +1343,7 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERT

16 ssl_Release1stHandshakeLock(ss);	16 ssl_Release1stHandshakeLock(ss);

17	17

18 return SECSuccess;	18 return SECSuccess;

19 +#endif	19 +#endif

20 }	20 }

21	21

22 /*	22 /*

23 diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsoc k.c	23 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c

24 --- a/net/third_party/nss/ssl/sslsock.c»2012-09-24 16:57:42.000000000 -0700	24 --- a/nss/lib/ssl/sslsock.c» 2013-04-27 09:17:17.226390616 -0700

25 +++ b/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:15:21.901558709 -0800	25 +++ b/nss/lib/ssl/sslsock.c» 2013-04-27 09:18:33.277467610 -0700

26 @@ -1603,6 +1603,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint	26 @@ -1622,6 +1622,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint

27 PRFileDesc *	27 PRFileDesc *

28 SSL_ReconfigFD(PRFileDesc model, PRFileDesc fd)	28 SSL_ReconfigFD(PRFileDesc model, PRFileDesc fd)

29 {	29 {

30 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);	30 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);

31 + PR_NOT_REACHED("not implemented");	31 + PR_NOT_REACHED("not implemented");

32 + return NULL;	32 + return NULL;

33 +	33 +

34 +#if 0	34 +#if 0

35 sslSocket * sm = NULL, *ss = NULL;	35 sslSocket * sm = NULL, *ss = NULL;

36 int i;	36 int i;

37 sslServerCerts * mc = NULL;	37 sslServerCerts * mc = NULL;

38 @@ -1711,6 +1716,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile	38 @@ -1737,6 +1742,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile

39 return fd;	39 return fd;

40 loser:	40 loser:

41 return NULL;	41 return NULL;

42 +#endif	42 +#endif

43 }	43 }

44	44

45 PRBool	45 PRBool

OLD	NEW

« no previous file with comments | « net/third_party/nss/patches/unusedvariables.patch ('k') | net/third_party/nss/ssl.gyp » ('j') | net/third_party/nss/ssl/ssl3con.c » ('J')