Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

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

Issue 111853013: Update net/third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update the comment in sslenum.c for the two CHACHA20 cipher suites Created 6 years, 11 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
« no previous file with comments | « net/third_party/nss/patches/tlsunique.patch ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff -pu a/nss/lib/ssl/sslsecur.c b/nss/lib/ssl/sslsecur.c
2 --- a/nss/lib/ssl/sslsecur.c 2013-07-31 12:07:10.974699609 -0700
3 +++ b/nss/lib/ssl/sslsecur.c 2013-07-31 12:27:24.322323927 -0700
4 @@ -1311,6 +1311,10 @@ SSL_SetURL(PRFileDesc *fd, const char *u
5 SECStatus
6 SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList)
7 {
8 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
9 + PR_NOT_REACHED("not implemented");
10 + return SECFailure;
11 +#if 0
12 sslSocket * ss = ssl_FindSocket(fd);
13 CERTDistNames *names = NULL;
14
15 @@ -1338,6 +1342,7 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERT
16 ssl_Release1stHandshakeLock(ss);
17
18 return SECSuccess;
19 +#endif
20 }
21
22 /*
23 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
24 --- a/nss/lib/ssl/sslsock.c 2013-07-31 12:07:10.974699609 -0700
25 +++ b/nss/lib/ssl/sslsock.c 2013-07-31 12:27:24.322323927 -0700
26 @@ -1625,6 +1625,11 @@ SSL_GetSRTPCipher(PRFileDesc *fd, PRUint
27 PRFileDesc *
28 SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
29 {
30 + PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
31 + PR_NOT_REACHED("not implemented");
32 + return NULL;
33 +
34 +#if 0
35 sslSocket * sm = NULL, *ss = NULL;
36 int i;
37 sslServerCerts * mc = NULL;
38 @@ -1742,6 +1747,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile
39 return fd;
40 loser:
41 return NULL;
42 +#endif
43 }
44
45 PRBool
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/tlsunique.patch ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698