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

bug 125808 :

Browse Source 
Reset the token name on token removal.
Check for token presence to reset the session handle.
Consolidate the NSS3 style TokenInit with the stan init so everything is in sync.
r=ddrinan
This commit is contained in:
relyea%netscape.com 2002-03-06 01:44:50 +00:00
parent cc20b87560
commit 578a4b59ae
5 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/nss/lib/dev/devtoken.c
View File

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: devtoken.c,v $ $Revision: 1.8 $ $Date: 2002/03/04 22:39:21 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: devtoken.c,v $ $Revision: 1.9 $ $Date: 2002/03/06 01:44:47 $ $Name: $";
#endif /* DEBUG */
#ifndef DEV_H
@ -195,6 +195,9 @@ nssToken_GetName
NSSToken *tok
)
{
if (tok->name[0] == 0) {
(void) nssToken_IsPresent(tok);
}
return tok->name;
}
@ -233,6 +236,7 @@ nssToken_IsPresent
ckrv = CKAPI(slot)->C_GetSlotInfo(slot->slotID, &slotInfo);
if (ckrv != CKR_OK) {
nssSession_ExitMonitor(session);
token->name[0] = 0;
return PR_FALSE;
}
slot->ckFlags = slotInfo.flags;
@ -245,6 +249,7 @@ nssToken_IsPresent
session->handle = CK_INVALID_SESSION;
}
nssSession_ExitMonitor(session);
token->name[0] = 0;
return PR_FALSE;
}
/* token is present, use the session info to determine if the card
@ -267,6 +272,7 @@ nssToken_IsPresent
/* token has been removed, need to refresh with new session */
nssrv = nssSlot_Refresh(slot);
if (nssrv != PR_SUCCESS) {
token->name[0] = 0;
return PR_FALSE;
}
return PR_TRUE;

27
security/nss/lib/pk11wrap/dev3hack.c
View File

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: dev3hack.c,v $ $Revision: 1.7 $ $Date: 2002/03/04 22:39:25 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: dev3hack.c,v $ $Revision: 1.8 $ $Date: 2002/03/06 01:44:49 $ $Name: $";
#endif /* DEBUG */
#ifndef NSS_3_4_CODE
@ -173,6 +173,23 @@ nssSlot_IsPermanent
return slot->pk11slot->isPerm;
}
NSS_IMPLEMENT PRStatus
nssToken_Refresh(NSSToken *token)
{
PK11SlotInfo *nss3slot;
if (!token) {
return PR_SUCCESS;
}
nss3slot = token->pk11slot;
token->defaultSession = nssSession_ImportNSS3Session(token->slot->arena,
nss3slot->session,
nss3slot->sessionLock,
nss3slot->defRWSession);
nssToken_DestroyCertList(token);
return nssToken_LoadCerts(token);
}
NSS_IMPLEMENT PRStatus
nssSlot_Refresh
(
@ -183,15 +200,11 @@ nssSlot_Refresh
if (PK11_InitToken(nss3slot, PR_FALSE) != SECSuccess) {
return PR_FAILURE;
}
slot->token->defaultSession = nssSession_ImportNSS3Session(slot->arena,
nss3slot->session,
nss3slot->sessionLock,
nss3slot->defRWSession);
nssToken_DestroyCertList(slot->token);
return nssToken_LoadCerts(slot->token);
return nssToken_Refresh(slot->token);
}
NSSTrustDomain *
nssToken_GetTrustDomain(NSSToken *token)
{

5
security/nss/lib/pk11wrap/dev3hack.h
View File

@ -35,7 +35,7 @@
#define DEVNSS3HACK_H
#ifdef DEBUG
static const char DEVNSS3HACK_CVS_ID[] = "@(#) $RCSfile: dev3hack.h,v $ $Revision: 1.4 $ $Date: 2002/03/04 22:39:26 $ $Name: $";
static const char DEVNSS3HACK_CVS_ID[] = "@(#) $RCSfile: dev3hack.h,v $ $Revision: 1.5 $ $Date: 2002/03/06 01:44:50 $ $Name: $";
#endif /* DEBUG */
#include "cert.h"
@ -48,6 +48,9 @@ nssToken_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot);
NSS_EXTERN void
nssToken_UpdateName(NSSToken *);
NSS_EXTERN PRStatus
nssToken_Refresh(NSSToken *);
NSSTrustDomain *
nssToken_GetTrustDomain(NSSToken *token);

5
security/nss/lib/pk11wrap/pk11cert.c
View File

@ -702,7 +702,6 @@ PK11_GetCertFromPrivateKey(SECKEYPrivateKey *privKey)
CK_OBJECT_HANDLE handle = privKey->pkcs11ID;
CK_OBJECT_HANDLE certID =
PK11_MatchItem(slot,handle,CKO_CERTIFICATE);
SECStatus rv;
CERTCertificate *cert;
if (certID == CK_INVALID_HANDLE) {
@ -1378,6 +1377,10 @@ PK11_FindCertFromNickname(char *nickname, void *wincx) {
nssTokenCertSearch search;
struct token_cbstr token_cb;
nssList *certList;
if (!PK11_IsPresent(slot)) {
return NULL;
}
if (!PK11_IsFriendly(slot)) {
if (PK11_Authenticate(slot, PR_TRUE, wincx) != SECSuccess) {
PK11_FreeSlot(slot);

7
security/nss/lib/pk11wrap/pk11slot.c
View File

@ -1783,6 +1783,8 @@ PK11_InitToken(PK11SlotInfo *slot, PRBool loadCerts)
if (!slot->isThreadSafe) PK11_ExitSlotMonitor(slot);
}
nssToken_Refresh(slot->nssToken);
if (!(slot->needLogin)) {
return pk11_CheckVerifyTest(slot);
}
@ -1824,6 +1826,7 @@ PK11_InitToken(PK11SlotInfo *slot, PRBool loadCerts)
}
}
}
return SECSuccess;
}
@ -1942,6 +1945,10 @@ pk11_IsPresentCertLoad(PK11SlotInfo *slot, PRBool loadCerts)
return PR_TRUE;
}
if (slot->nssToken) {
return nssToken_IsPresent(slot->nssToken);
}
/* removable slots have a flag that says they are present */
if (!slot->isThreadSafe) PK11_EnterSlotMonitor(slot);
if (PK11_GETTAB(slot)->C_GetSlotInfo(slot->slotID,&slotInfo) != CKR_OK) {