mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 00:17:32 +09:00
[NSS] sync with https://github.com/roytam1/NSS/tree/NSS_3_48_UXP_BRANCH, notably:
- Bug 1665715 - (1/2) revert e8f2720c8254 (bug 1593141) because it's no longer necessary r=jcj (a9bca998) - Bug 1665715 - (2/2) pass encoded signed certificate timestamp extension (if present) in CheckRevocation r=jcj (429f9ef9)
This commit is contained in:
parent
96524cc3c5
commit
4e45ee69e0
22 changed files with 130 additions and 272 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue