OLD | NEW |
1 diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h | 1 diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h |
2 index 0ece0ed..ea71975 100644 | 2 index 976330e..60dd243 100644 |
3 --- a/ssl/sslimpl.h | 3 --- a/lib/ssl/sslimpl.h |
4 +++ b/ssl/sslimpl.h | 4 +++ b/lib/ssl/sslimpl.h |
5 @@ -1373,6 +1373,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache; | 5 @@ -1403,6 +1403,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache; |
6 | 6 |
7 SEC_BEGIN_PROTOS | 7 SEC_BEGIN_PROTOS |
8 | 8 |
9 +/* Functions for handling SECItemArrays, added in NSS 3.15 */ | 9 +/* Functions for handling SECItemArrays, added in NSS 3.15 */ |
10 +extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena, | 10 +extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena, |
11 + SECItemArray *array, | 11 + SECItemArray *array, |
12 + unsigned int len); | 12 + unsigned int len); |
13 +extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena, | 13 +extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena, |
14 + const SECItemArray *from); | 14 + const SECItemArray *from); |
15 +extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit); | 15 +extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit); |
16 +extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit); | 16 +extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit); |
17 + | 17 + |
18 /* Internal initialization and installation of the SSL error tables */ | 18 /* Internal initialization and installation of the SSL error tables */ |
19 extern SECStatus ssl_Init(void); | 19 extern SECStatus ssl_Init(void); |
20 extern SECStatus ssl_InitializePRErrorTable(void); | 20 extern SECStatus ssl_InitializePRErrorTable(void); |
21 diff --git a/ssl/sslt.h b/ssl/sslt.h | 21 diff --git a/lib/ssl/sslt.h b/lib/ssl/sslt.h |
22 index 0900f28..430d216 100644 | 22 index b6616e2..5593579 100644 |
23 --- a/ssl/sslt.h | 23 --- a/lib/ssl/sslt.h |
24 +++ b/ssl/sslt.h | 24 +++ b/lib/ssl/sslt.h |
25 @@ -10,6 +10,19 @@ | 25 @@ -11,6 +11,19 @@ |
26 | 26 |
27 #include "prtypes.h" | 27 #include "prtypes.h" |
28 | 28 |
29 +/* 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 |
30 +** against an older version of NSS. | 30 +** against an older version of NSS. |
31 +*/ | 31 +*/ |
32 +#include "nssutil.h" | 32 +#include "nssutil.h" |
33 +#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 | 33 +#if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 |
34 +typedef struct SECItemArrayStr SECItemArray; | 34 +typedef struct SECItemArrayStr SECItemArray; |
35 + | 35 + |
36 +struct SECItemArrayStr { | 36 +struct SECItemArrayStr { |
37 + SECItem *items; | 37 + SECItem *items; |
38 + unsigned int len; | 38 + unsigned int len; |
39 +}; | 39 +}; |
40 +#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */ | 40 +#endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */ |
41 + | 41 + |
42 typedef struct SSL3StatisticsStr { | 42 typedef struct SSL3StatisticsStr { |
43 /* statistics from ssl3_SendClientHello (sch) */ | 43 /* statistics from ssl3_SendClientHello (sch) */ |
44 long sch_sid_cache_hits; | 44 long sch_sid_cache_hits; |
OLD | NEW |