mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-21 15:57:31 +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
|
|
@ -299,9 +299,15 @@ __CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
|
|||
/* Import the perm instance onto the internal token */
|
||||
slot = PK11_GetInternalKeySlot();
|
||||
internal = PK11Slot_GetNSSToken(slot);
|
||||
if (!internal) {
|
||||
PK11_FreeSlot(slot);
|
||||
PORT_SetError(SEC_ERROR_NO_TOKEN);
|
||||
return SECFailure;
|
||||
}
|
||||
permInstance = nssToken_ImportCertificate(
|
||||
internal, NULL, NSSCertificateType_PKIX, &c->id, stanNick, &c->encoding,
|
||||
&c->issuer, &c->subject, &c->serial, cert->emailAddr, PR_TRUE);
|
||||
(void)nssToken_Destroy(internal);
|
||||
nss_ZFreeIf(stanNick);
|
||||
stanNick = NULL;
|
||||
PK11_FreeSlot(slot);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue