OLD | NEW |
1 diff --git a/lib/ssl/ssl.h b/lib/ssl/ssl.h | 1 diff --git a/lib/ssl/ssl.h b/lib/ssl/ssl.h |
2 index 48fa018..0983b5f 100644 | 2 index 3974ee8..e905aab 100644 |
3 --- a/lib/ssl/ssl.h | 3 --- a/lib/ssl/ssl.h |
4 +++ b/lib/ssl/ssl.h | 4 +++ b/lib/ssl/ssl.h |
5 @@ -1117,6 +1117,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFi
leDesc * socket, | 5 @@ -1123,6 +1123,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/lib/ssl/sslsock.c b/lib/ssl/sslsock.c | 15 diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c |
16 index 21754d6..b73f8f6 100644 | 16 index cc15406..601df2a 100644 |
17 --- a/lib/ssl/sslsock.c | 17 --- a/lib/ssl/sslsock.c |
18 +++ b/lib/ssl/sslsock.c | 18 +++ b/lib/ssl/sslsock.c |
19 @@ -2151,6 +2151,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd) | 19 @@ -2481,6 +2481,21 @@ 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 +{ |
25 + sslSocket *ss = ssl_FindSocket(fd); | 26 + sslSocket *ss = ssl_FindSocket(fd); |
26 + | 27 + |
27 + if (!ss) { | 28 + if (!ss) { |
28 +» SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", | 29 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", |
29 +» » SSL_GETPID(), fd)); | 30 + SSL_GETPID(), fd)); |
30 +» return SECFailure; | 31 + return SECFailure; |
31 + } | 32 + } |
32 + | 33 + |
33 + *handshake_resumed = ss->ssl3.hs.isResuming; | 34 + *handshake_resumed = ss->ssl3.hs.isResuming; |
34 + return SECSuccess; | 35 + return SECSuccess; |
35 +} | 36 +} |
36 + | 37 + |
37 /************************************************************************/ | 38 /************************************************************************/ |
38 /* The following functions are the TOP LEVEL SSL functions. | 39 /* The following functions are the TOP LEVEL SSL functions. |
39 ** They all get called through the NSPRIOMethods table below. | 40 ** They all get called through the NSPRIOMethods table below. |
OLD | NEW |