summaryrefslogtreecommitdiffstats
path: root/chromium/net/third_party/nss/patches/didhandshakeresume.patch
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/third_party/nss/patches/didhandshakeresume.patch')
-rw-r--r--chromium/net/third_party/nss/patches/didhandshakeresume.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/net/third_party/nss/patches/didhandshakeresume.patch b/chromium/net/third_party/nss/patches/didhandshakeresume.patch
index fa681ebb3d8..70f878dc68e 100644
--- a/chromium/net/third_party/nss/patches/didhandshakeresume.patch
+++ b/chromium/net/third_party/nss/patches/didhandshakeresume.patch
@@ -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-17 17:52:46.715854283 -0800
++++ b/nss/lib/ssl/ssl.h 2014-01-17 17:53:20.876422375 -0800
+@@ -997,6 +997,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
SSLExtensionType extId,
PRBool *yes);
@@ -12,9 +12,9 @@ diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
** 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-17 17:52:46.715854283 -0800
++++ b/nss/lib/ssl/sslsock.c 2014-01-17 17:53:20.876422375 -0800
+@@ -1855,6 +1855,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc
return &ss->sec.ci.sid->peerCertStatus;
}