diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-26 23:32:13 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-26 23:32:13 +0200 |
| commit | 4b188510af097627f117482dfc7c3d308c845385 (patch) | |
| tree | 133fbe3ef3eb0f7ce6b151db1ed86bfd9c4abb60 /security/nss/lib/softoken/sftkdb.c | |
| parent | fbc2eaacd679f0c484993ffe23d786fd06da22c3 (diff) | |
| download | UXP-4b188510af097627f117482dfc7c3d308c845385.tar UXP-4b188510af097627f117482dfc7c3d308c845385.tar.gz UXP-4b188510af097627f117482dfc7c3d308c845385.tar.lz UXP-4b188510af097627f117482dfc7c3d308c845385.tar.xz UXP-4b188510af097627f117482dfc7c3d308c845385.zip | |
Revert "Update NSS to 3.41.1 (custom)"
This reverts commit fbc2eaacd679f0c484993ffe23d786fd06da22c3.
Diffstat (limited to 'security/nss/lib/softoken/sftkdb.c')
| -rw-r--r-- | security/nss/lib/softoken/sftkdb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/nss/lib/softoken/sftkdb.c b/security/nss/lib/softoken/sftkdb.c index 21796bbbb..409c910f4 100644 --- a/security/nss/lib/softoken/sftkdb.c +++ b/security/nss/lib/softoken/sftkdb.c @@ -530,7 +530,6 @@ 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); @@ -664,7 +663,6 @@ sftk_ExtractTemplate(PLArenaPool *arena, SFTKObject *object, break; } rv = sftkdb_EncryptAttribute(arena, &handle->passwordKey, - handle->defaultIterationCount, &plainText, &cipherText); PZ_Unlock(handle->passwordLock); if (rv == SECSuccess) { @@ -2761,7 +2759,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_CheckPasswordNull((*keyDB), &tokenRemoved); + sftkdb_CheckPassword((*keyDB), "", &tokenRemoved); } else { /* we don't have a key DB, update the certificate DB now */ sftkdb_Update(*certDB, NULL); |