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

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

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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/dhvalues.patch ('k') | net/third_party/nss/patches/dtls.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -up a/src/net/third_party/nss/ssl/ssl.h b/src/net/third_party/nss/ssl/ssl.h 1 diff -pu -r a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h
2 --- a/src/net/third_party/nss/ssl/ssl.h»2012-02-28 20:34:50.114663722 -0800 2 --- a/net/third_party/nss/ssl/ssl.h» 2012-11-09 15:44:22.247069358 -0800
3 +++ b/src/net/third_party/nss/ssl/ssl.h»2012-02-29 14:37:56.872332622 -0800 3 +++ b/net/third_party/nss/ssl/ssl.h» 2012-11-09 15:43:25.766243027 -0800
4 @@ -818,6 +818,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti 4 @@ -917,6 +917,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
5 SSLExtensionType extId, 5 SSLExtensionType extId,
6 PRBool *yes); 6 PRBool *yes);
7 7
8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, 8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
9 + PRBool *last_handshake_resumed ); 9 + PRBool *last_handshake_resumed );
10 + 10 +
11 /* 11 /*
12 * Return a boolean that indicates whether the underlying library 12 ** How long should we wait before retransmitting the next flight of
13 * will perform as the caller expects. 13 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a
14 diff -up a/src/net/third_party/nss/ssl/sslsock.c b/src/net/third_party/nss/ssl/s slsock.c 14 diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsoc k.c
15 --- a/src/net/third_party/nss/ssl/sslsock.c» 2012-02-28 20:34:50.124663860 -0 800 15 --- a/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:44:22.247069358 -0800
16 +++ b/src/net/third_party/nss/ssl/sslsock.c» 2012-02-29 14:39:13.203415737 -0 800 16 +++ b/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:40:33.053714908 -0800
17 @@ -1590,6 +1590,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *f 17 @@ -1912,6 +1912,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *f
18 return SECSuccess; 18 return SECSuccess;
19 } 19 }
20 20
21 +SECStatus 21 +SECStatus
22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { 22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) {
23 + sslSocket *ss = ssl_FindSocket(fd); 23 + sslSocket *ss = ssl_FindSocket(fd);
24 + 24 +
25 + if (!ss) { 25 + if (!ss) {
26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", 26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
27 + SSL_GETPID(), fd)); 27 + SSL_GETPID(), fd));
28 + return SECFailure; 28 + return SECFailure;
29 + } 29 + }
30 + 30 +
31 + *handshake_resumed = ss->ssl3.hs.isResuming; 31 + *handshake_resumed = ss->ssl3.hs.isResuming;
32 + return SECSuccess; 32 + return SECSuccess;
33 +} 33 +}
34 + 34 +
35 /************************************************************************/ 35 /************************************************************************/
36 /* The following functions are the TOP LEVEL SSL functions. 36 /* The following functions are the TOP LEVEL SSL functions.
37 ** They all get called through the NSPRIOMethods table below. 37 ** They all get called through the NSPRIOMethods table below.
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/dhvalues.patch ('k') | net/third_party/nss/patches/dtls.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698