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

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

Issue 1511123006: Uprev NSS (in libssl) to NSS 3.21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated deps Created 5 years 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
OLDNEW
1 diff --git a/ssl/ssl.h b/ssl/ssl.h 1 diff --git a/lib/ssl/ssl.h b/lib/ssl/ssl.h
2 index 4e7d52e..34142fc 100644 2 index 48fa018..0983b5f 100644
3 --- a/ssl/ssl.h 3 --- a/lib/ssl/ssl.h
4 +++ b/ssl/ssl.h 4 +++ b/lib/ssl/ssl.h
5 @@ -1007,6 +1007,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFi leDesc * socket, 5 @@ -1117,6 +1117,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFi leDesc * socket,
6 SSLExtensionType extId, 6 SSLExtensionType extId,
7 PRBool *yes); 7 PRBool *yes);
8 8
9 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, 9 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
10 + PRBool *last_handshake_resumed ); 10 + PRBool *last_handshake_resumed );
11 + 11 +
12 /* 12 /*
13 ** How long should we wait before retransmitting the next flight of 13 ** How long should we wait before retransmitting the next flight of
14 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a 14 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a
15 diff --git a/ssl/sslsock.c b/ssl/sslsock.c 15 diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
16 index 6c09992..1a9c584 100644 16 index 21754d6..b73f8f6 100644
17 --- a/ssl/sslsock.c 17 --- a/lib/ssl/sslsock.c
18 +++ b/ssl/sslsock.c 18 +++ b/lib/ssl/sslsock.c
19 @@ -1897,6 +1897,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd) 19 @@ -2151,6 +2151,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
20 return &ss->sec.ci.sid->peerCertStatus; 20 return &ss->sec.ci.sid->peerCertStatus;
21 } 21 }
22 22
23 +SECStatus 23 +SECStatus
24 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { 24 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) {
25 + sslSocket *ss = ssl_FindSocket(fd); 25 + sslSocket *ss = ssl_FindSocket(fd);
26 + 26 +
27 + if (!ss) { 27 + if (!ss) {
28 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", 28 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
29 + SSL_GETPID(), fd)); 29 + SSL_GETPID(), fd));
30 + return SECFailure; 30 + return SECFailure;
31 + } 31 + }
32 + 32 +
33 + *handshake_resumed = ss->ssl3.hs.isResuming; 33 + *handshake_resumed = ss->ssl3.hs.isResuming;
34 + return SECSuccess; 34 + return SECSuccess;
35 +} 35 +}
36 + 36 +
37 /************************************************************************/ 37 /************************************************************************/
38 /* The following functions are the TOP LEVEL SSL functions. 38 /* The following functions are the TOP LEVEL SSL functions.
39 ** They all get called through the NSPRIOMethods table below. 39 ** They all get called through the NSPRIOMethods table below.
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/dh1024.patch ('k') | net/third_party/nss/patches/getrequestedclientcerttypes.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698