diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-26 15:13:18 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-26 15:13:18 +0200 |
| commit | fbc2eaacd679f0c484993ffe23d786fd06da22c3 (patch) | |
| tree | 5f78f9cedea413ac9c425ad209f2b03bd7bba323 /security/nss/lib/softoken/sftkdb.c | |
| parent | d7359c38b197c221c43def1e24cb48d4aee51bba (diff) | |
| download | UXP-fbc2eaacd679f0c484993ffe23d786fd06da22c3.tar UXP-fbc2eaacd679f0c484993ffe23d786fd06da22c3.tar.gz UXP-fbc2eaacd679f0c484993ffe23d786fd06da22c3.tar.lz UXP-fbc2eaacd679f0c484993ffe23d786fd06da22c3.tar.xz UXP-fbc2eaacd679f0c484993ffe23d786fd06da22c3.zip | |
Update NSS to 3.41.1 (custom)
This resolves #82
Diffstat (limited to 'security/nss/lib/softoken/sftkdb.c')
| -rw-r--r-- | security/nss/lib/softoken/sftkdb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/lib/softoken/sftkdb.c b/security/nss/lib/softoken/sftkdb.c index 409c910f4..21796bbbb 100644 --- a/security/nss/lib/softoken/sftkdb.c +++ b/security/nss/lib/softoken/sftkdb.c @@ -530,6 +530,7 @@ sftk_signTemplate(PLArenaPool *arena, SFTKDBHandle *handle, goto loser; } rv = sftkdb_SignAttribute(arena, &keyHandle->passwordKey, + keyHandle->defaultIterationCount, objectID, template[i].type, &plainText, &signText); PZ_Unlock(keyHandle->passwordLock); @@ -663,6 +664,7 @@ sftk_ExtractTemplate(PLArenaPool *arena, SFTKObject *object, break; } rv = sftkdb_EncryptAttribute(arena, &handle->passwordKey, + handle->defaultIterationCount, &plainText, &cipherText); PZ_Unlock(handle->passwordLock); if (rv == SECSuccess) { @@ -2759,7 +2761,7 @@ sftk_DBInit(const char *configdir, const char *certPrefix, (sftkdb_HasPasswordSet(*keyDB) == SECSuccess) ? PR_TRUE : PR_FALSE; /* if the password on the key db is NULL, kick off our update * chain of events */ - sftkdb_CheckPassword((*keyDB), "", &tokenRemoved); + sftkdb_CheckPasswordNull((*keyDB), &tokenRemoved); } else { /* we don't have a key DB, update the certificate DB now */ sftkdb_Update(*certDB, NULL); |