Chromium Code Reviews| Index: net/third_party/nss/patches/secitemarray.patch |
| =================================================================== |
| --- net/third_party/nss/patches/secitemarray.patch (revision 0) |
| +++ net/third_party/nss/patches/secitemarray.patch (revision 0) |
| @@ -0,0 +1,42 @@ |
| +diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h |
| +--- a/nss/lib/ssl/sslimpl.h 2013-04-29 10:26:07.115923465 -0700 |
| ++++ b/nss/lib/ssl/sslimpl.h 2013-04-29 10:30:34.329650110 -0700 |
| +@@ -1258,6 +1258,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 2013-04-29 10:26:07.115923465 -0700 |
| ++++ b/nss/lib/ssl/sslt.h 2013-04-29 10:30:34.329650110 -0700 |
| +@@ -11,6 +11,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_VMINOR < 15 |
|
Ryan Sleevi
2013/05/01 19:06:08
BUG?: Shouldn't you also be looking at NSSUTIL_VMA
wtc
2013/05/01 21:52:16
Yes. Once a shared library is widely used, you can
|
| ++typedef struct SECItemArrayStr SECItemArray; |
| ++ |
| ++struct SECItemArrayStr { |
| ++ SECItem *items; |
| ++ unsigned int len; |
| ++}; |
| ++#endif /* NSSUTIL_VMINOR < 15 */ |
| ++ |
| + typedef struct SSL3StatisticsStr { |
| + /* statistics from ssl3_SendClientHello (sch) */ |
| + long sch_sid_cache_hits; |