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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 8 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 196870)
+++ net/third_party/nss/patches/didhandshakeresume.patch (working copy)
@@ -1,7 +1,7 @@
-diff -pu -r a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h
---- a/net/third_party/nss/ssl/ssl.h 2012-11-09 15:44:22.247069358 -0800
-+++ b/net/third_party/nss/ssl/ssl.h 2012-11-09 15:43:25.766243027 -0800
-@@ -917,6 +917,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
+diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
+--- a/nss/lib/ssl/ssl.h 2013-04-27 09:21:28.339946428 -0700
++++ b/nss/lib/ssl/ssl.h 2013-04-27 09:21:50.660262443 -0700
+@@ -942,6 +942,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
SSLExtensionType extId,
PRBool *yes);
@@ -11,11 +11,11 @@
/*
** 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 -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
---- a/net/third_party/nss/ssl/sslsock.c 2012-11-09 15:44:22.247069358 -0800
-+++ b/net/third_party/nss/ssl/sslsock.c 2012-11-09 15:40:33.053714908 -0800
-@@ -1912,6 +1912,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *f
- return SECSuccess;
+diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
+--- a/nss/lib/ssl/sslsock.c 2013-04-27 09:21:28.339946428 -0700
++++ b/nss/lib/ssl/sslsock.c 2013-04-27 09:21:50.660262443 -0700
+@@ -1914,6 +1914,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc
+ return &ss->sec.ci.sid->peerCertStatus;
}
+SECStatus

Powered by Google App Engine
This is Rietveld 408576698