Check USB device path access when prompting users to select a device.
[chromium-blink-merge.git] / net / third_party / nss / patches / didhandshakeresume.patch
blobf4b04be64c5b26c38b6d9171099a206dfd948886
1 diff --git a/ssl/ssl.h b/ssl/ssl.h
2 index 4e7d52e..34142fc 100644
3 --- a/ssl/ssl.h
4 +++ b/ssl/ssl.h
5 @@ -1007,6 +1007,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
6 SSLExtensionType extId,
7 PRBool *yes);
9 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
10 + PRBool *last_handshake_resumed);
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
15 diff --git a/ssl/sslsock.c b/ssl/sslsock.c
16 index fccc664..688f399 100644
17 --- a/ssl/sslsock.c
18 +++ b/ssl/sslsock.c
19 @@ -1897,6 +1897,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
20 return &ss->sec.ci.sid->peerCertStatus;
23 +SECStatus
24 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) {
25 + sslSocket *ss = ssl_FindSocket(fd);
27 + if (!ss) {
28 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
29 + SSL_GETPID(), fd));
30 + return SECFailure;
31 + }
33 + *handshake_resumed = ss->ssl3.hs.isResuming;
34 + return SECSuccess;
37 /************************************************************************/
38 /* The following functions are the TOP LEVEL SSL functions.
39 ** They all get called through the NSPRIOMethods table below.