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

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

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 years, 9 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
diff --git a/net/third_party/nss/patches/secitemarray.patch b/net/third_party/nss/patches/secitemarray.patch
index 5c48f5bc9cc0376af9c828088a715648b7598422..159d32bf1a783bc59e7c37a2763d867831bfe052 100644
--- a/net/third_party/nss/patches/secitemarray.patch
+++ b/net/third_party/nss/patches/secitemarray.patch
@@ -1,7 +1,8 @@
-diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- 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
+diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h
+index 2d21e90..88f559a 100644
+--- a/ssl/sslimpl.h
++++ b/ssl/sslimpl.h
+@@ -1366,6 +1366,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache;
SEC_BEGIN_PROTOS
@@ -17,9 +18,10 @@ diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
/* Internal initialization and installation of the SSL error tables */
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-17 17:59:03.252110162 -0800
-+++ b/nss/lib/ssl/sslt.h 2014-01-17 18:03:29.186521030 -0800
+diff --git a/ssl/sslt.h b/ssl/sslt.h
+index 0900f28..430d216 100644
+--- a/ssl/sslt.h
++++ b/ssl/sslt.h
@@ -10,6 +10,19 @@
#include "prtypes.h"
« no previous file with comments | « net/third_party/nss/patches/restartclientauth.patch ('k') | net/third_party/nss/patches/secretexporterlocks.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698