diff options
| author | nelson%bolyard.com <devnull@localhost> | 2007-09-25 01:14:23 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2007-09-25 01:14:23 +0000 |
| commit | ed31df90a6a9de7d7d4c568a7452651137ca7a04 (patch) | |
| tree | 365480b98f87149633421bc1af421c965e470d68 | |
| parent | 0bad0cf7d4fbe20af3e788140989ea15f1e49b30 (diff) | |
| download | nss-hg-ed31df90a6a9de7d7d4c568a7452651137ca7a04.tar.gz | |
Bug 397122, NSS 3.12 alpha treats a key3.db with no global salt as having no password
r=rrelyea
| -rw-r--r-- | security/nss/lib/softoken/legacydb/keydb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/nss/lib/softoken/legacydb/keydb.c b/security/nss/lib/softoken/legacydb/keydb.c index d64d9080e..372bcc583 100644 --- a/security/nss/lib/softoken/legacydb/keydb.c +++ b/security/nss/lib/softoken/legacydb/keydb.c @@ -1362,6 +1362,7 @@ nsslowkey_GetPWCheckEntry(NSSLOWKEYDBHandle *handle,NSSLOWKEYPasswordEntry *entr SECItem *global_salt = NULL; SECItem *item = NULL; SECItem entryData, oid; + SECItem none = { siBuffer, NULL, 0 }; SECStatus rv = SECFailure; SECOidTag algorithm; @@ -1372,7 +1373,7 @@ nsslowkey_GetPWCheckEntry(NSSLOWKEYDBHandle *handle,NSSLOWKEYPasswordEntry *entr global_salt = GetKeyDBGlobalSalt(handle); if (!global_salt) { - return SECFailure; + global_salt = &none; } if (global_salt->len > sizeof(entry->data)) { /* PORT_SetError */ |