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