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/sftkdbti.h | |
| 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/sftkdbti.h')
| -rw-r--r-- | security/nss/lib/softoken/sftkdbti.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/nss/lib/softoken/sftkdbti.h b/security/nss/lib/softoken/sftkdbti.h index 22655de56..7b1db4560 100644 --- a/security/nss/lib/softoken/sftkdbti.h +++ b/security/nss/lib/softoken/sftkdbti.h @@ -13,9 +13,7 @@ struct SFTKDBHandleStr { PRInt32 ref; CK_OBJECT_HANDLE type; SECItem passwordKey; - int defaultIterationCount; SECItem *newKey; - int newDefaultIterationCount; SECItem *oldKey; SECItem *updatePasswordKey; PZLock *passwordLock; @@ -41,10 +39,9 @@ struct SFTKDBHandleStr { SECStatus sftkdb_DecryptAttribute(SECItem *passKey, SECItem *cipherText, SECItem **plainText); SECStatus sftkdb_EncryptAttribute(PLArenaPool *arena, SECItem *passKey, - int iterationCount, SECItem *plainText, - SECItem **cipherText); + SECItem *plainText, SECItem **cipherText); SECStatus sftkdb_SignAttribute(PLArenaPool *arena, SECItem *passKey, - int iterationCount, CK_OBJECT_HANDLE objectID, + CK_OBJECT_HANDLE objectID, CK_ATTRIBUTE_TYPE attrType, SECItem *plainText, SECItem **sigText); SECStatus sftkdb_VerifyAttribute(SECItem *passKey, |