Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

Unified Diff: net/third_party/nss/patches/didhandshakeresume.patch

Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix applypatches.sh mistakes Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/patches/didhandshakeresume.patch
===================================================================
--- net/third_party/nss/patches/didhandshakeresume.patch (revision 245705)
+++ 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 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
+--- 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 @@
** 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 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
+--- 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;
}

Powered by Google App Engine
This is Rietveld 408576698