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

Side by Side Diff: net/third_party/nss/patches/secitemarray.patch

Issue 1844813002: Uprev NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more GN fix Created 4 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
(Empty)
1 diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h
2 index 976330e..60dd243 100644
3 --- a/lib/ssl/sslimpl.h
4 +++ b/lib/ssl/sslimpl.h
5 @@ -1403,6 +1403,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache;
6
7 SEC_BEGIN_PROTOS
8
9 +/* Functions for handling SECItemArrays, added in NSS 3.15 */
10 +extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena,
11 + SECItemArray *array,
12 + unsigned int len);
13 +extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena,
14 + const SECItemArray *from);
15 +extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit);
16 +extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit);
17 +
18 /* Internal initialization and installation of the SSL error tables */
19 extern SECStatus ssl_Init(void);
20 extern SECStatus ssl_InitializePRErrorTable(void);
21 diff --git a/lib/ssl/sslt.h b/lib/ssl/sslt.h
22 index b6616e2..5593579 100644
23 --- a/lib/ssl/sslt.h
24 +++ b/lib/ssl/sslt.h
25 @@ -11,6 +11,19 @@
26
27 #include "prtypes.h"
28
29 +/* SECItemArray is added in NSS 3.15. Define the type if compiling
30 +** against an older version of NSS.
31 +*/
32 +#include "nssutil.h"
33 +#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15
34 +typedef struct SECItemArrayStr SECItemArray;
35 +
36 +struct SECItemArrayStr {
37 + SECItem *items;
38 + unsigned int len;
39 +};
40 +#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */
41 +
42 typedef struct SSL3StatisticsStr {
43 /* statistics from ssl3_SendClientHello (sch) */
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