diff options
| author | julien.pierre.boogz%sun.com <devnull@localhost> | 2007-11-16 02:05:58 +0000 |
|---|---|---|
| committer | julien.pierre.boogz%sun.com <devnull@localhost> | 2007-11-16 02:05:58 +0000 |
| commit | abcb42d23844658f99fe2a9b6e30036e54f78510 (patch) | |
| tree | 6db01b863d1f8a1b5d83ea7658f63b6a8e714201 | |
| parent | 9a222f9bb99f1bacc47090c802e51b43d45c087d (diff) | |
| download | nss-hg-abcb42d23844658f99fe2a9b6e30036e54f78510.tar.gz | |
Fix for bug 403957 . nss_InitLock should be replaced with PZ_NewLock in softoken . r=nelson,wtc
| -rw-r--r-- | security/nss/lib/softoken/keydb.c | 3 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pcertdb.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/security/nss/lib/softoken/keydb.c b/security/nss/lib/softoken/keydb.c index df17f7f4b..81e2802ea 100644 --- a/security/nss/lib/softoken/keydb.c +++ b/security/nss/lib/softoken/keydb.c @@ -49,7 +49,6 @@ #include "lowpbe.h" #include "secerr.h" #include "cdbhdl.h" -#include "nsslocks.h" #include "keydbi.h" #include "softoken.h" @@ -171,7 +170,7 @@ static void keydb_InitLocks(NSSLOWKEYDBHandle *handle) { if (handle->lock == NULL) { - nss_InitLock(&handle->lock, nssILockKeyDB); + handle->lock = PZ_NewLock(nssILockKeyDB); } return; diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c index 3c9959a30..6630b6134 100644 --- a/security/nss/lib/softoken/pcertdb.c +++ b/security/nss/lib/softoken/pcertdb.c @@ -54,7 +54,6 @@ #include "secerr.h" #include "nssilock.h" #include "prmon.h" -#include "nsslocks.h" #include "base64.h" #include "sechash.h" #include "plhash.h" @@ -99,7 +98,7 @@ void certdb_InitDBLock(NSSLOWCERTCertDBHandle *handle) { if (dbLock == NULL) { - nss_InitLock(&dbLock, nssILockCertDB); + dbLock = PZ_NewLock(nssILockCertDB); PORT_Assert(dbLock != NULL); } } @@ -108,19 +107,19 @@ SECStatus nsslowcert_InitLocks(void) { if (freeListLock == NULL) { - nss_InitLock(&freeListLock, nssILockRefLock); + freeListLock = PZ_NewLock(nssILockRefLock); if (freeListLock == NULL) { return SECFailure; } } if (certRefCountLock == NULL) { - nss_InitLock(&certRefCountLock, nssILockRefLock); + certRefCountLock = PZ_NewLock(nssILockRefLock); if (certRefCountLock == NULL) { return SECFailure; } } if (certTrustLock == NULL ) { - nss_InitLock(&certTrustLock, nssILockCertDB); + certTrustLock = PZ_NewLock(nssILockCertDB); if (certTrustLock == NULL) { return SECFailure; } |