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

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

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
(Empty)
1 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
2 --- a/nss/lib/ssl/ssl.h 2014-01-17 17:52:46.715854283 -0800
3 +++ b/nss/lib/ssl/ssl.h 2014-01-17 17:53:20.876422375 -0800
4 @@ -997,6 +997,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
5 SSLExtensionType extId,
6 PRBool *yes);
7
8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
9 + PRBool *last_handshake_resumed );
10 +
11 /*
12 ** How long should we wait before retransmitting the next flight of
13 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a
14 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
15 --- a/nss/lib/ssl/sslsock.c 2014-01-17 17:52:46.715854283 -0800
16 +++ b/nss/lib/ssl/sslsock.c 2014-01-17 17:53:20.876422375 -0800
17 @@ -1855,6 +1855,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc
18 return &ss->sec.ci.sid->peerCertStatus;
19 }
20
21 +SECStatus
22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) {
23 + sslSocket *ss = ssl_FindSocket(fd);
24 +
25 + if (!ss) {
26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
27 + SSL_GETPID(), fd));
28 + return SECFailure;
29 + }
30 +
31 + *handshake_resumed = ss->ssl3.hs.isResuming;
32 + return SECSuccess;
33 +}
34 +
35 /************************************************************************/
36 /* The following functions are the TOP LEVEL SSL functions.
37 ** They all get called through the NSPRIOMethods table below.
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/clientauth.patch ('k') | net/third_party/nss/patches/fallbackscsv.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698