| OLD | NEW |
| 1 diff -pu -r a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h | 1 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h |
| 2 --- a/net/third_party/nss/ssl/ssl.h» 2012-11-09 15:44:22.247069358 -0800 | 2 --- a/nss/lib/ssl/ssl.h»2013-04-27 09:21:28.339946428 -0700 |
| 3 +++ b/net/third_party/nss/ssl/ssl.h» 2012-11-09 15:43:25.766243027 -0800 | 3 +++ b/nss/lib/ssl/ssl.h»2013-04-27 09:21:50.660262443 -0700 |
| 4 @@ -917,6 +917,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti | 4 @@ -942,6 +942,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti |
| 5 SSLExtensionType extId, | 5 SSLExtensionType extId, |
| 6 PRBool *yes); | 6 PRBool *yes); |
| 7 | 7 |
| 8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, | 8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, |
| 9 + PRBool *last_handshake_resumed
); | 9 + PRBool *last_handshake_resumed
); |
| 10 + | 10 + |
| 11 /* | 11 /* |
| 12 ** How long should we wait before retransmitting the next flight of | 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 | 13 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a |
| 14 diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsoc
k.c | 14 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c |
| 15 --- a/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:44:22.247069358 -0800 | 15 --- a/nss/lib/ssl/sslsock.c» 2013-04-27 09:21:28.339946428 -0700 |
| 16 +++ b/net/third_party/nss/ssl/sslsock.c»2012-11-09 15:40:33.053714908 -0800 | 16 +++ b/nss/lib/ssl/sslsock.c» 2013-04-27 09:21:50.660262443 -0700 |
| 17 @@ -1912,6 +1912,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *f | 17 @@ -1914,6 +1914,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc |
| 18 return SECSuccess; | 18 return &ss->sec.ci.sid->peerCertStatus; |
| 19 } | 19 } |
| 20 | 20 |
| 21 +SECStatus | 21 +SECStatus |
| 22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { | 22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { |
| 23 + sslSocket *ss = ssl_FindSocket(fd); | 23 + sslSocket *ss = ssl_FindSocket(fd); |
| 24 + | 24 + |
| 25 + if (!ss) { | 25 + if (!ss) { |
| 26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", | 26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", |
| 27 + SSL_GETPID(), fd)); | 27 + SSL_GETPID(), fd)); |
| 28 + return SECFailure; | 28 + return SECFailure; |
| 29 + } | 29 + } |
| 30 + | 30 + |
| 31 + *handshake_resumed = ss->ssl3.hs.isResuming; | 31 + *handshake_resumed = ss->ssl3.hs.isResuming; |
| 32 + return SECSuccess; | 32 + return SECSuccess; |
| 33 +} | 33 +} |
| 34 + | 34 + |
| 35 /************************************************************************/ | 35 /************************************************************************/ |
| 36 /* The following functions are the TOP LEVEL SSL functions. | 36 /* The following functions are the TOP LEVEL SSL functions. |
| 37 ** They all get called through the NSPRIOMethods table below. | 37 ** They all get called through the NSPRIOMethods table below. |
| OLD | NEW |