diff options
| author | Kai Engert <kaie@kuix.de> | 2020-01-14 13:08:48 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-14 13:08:48 +0100 |
| commit | 3733205f095c409a1547b000cbab68cca2c6af18 (patch) | |
| tree | e3bdfb62d33990c1e9a82d0ba2a0a78542800dbb /security/nss/lib/softoken/pkcs11.c | |
| parent | aa2ac8ddedbfd9fc27a5cf8c3da41ad700ae5347 (diff) | |
| download | UXP-3733205f095c409a1547b000cbab68cca2c6af18.tar UXP-3733205f095c409a1547b000cbab68cca2c6af18.tar.gz UXP-3733205f095c409a1547b000cbab68cca2c6af18.tar.lz UXP-3733205f095c409a1547b000cbab68cca2c6af18.tar.xz UXP-3733205f095c409a1547b000cbab68cca2c6af18.zip | |
Issue #1338: Follow-up: Cache the most recent PBKDF2 password hash,
to speed up repeated SDR operations.
Landed on NSS-3.48 for Bug 1606992
Diffstat (limited to 'security/nss/lib/softoken/pkcs11.c')
| -rw-r--r-- | security/nss/lib/softoken/pkcs11.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c index 7f3a01746..6c535cf77 100644 --- a/security/nss/lib/softoken/pkcs11.c +++ b/security/nss/lib/softoken/pkcs11.c @@ -3097,6 +3097,9 @@ sftk_closePeer(PRBool isFIPS) return; } +extern void sftk_PBELockInit(void); +extern void sftk_PBELockShutdown(void); + /* NSC_Initialize initializes the Cryptoki library. */ CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS) @@ -3113,6 +3116,8 @@ nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS) ENABLE_FORK_CHECK(); + sftk_PBELockInit(); + rv = SECOID_Init(); if (rv != SECSuccess) { crv = CKR_DEVICE_ERROR; @@ -3293,6 +3298,8 @@ nsc_CommonFinalize(CK_VOID_PTR pReserved, PRBool isFIPS) /* clean up the default OID table */ SECOID_Shutdown(); + sftk_PBELockShutdown(); + /* reset fork status in util */ UTIL_SetForkState(PR_FALSE); |