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

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

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
deleted file mode 100644
index 5c48f5bc9cc0376af9c828088a715648b7598422..0000000000000000000000000000000000000000
--- a/net/third_party/nss/patches/secitemarray.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
-
- SEC_BEGIN_PROTOS
-
-+/* Functions for handling SECItemArrays, added in NSS 3.15 */
-+extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena,
-+ SECItemArray *array,
-+ unsigned int len);
-+extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena,
-+ const SECItemArray *from);
-+extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit);
-+extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit);
-+
- /* 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
-@@ -10,6 +10,19 @@
-
- #include "prtypes.h"
-
-+/* SECItemArray is added in NSS 3.15. Define the type if compiling
-+** against an older version of NSS.
-+*/
-+#include "nssutil.h"
-+#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15
-+typedef struct SECItemArrayStr SECItemArray;
-+
-+struct SECItemArrayStr {
-+ SECItem *items;
-+ unsigned int len;
-+};
-+#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */
-+
- typedef struct SSL3StatisticsStr {
- /* statistics from ssl3_SendClientHello (sch) */
- long sch_sid_cache_hits;
« 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