Index: net/third_party/nss/patches/didhandshakeresume.patch |
=================================================================== |
--- net/third_party/nss/patches/didhandshakeresume.patch (revision 242942) |
+++ net/third_party/nss/patches/didhandshakeresume.patch (working copy) |
@@ -1,7 +1,7 @@ |
diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h |
---- a/nss/lib/ssl/ssl.h 2013-07-31 12:40:14.503586299 -0700 |
-+++ b/nss/lib/ssl/ssl.h 2013-07-31 12:40:37.913929474 -0700 |
-@@ -940,6 +940,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti |
+--- a/nss/lib/ssl/ssl.h 2014-01-03 19:31:09.783859095 -0800 |
++++ b/nss/lib/ssl/ssl.h 2014-01-03 19:31:19.214013263 -0800 |
+@@ -967,6 +967,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti |
SSLExtensionType extId, |
PRBool *yes); |
@@ -12,9 +12,9 @@ |
** How long should we wait before retransmitting the next flight of |
** the DTLS handshake? Returns SECFailure if not DTLS or not in a |
diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c |
---- a/nss/lib/ssl/sslsock.c 2013-07-31 12:40:14.503586299 -0700 |
-+++ b/nss/lib/ssl/sslsock.c 2013-07-31 12:40:37.913929474 -0700 |
-@@ -1919,6 +1919,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc |
+--- a/nss/lib/ssl/sslsock.c 2014-01-03 19:31:09.783859095 -0800 |
++++ b/nss/lib/ssl/sslsock.c 2014-01-03 19:31:19.214013263 -0800 |
+@@ -1833,6 +1833,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc |
return &ss->sec.ci.sid->peerCertStatus; |
} |