mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-25 09:57:32 +09:00
imported changes from mozilla NSS:
- Bug 1755555 - Hold tokensLock through nssToken_GetSlot calls in nssTrustDomain_GetActiveSlots. r=rrelyea (a36477f0) - Bug 1370866 - Check return value of PK11Slot_GetNSSToken. r=djackson (d7e8c2df) - Bug 1751157 - Throw illegal_parameter alert for illegal extensions in handshake message. r=djackson (8fd5ca0c)
This commit is contained in:
parent
e350f0c040
commit
c403014cbe
14 changed files with 282 additions and 106 deletions
|
|
@ -4,6 +4,8 @@
|
|||
/*
|
||||
* This file deals with PKCS #11 passwords and authentication.
|
||||
*/
|
||||
#include "dev.h"
|
||||
#include "dev3hack.h"
|
||||
#include "seccomon.h"
|
||||
#include "secmod.h"
|
||||
#include "secmodi.h"
|
||||
|
|
@ -637,8 +639,11 @@ PK11_DoPassword(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
|
|||
}
|
||||
if (rv == SECSuccess) {
|
||||
if (!contextSpecific && !PK11_IsFriendly(slot)) {
|
||||
nssTrustDomain_UpdateCachedTokenCerts(slot->nssToken->trustDomain,
|
||||
slot->nssToken);
|
||||
NSSToken *token = PK11Slot_GetNSSToken(slot);
|
||||
if (token) {
|
||||
nssTrustDomain_UpdateCachedTokenCerts(token->trustDomain, token);
|
||||
(void)nssToken_Destroy(token);
|
||||
}
|
||||
}
|
||||
} else if (!attempt)
|
||||
PORT_SetError(SEC_ERROR_BAD_PASSWORD);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue