wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-21 15:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

[NSS] revert "sync with https://github.com/roytam1/NSS/tree/NSS_3_48_UXP_BRANCH", this should fix a crash when browsing

Browse source
This commit is contained in:
roytam1 2023-11-17 14:29:07 +08:00
commit 24413daff9
23 changed files with 275 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

7
security/nss/lib/softoken/pkcs11.c
View file

@ -1607,7 +1607,7 @@ sftk_handleObject(SFTKObject *object, SFTKSession *session)
PZ_Unlock(slot->slotLock);
/* don't create a private object if we aren't logged in */
if (!isLoggedIn && needLogin && sftk_isTrue(object, CKA_PRIVATE)) {
if (!isLoggedIn && needLogin && (sftk_isTrue(object, CKA_PRIVATE))) {
return CKR_USER_NOT_LOGGED_IN;
}
@ -4674,7 +4674,7 @@ NSC_GetAttributeValue(CK_SESSION_HANDLE hSession,
PZ_Unlock(slot->slotLock);
/* don't read a private object if we aren't logged in */
if (!isLoggedIn && needLogin && sftk_isTrue(object, CKA_PRIVATE)) {
if (!isLoggedIn && needLogin && (sftk_isTrue(object, CKA_PRIVATE))) {
sftk_FreeObject(object);
return CKR_USER_NOT_LOGGED_IN;
}
@ -4745,7 +4745,7 @@ NSC_SetAttributeValue(CK_SESSION_HANDLE hSession,
PZ_Unlock(slot->slotLock);
/* don't modify a private object if we aren't logged in */
if (!isLoggedIn && needLogin && sftk_isTrue(object, CKA_PRIVATE)) {
if (!isLoggedIn && needLogin && (sftk_isTrue(object, CKA_PRIVATE))) {
sftk_FreeSession(session);
sftk_FreeObject(object);
return CKR_USER_NOT_LOGGED_IN;
@ -5023,7 +5023,6 @@ NSC_FindObjectsInit(CK_SESSION_HANDLE hSession,
search->index = 0;
search->size = 0;
search->array_size = NSC_SEARCH_BLOCK_SIZE;
PZ_Lock(slot->slotLock);
isLoggedIn = (PRBool)((!slot->needLogin) || slot->isLoggedIn);
PZ_Unlock(slot->slotLock);