| OLD | NEW |
| 1 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h | 1 diff --git a/ssl/ssl.h b/ssl/ssl.h |
| 2 --- a/nss/lib/ssl/ssl.h»2014-01-17 17:52:46.715854283 -0800 | 2 index 4e7d52e..34142fc 100644 |
| 3 +++ b/nss/lib/ssl/ssl.h»2014-01-17 17:53:20.876422375 -0800 | 3 --- a/ssl/ssl.h |
| 4 @@ -997,6 +997,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti | 4 +++ b/ssl/ssl.h |
| 5 @@ -1007,6 +1007,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFi
leDesc * socket, |
| 5 SSLExtensionType extId, | 6 SSLExtensionType extId, |
| 6 PRBool *yes); | 7 PRBool *yes); |
| 7 | 8 |
| 8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, | 9 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, |
| 9 + PRBool *last_handshake_resumed
); | 10 + PRBool *last_handshake_resumed
); |
| 10 + | 11 + |
| 11 /* | 12 /* |
| 12 ** How long should we wait before retransmitting the next flight of | 13 ** 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 ** 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 diff --git a/ssl/sslsock.c b/ssl/sslsock.c |
| 15 --- a/nss/lib/ssl/sslsock.c» 2014-01-17 17:52:46.715854283 -0800 | 16 index fccc664..688f399 100644 |
| 16 +++ b/nss/lib/ssl/sslsock.c» 2014-01-17 17:53:20.876422375 -0800 | 17 --- a/ssl/sslsock.c |
| 17 @@ -1855,6 +1855,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc | 18 +++ b/ssl/sslsock.c |
| 19 @@ -1897,6 +1897,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd) |
| 18 return &ss->sec.ci.sid->peerCertStatus; | 20 return &ss->sec.ci.sid->peerCertStatus; |
| 19 } | 21 } |
| 20 | 22 |
| 21 +SECStatus | 23 +SECStatus |
| 22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { | 24 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { |
| 23 + sslSocket *ss = ssl_FindSocket(fd); | 25 + sslSocket *ss = ssl_FindSocket(fd); |
| 24 + | 26 + |
| 25 + if (!ss) { | 27 + if (!ss) { |
| 26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", | 28 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", |
| 27 + SSL_GETPID(), fd)); | 29 + SSL_GETPID(), fd)); |
| 28 + return SECFailure; | 30 + return SECFailure; |
| 29 + } | 31 + } |
| 30 + | 32 + |
| 31 + *handshake_resumed = ss->ssl3.hs.isResuming; | 33 + *handshake_resumed = ss->ssl3.hs.isResuming; |
| 32 + return SECSuccess; | 34 + return SECSuccess; |
| 33 +} | 35 +} |
| 34 + | 36 + |
| 35 /************************************************************************/ | 37 /************************************************************************/ |
| 36 /* The following functions are the TOP LEVEL SSL functions. | 38 /* The following functions are the TOP LEVEL SSL functions. |
| 37 ** They all get called through the NSPRIOMethods table below. | 39 ** They all get called through the NSPRIOMethods table below. |
| OLD | NEW |