summaryrefslogtreecommitdiffstats
path: root/security/nss/lib/softoken/pkcs11.c
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-26 23:32:13 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-26 23:32:13 +0200
commit4b188510af097627f117482dfc7c3d308c845385 (patch)
tree133fbe3ef3eb0f7ce6b151db1ed86bfd9c4abb60 /security/nss/lib/softoken/pkcs11.c
parentfbc2eaacd679f0c484993ffe23d786fd06da22c3 (diff)
downloadUXP-4b188510af097627f117482dfc7c3d308c845385.tar
UXP-4b188510af097627f117482dfc7c3d308c845385.tar.gz
UXP-4b188510af097627f117482dfc7c3d308c845385.tar.lz
UXP-4b188510af097627f117482dfc7c3d308c845385.tar.xz
UXP-4b188510af097627f117482dfc7c3d308c845385.zip
Revert "Update NSS to 3.41.1 (custom)"
This reverts commit fbc2eaacd679f0c484993ffe23d786fd06da22c3.
Diffstat (limited to 'security/nss/lib/softoken/pkcs11.c')
-rw-r--r--security/nss/lib/softoken/pkcs11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 7dd4f7ee9..34f25a9d0 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -617,7 +617,7 @@ sftk_hasNullPassword(SFTKSlot *slot, SFTKDBHandle *keydb)
pwenabled = PR_FALSE;
if (sftkdb_HasPasswordSet(keydb) == SECSuccess) {
PRBool tokenRemoved = PR_FALSE;
- SECStatus rv = sftkdb_CheckPasswordNull(keydb, &tokenRemoved);
+ SECStatus rv = sftkdb_CheckPassword(keydb, "", &tokenRemoved);
if (tokenRemoved) {
sftk_CloseAllSessions(slot, PR_FALSE);
}
@@ -3812,7 +3812,7 @@ NSC_SetPIN(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pOldPin,
PZ_Unlock(slot->slotLock);
tokenRemoved = PR_FALSE;
- rv = sftkdb_CheckPasswordNull(handle, &tokenRemoved);
+ rv = sftkdb_CheckPassword(handle, "", &tokenRemoved);
if (tokenRemoved) {
sftk_CloseAllSessions(slot, PR_FALSE);
}