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

Unified Diff: net/third_party/nss/patches/secitemarray.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/secitemarray.patch
===================================================================
--- net/third_party/nss/patches/secitemarray.patch (revision 245705)
+++ net/third_party/nss/patches/secitemarray.patch (working copy)
@@ -1,7 +1,7 @@
diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h 2014-01-03 18:55:44.669133500 -0800
-+++ b/nss/lib/ssl/sslimpl.h 2014-01-03 18:56:54.570274011 -0800
-@@ -1355,6 +1355,15 @@ extern sslSessionIDUncacheFunc ssl_sid_u
+--- a/nss/lib/ssl/sslimpl.h 2014-01-17 18:00:11.213237373 -0800
++++ b/nss/lib/ssl/sslimpl.h 2014-01-17 18:03:29.176520864 -0800
+@@ -1364,6 +1364,15 @@ extern sslSessionIDUncacheFunc ssl_sid_u
SEC_BEGIN_PROTOS
@@ -18,8 +18,8 @@
extern SECStatus ssl_Init(void);
extern SECStatus ssl_InitializePRErrorTable(void);
diff -pu a/nss/lib/ssl/sslt.h b/nss/lib/ssl/sslt.h
---- a/nss/lib/ssl/sslt.h 2014-01-03 18:54:48.638219358 -0800
-+++ b/nss/lib/ssl/sslt.h 2014-01-03 18:56:54.570274011 -0800
+--- a/nss/lib/ssl/sslt.h 2014-01-17 17:59:03.252110162 -0800
++++ b/nss/lib/ssl/sslt.h 2014-01-17 18:03:29.186521030 -0800
@@ -10,6 +10,19 @@
#include "prtypes.h"

Powered by Google App Engine
This is Rietveld 408576698