diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-27 03:37:29 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-27 03:37:29 +0200 |
| commit | 95ab8db84ce41bec9b4d269ef6539f3e4950b3b9 (patch) | |
| tree | 68185aaceae15ee718ed2975907aa92ad56cc460 /security/nss/lib/softoken/sftkdbti.h | |
| parent | 7715dd79c5e38cd0de3b3092fbacd6146146a028 (diff) | |
| parent | 3c568a5681bac0a84f7a49697951780170ad182c (diff) | |
| download | UXP-95ab8db84ce41bec9b4d269ef6539f3e4950b3b9.tar UXP-95ab8db84ce41bec9b4d269ef6539f3e4950b3b9.tar.gz UXP-95ab8db84ce41bec9b4d269ef6539f3e4950b3b9.tar.lz UXP-95ab8db84ce41bec9b4d269ef6539f3e4950b3b9.tar.xz UXP-95ab8db84ce41bec9b4d269ef6539f3e4950b3b9.zip | |
Merge branch 'nss-sftkpwd-update'
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, |