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/lgglue.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/lgglue.c')
| -rw-r--r-- | security/nss/lib/softoken/lgglue.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/security/nss/lib/softoken/lgglue.c b/security/nss/lib/softoken/lgglue.c index 67f17943b..94f054129 100644 --- a/security/nss/lib/softoken/lgglue.c +++ b/security/nss/lib/softoken/lgglue.c @@ -171,8 +171,6 @@ sftkdb_encrypt_stub(PLArenaPool *arena, SDB *sdb, SECItem *plainText, { SFTKDBHandle *handle = sdb->app_private; SECStatus rv; - SECItem *key; - int iterationCount; if (handle == NULL) { return SECFailure; @@ -194,15 +192,9 @@ sftkdb_encrypt_stub(PLArenaPool *arena, SDB *sdb, SECItem *plainText, /* PORT_SetError */ return SECFailure; } - if (handle->newKey) { - key = handle->newKey; - iterationCount = handle->newDefaultIterationCount; - } else { - key = &handle->passwordKey; - iterationCount = handle->defaultIterationCount; - } - rv = sftkdb_EncryptAttribute(arena, key, iterationCount, + rv = sftkdb_EncryptAttribute(arena, + handle->newKey ? handle->newKey : &handle->passwordKey, plainText, cipherText); PZ_Unlock(handle->passwordLock); |