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

Side by Side 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, 8 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 unified diff | Download patch
OLDNEW
1 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h 1 diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h
2 --- a/nss/lib/ssl/sslimpl.h» 2014-01-17 18:00:11.213237373 -0800 2 index 2d21e90..88f559a 100644
3 +++ b/nss/lib/ssl/sslimpl.h» 2014-01-17 18:03:29.176520864 -0800 3 --- a/ssl/sslimpl.h
4 @@ -1364,6 +1364,15 @@ extern sslSessionIDUncacheFunc ssl_sid_u 4 +++ b/ssl/sslimpl.h
5 @@ -1366,6 +1366,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache;
5 6
6 SEC_BEGIN_PROTOS 7 SEC_BEGIN_PROTOS
7 8
8 +/* Functions for handling SECItemArrays, added in NSS 3.15 */ 9 +/* Functions for handling SECItemArrays, added in NSS 3.15 */
9 +extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena, 10 +extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena,
10 + SECItemArray *array, 11 + SECItemArray *array,
11 + unsigned int len); 12 + unsigned int len);
12 +extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena, 13 +extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena,
13 + const SECItemArray *from); 14 + const SECItemArray *from);
14 +extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit); 15 +extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit);
15 +extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit); 16 +extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit);
16 + 17 +
17 /* Internal initialization and installation of the SSL error tables */ 18 /* Internal initialization and installation of the SSL error tables */
18 extern SECStatus ssl_Init(void); 19 extern SECStatus ssl_Init(void);
19 extern SECStatus ssl_InitializePRErrorTable(void); 20 extern SECStatus ssl_InitializePRErrorTable(void);
20 diff -pu a/nss/lib/ssl/sslt.h b/nss/lib/ssl/sslt.h 21 diff --git a/ssl/sslt.h b/ssl/sslt.h
21 --- a/nss/lib/ssl/sslt.h» 2014-01-17 17:59:03.252110162 -0800 22 index 0900f28..430d216 100644
22 +++ b/nss/lib/ssl/sslt.h» 2014-01-17 18:03:29.186521030 -0800 23 --- a/ssl/sslt.h
24 +++ b/ssl/sslt.h
23 @@ -10,6 +10,19 @@ 25 @@ -10,6 +10,19 @@
24 26
25 #include "prtypes.h" 27 #include "prtypes.h"
26 28
27 +/* SECItemArray is added in NSS 3.15. Define the type if compiling 29 +/* SECItemArray is added in NSS 3.15. Define the type if compiling
28 +** against an older version of NSS. 30 +** against an older version of NSS.
29 +*/ 31 +*/
30 +#include "nssutil.h" 32 +#include "nssutil.h"
31 +#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 33 +#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15
32 +typedef struct SECItemArrayStr SECItemArray; 34 +typedef struct SECItemArrayStr SECItemArray;
33 + 35 +
34 +struct SECItemArrayStr { 36 +struct SECItemArrayStr {
35 + SECItem *items; 37 + SECItem *items;
36 + unsigned int len; 38 + unsigned int len;
37 +}; 39 +};
38 +#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */ 40 +#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */
39 + 41 +
40 typedef struct SSL3StatisticsStr { 42 typedef struct SSL3StatisticsStr {
41 /* statistics from ssl3_SendClientHello (sch) */ 43 /* statistics from ssl3_SendClientHello (sch) */
42 long sch_sid_cache_hits; 44 long sch_sid_cache_hits;
OLDNEW
« 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