diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
|---|---|---|
| committer | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
| commit | 3051056bbb0b41b8258d91e44a4ff8ec33a98d8f (patch) | |
| tree | 435214f56383925b337cc350452485717c4ea0d1 /security/nss/lib/softoken/pkcs11.c | |
| parent | 00812e30dfa70f9b1a752cf0d09de00f6d401c85 (diff) | |
| parent | 98f7e3b16754aedd44747261113359b8d824449f (diff) | |
| download | UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.gz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.lz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.xz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.zip | |
Merge branch 'master' into FrameProperties
Diffstat (limited to 'security/nss/lib/softoken/pkcs11.c')
| -rw-r--r-- | security/nss/lib/softoken/pkcs11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c index 34f25a9d0..7dd4f7ee9 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_CheckPassword(keydb, "", &tokenRemoved); + SECStatus rv = sftkdb_CheckPasswordNull(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_CheckPassword(handle, "", &tokenRemoved); + rv = sftkdb_CheckPasswordNull(handle, &tokenRemoved); if (tokenRemoved) { sftk_CloseAllSessions(slot, PR_FALSE); } |