Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate one cause of double-deletes of PKCS11 keys and sessions.

Browse Source 
Bug 283690. Patch contributed by Bob Relyea. r=nelson.
This commit is contained in:
nelsonb%netscape.com 2005-03-15 05:27:31 +00:00
parent 4a77c6881a
commit 0b4c6bf4e9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
security/nss/lib/pk11wrap/pk11skey.c
View File

@ -139,7 +139,7 @@ PK11_CreateSymKey(PK11SlotInfo *slot, CK_MECHANISM_TYPE type, PRBool owner,
symKey->size = 0;
symKey->refCount = 1;
symKey->origin = PK11_OriginNULL;
symKey->origin = PK11_OriginNULL;
symKey->parent = NULL;
PK11_ReferenceSlot(slot);
return symKey;
}
@ -154,6 +154,9 @@ PK11_FreeSymKey(PK11SymKey *symKey)
PRBool freeit = PR_TRUE;
if (PR_AtomicDecrement(&symKey->refCount) == 0) {
PK11SymKey *parent = symKey->parent;
symKey->parent = NULL;
if ((symKey->owner) && symKey->objectID != CK_INVALID_HANDLE) {
pk11_EnterKeyMonitor(symKey);
(void) PK11_GETTAB(symKey->slot)->
@ -180,6 +183,10 @@ PK11_FreeSymKey(PK11SymKey *symKey)
PORT_Free(symKey);
}
PK11_FreeSlot(slot);
if (parent) {
PK11_FreeSymKey(parent);
}
}
}
@ -258,9 +265,9 @@ PK11_SymKeyFromHandle(PK11SlotInfo *slot, PK11SymKey *parent, PK11Origin origin,
* keys do. */
if (owner && parent) {
pk11_CloseSession(symKey->slot, symKey->session,symKey->sessionOwner);
symKey->sessionOwner = parent->sessionOwner;
symKey->sessionOwner = PR_FALSE;
symKey->session = parent->session;
parent->sessionOwner = PR_FALSE;
symKey->parent = PK11_ReferenceSymKey(parent);
}
return symKey;

1
security/nss/lib/pk11wrap/secmodti.h
View File

@ -171,6 +171,7 @@ struct PK11SymKeyStr {
int size; /* key size in bytes */
PK11Origin origin; /* where this key came from
(see def in secmodt.h) */
PK11SymKey *parent;
uint16 series; /* break up the slot info into various groups of
* inserted tokens so that keys and certs can be
* invalidated */