diff options
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); |