OLD | NEW |
1 diff --git a/ssl/ssl3con.c b/ssl/ssl3con.c | 1 diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c |
2 index 6819b03..6a4a443 100644 | 2 index 2533679..ba3d012 100644 |
3 --- a/ssl/ssl3con.c | 3 --- a/lib/ssl/ssl3con.c |
4 +++ b/ssl/ssl3con.c | 4 +++ b/lib/ssl/ssl3con.c |
5 @@ -5748,7 +5748,6 @@ SSL3_ShutdownServerCache(void) | 5 @@ -5921,7 +5921,6 @@ SSL3_ShutdownServerCache(void) |
6 } | 6 } |
7 | 7 |
8 PZ_Unlock(symWrapKeysLock); | 8 PZ_Unlock(symWrapKeysLock); |
9 - ssl_FreeSessionCacheLocks(); | 9 - ssl_FreeSessionCacheLocks(); |
10 return SECSuccess; | 10 return SECSuccess; |
11 } | 11 } |
12 | 12 |
13 @@ -5800,7 +5799,7 @@ getWrappingKey( sslSocket * ss, | 13 @@ -5973,7 +5972,7 @@ getWrappingKey( sslSocket * ss, |
14 | 14 |
15 pSymWrapKey = &symWrapKeys[symWrapMechIndex].symWrapKey[exchKeyType]; | 15 pSymWrapKey = &symWrapKeys[symWrapMechIndex].symWrapKey[exchKeyType]; |
16 | 16 |
17 - ssl_InitSessionCacheLocks(PR_TRUE); | 17 - ssl_InitSessionCacheLocks(PR_TRUE); |
18 + ssl_InitSessionCacheLocks(); | 18 + ssl_InitSessionCacheLocks(); |
19 | 19 |
20 PZ_Lock(symWrapKeysLock); | 20 PZ_Lock(symWrapKeysLock); |
21 | 21 |
22 diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h | 22 diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h |
23 index 88b2eba..c4c87b4 100644 | 23 index d5f326f..d53c446 100644 |
24 --- a/ssl/sslimpl.h | 24 --- a/lib/ssl/sslimpl.h |
25 +++ b/ssl/sslimpl.h | 25 +++ b/lib/ssl/sslimpl.h |
26 @@ -1924,9 +1924,7 @@ extern SECStatus ssl_InitSymWrapKeysLock(void); | 26 @@ -1957,9 +1957,7 @@ extern SECStatus ssl_InitSymWrapKeysLock(void); |
27 | 27 |
28 extern SECStatus ssl_FreeSymWrapKeysLock(void); | 28 extern SECStatus ssl_FreeSymWrapKeysLock(void); |
29 | 29 |
30 -extern SECStatus ssl_InitSessionCacheLocks(PRBool lazyInit); | 30 -extern SECStatus ssl_InitSessionCacheLocks(PRBool lazyInit); |
31 - | 31 - |
32 -extern SECStatus ssl_FreeSessionCacheLocks(void); | 32 -extern SECStatus ssl_FreeSessionCacheLocks(void); |
33 +extern SECStatus ssl_InitSessionCacheLocks(void); | 33 +extern SECStatus ssl_InitSessionCacheLocks(void); |
34 | 34 |
35 /***************** platform client auth ****************/ | 35 /***************** platform client auth ****************/ |
36 | 36 |
37 diff --git a/ssl/sslnonce.c b/ssl/sslnonce.c | 37 diff --git a/lib/ssl/sslnonce.c b/lib/ssl/sslnonce.c |
38 index 1326a8b..c45849d 100644 | 38 index 1326a8b..c45849d 100644 |
39 --- a/ssl/sslnonce.c | 39 --- a/lib/ssl/sslnonce.c |
40 +++ b/ssl/sslnonce.c | 40 +++ b/lib/ssl/sslnonce.c |
41 @@ -35,91 +35,55 @@ static PZLock * cacheLock = NULL; | 41 @@ -35,91 +35,55 @@ static PZLock * cacheLock = NULL; |
42 #define LOCK_CACHE lock_cache() | 42 #define LOCK_CACHE lock_cache() |
43 #define UNLOCK_CACHE PZ_Unlock(cacheLock) | 43 #define UNLOCK_CACHE PZ_Unlock(cacheLock) |
44 | 44 |
45 -static SECStatus | 45 -static SECStatus |
46 -ssl_InitClientSessionCacheLock(void) | 46 -ssl_InitClientSessionCacheLock(void) |
47 -{ | 47 -{ |
48 - cacheLock = PZ_NewLock(nssILockCache); | 48 - cacheLock = PZ_NewLock(nssILockCache); |
49 - return cacheLock ? SECSuccess : SECFailure; | 49 - return cacheLock ? SECSuccess : SECFailure; |
50 -} | 50 -} |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 | 197 |
198 -static void | 198 -static void |
199 +static void | 199 +static void |
200 lock_cache(void) | 200 lock_cache(void) |
201 { | 201 { |
202 - ssl_InitSessionCacheLocks(PR_TRUE); | 202 - ssl_InitSessionCacheLocks(PR_TRUE); |
203 + ssl_InitSessionCacheLocks(); | 203 + ssl_InitSessionCacheLocks(); |
204 PZ_Lock(cacheLock); | 204 PZ_Lock(cacheLock); |
205 } | 205 } |
206 | 206 |
207 diff --git a/ssl/sslsnce.c b/ssl/sslsnce.c | 207 diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c |
208 index 4d9ef38..3279200 100644 | 208 index f31b2e9..3856c13 100644 |
209 --- a/ssl/sslsnce.c | 209 --- a/lib/ssl/sslsnce.c |
210 +++ b/ssl/sslsnce.c | 210 +++ b/lib/ssl/sslsnce.c |
211 @@ -1352,7 +1352,7 @@ SSL_ConfigServerSessionIDCache(» int maxCacheEntries
, | 211 @@ -1363,7 +1363,7 @@ SSL_ConfigServerSessionIDCache(» int maxCacheEntries
, |
212 PRUint32 ssl3_timeout, | 212 PRUint32 ssl3_timeout, |
213 const char * directory) | 213 const char * directory) |
214 { | 214 { |
215 - ssl_InitSessionCacheLocks(PR_FALSE); | 215 - ssl_InitSessionCacheLocks(PR_FALSE); |
216 + ssl_InitSessionCacheLocks(); | 216 + ssl_InitSessionCacheLocks(); |
217 return SSL_ConfigServerSessionIDCacheInstance(&globalCache, | 217 return SSL_ConfigServerSessionIDCacheInstance(&globalCache, |
218 maxCacheEntries, ssl2_timeout, ssl3_timeout, directory, PR_FALSE
); | 218 maxCacheEntries, ssl2_timeout, ssl3_timeout, directory, PR_FALSE
); |
219 } | 219 } |
220 @@ -1466,7 +1466,7 @@ SSL_ConfigServerSessionIDCacheWithOpt( | 220 @@ -1477,7 +1477,7 @@ SSL_ConfigServerSessionIDCacheWithOpt( |
221 PRBool enableMPCache) | 221 PRBool enableMPCache) |
222 { | 222 { |
223 if (!enableMPCache) { | 223 if (!enableMPCache) { |
224 - ssl_InitSessionCacheLocks(PR_FALSE); | 224 - ssl_InitSessionCacheLocks(PR_FALSE); |
225 + ssl_InitSessionCacheLocks(); | 225 + ssl_InitSessionCacheLocks(); |
226 return ssl_ConfigServerSessionIDCacheInstanceWithOpt(&globalCache, | 226 return ssl_ConfigServerSessionIDCacheInstanceWithOpt(&globalCache, |
227 ssl2_timeout, ssl3_timeout, directory, PR_FALSE, | 227 ssl2_timeout, ssl3_timeout, directory, PR_FALSE, |
228 maxCacheEntries, maxCertCacheEntries, maxSrvNameCacheEntries); | 228 maxCacheEntries, maxCertCacheEntries, maxSrvNameCacheEntries); |
229 @@ -1511,7 +1511,7 @@ SSL_InheritMPServerSIDCacheInstance(cacheDesc *cache, cons
t char * envString) | 229 @@ -1521,7 +1521,7 @@ SSL_InheritMPServerSIDCacheInstance(cacheDesc *cache, cons
t char * envString) |
230 return SECSuccess; /* already done. */ | 230 return SECSuccess; /* already done. */ |
231 } | 231 } |
232 | 232 |
233 - ssl_InitSessionCacheLocks(PR_FALSE); | 233 - ssl_InitSessionCacheLocks(PR_FALSE); |
234 + ssl_InitSessionCacheLocks(); | 234 + ssl_InitSessionCacheLocks(); |
235 | 235 |
236 ssl_sid_lookup = ServerSessionIDLookup; | 236 ssl_sid_lookup = ServerSessionIDLookup; |
237 ssl_sid_cache = ServerSessionIDCache; | 237 ssl_sid_cache = ServerSessionIDCache; |
OLD | NEW |