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

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

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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
« no previous file with comments | « net/third_party/nss/patches/keylog.patch ('k') | net/third_party/nss/patches/ocspstapling.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/patches/negotiatedextension.patch
===================================================================
--- net/third_party/nss/patches/negotiatedextension.patch (revision 166942)
+++ net/third_party/nss/patches/negotiatedextension.patch (working copy)
@@ -1,17 +1,7 @@
-From 577e6655d4edc789eb4c572b303daf888676a454 Mon Sep 17 00:00:00 2001
-From: Adam Langley <agl@chromium.org>
-Date: Mon, 3 Oct 2011 12:27:21 -0400
-Subject: [PATCH] negotiatedextension.patch
-
----
- mozilla/security/nss/lib/ssl/sslreveal.c | 9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ssl/sslreveal.c b/mozilla/security/nss/lib/ssl/sslreveal.c
-index 94b2c2f..0b9bb82 100644
---- a/mozilla/security/nss/lib/ssl/sslreveal.c
-+++ b/mozilla/security/nss/lib/ssl/sslreveal.c
-@@ -111,7 +111,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
+diff -pu -r a/net/third_party/nss/ssl/sslreveal.c b/net/third_party/nss/ssl/sslreveal.c
+--- a/net/third_party/nss/ssl/sslreveal.c 2012-04-25 07:50:12.000000000 -0700
++++ b/net/third_party/nss/ssl/sslreveal.c 2012-11-09 15:45:44.118267683 -0800
+@@ -79,7 +79,6 @@ SSL_HandshakeNegotiatedExtension(PRFileD
/* some decisions derived from SSL_GetChannelInfo */
sslSocket * sslsocket = NULL;
SECStatus rv = SECFailure;
@@ -19,7 +9,7 @@
if (!pYes)
return rv;
-@@ -123,14 +122,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
+@@ -91,14 +90,8 @@ SSL_HandshakeNegotiatedExtension(PRFileD
return rv;
}
« no previous file with comments | « net/third_party/nss/patches/keylog.patch ('k') | net/third_party/nss/patches/ocspstapling.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698