From 4b188510af097627f117482dfc7c3d308c845385 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 26 Jun 2019 23:32:13 +0200 Subject: Revert "Update NSS to 3.41.1 (custom)" This reverts commit fbc2eaacd679f0c484993ffe23d786fd06da22c3. --- security/nss/lib/softoken/sftkdbti.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'security/nss/lib/softoken/sftkdbti.h') 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, -- cgit v1.2.3