diff options
Diffstat (limited to 'nss/lib/pk11wrap/dev3hack.c')
| -rw-r--r-- | nss/lib/pk11wrap/dev3hack.c | 160 |
1 files changed, 67 insertions, 93 deletions
diff --git a/nss/lib/pk11wrap/dev3hack.c b/nss/lib/pk11wrap/dev3hack.c index c1fe55c..27325a5 100644 --- a/nss/lib/pk11wrap/dev3hack.c +++ b/nss/lib/pk11wrap/dev3hack.c @@ -24,45 +24,43 @@ NSS_IMPLEMENT nssSession * nssSession_ImportNSS3Session(NSSArena *arenaOpt, - CK_SESSION_HANDLE session, + CK_SESSION_HANDLE session, PZLock *lock, PRBool rw) { nssSession *rvSession = NULL; if (session != CK_INVALID_SESSION) { - rvSession = nss_ZNEW(arenaOpt, nssSession); - if (rvSession) { - rvSession->handle = session; - rvSession->lock = lock; - rvSession->ownLock = PR_FALSE; - rvSession->isRW = rw; - } + rvSession = nss_ZNEW(arenaOpt, nssSession); + if (rvSession) { + rvSession->handle = session; + rvSession->lock = lock; + rvSession->ownLock = PR_FALSE; + rvSession->isRW = rw; + } } return rvSession; } NSS_IMPLEMENT nssSession * -nssSlot_CreateSession -( - NSSSlot *slot, - NSSArena *arenaOpt, - PRBool readWrite -) +nssSlot_CreateSession( + NSSSlot *slot, + NSSArena *arenaOpt, + PRBool readWrite) { nssSession *rvSession; if (!readWrite) { - /* nss3hack version only returns rw swssions */ - return NULL; + /* nss3hack version only returns rw swssions */ + return NULL; } rvSession = nss_ZNEW(arenaOpt, nssSession); if (!rvSession) { - return (nssSession *)NULL; + return (nssSession *)NULL; } rvSession->handle = PK11_GetRWSession(slot->pk11slot); if (rvSession->handle == CK_INVALID_HANDLE) { - nss_ZFreeIf(rvSession); - return NULL; + nss_ZFreeIf(rvSession); + return NULL; } rvSession->isRW = PR_TRUE; rvSession->slot = slot; @@ -87,17 +85,14 @@ nssSlot_CreateSession } NSS_IMPLEMENT PRStatus -nssSession_Destroy -( - nssSession *s -) +nssSession_Destroy(nssSession *s) { PRStatus rv = PR_SUCCESS; if (s) { - if (s->isRW) { - PK11_RestoreROSession(s->slot->pk11slot, s->handle); - } - rv = nss_ZFreeIf(s); + if (s->isRW) { + PK11_RestoreROSession(s->slot->pk11slot, s->handle); + } + rv = nss_ZFreeIf(s); } return rv; } @@ -109,12 +104,12 @@ nssSlot_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot) NSSArena *arena; arena = nssArena_Create(); if (!arena) { - return NULL; + return NULL; } rvSlot = nss_ZNEW(arena, NSSSlot); if (!rvSlot) { - nssArena_Destroy(arena); - return NULL; + nssArena_Destroy(arena); + return NULL; } rvSlot->base.refCount = 1; rvSlot->base.lock = PZ_NewLock(nssILockOther); @@ -123,7 +118,7 @@ nssSlot_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot) rvSlot->epv = nss3slot->functionList; rvSlot->slotID = nss3slot->slotID; /* Grab the slot name from the PKCS#11 fixed-length buffer */ - rvSlot->base.name = nssUTF8_Duplicate(nss3slot->slot_name,td->arena); + rvSlot->base.name = nssUTF8_Duplicate(nss3slot->slot_name, td->arena); rvSlot->lock = (nss3slot->isThreadSafe) ? NULL : nss3slot->sessionLock; return rvSlot; } @@ -136,53 +131,53 @@ nssToken_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot) /* Don't create a token object for a disabled slot */ if (nss3slot->disabled) { - PORT_SetError(SEC_ERROR_NO_TOKEN); - return NULL; + PORT_SetError(SEC_ERROR_NO_TOKEN); + return NULL; } arena = nssArena_Create(); if (!arena) { - return NULL; + return NULL; } rvToken = nss_ZNEW(arena, NSSToken); if (!rvToken) { - nssArena_Destroy(arena); - return NULL; + nssArena_Destroy(arena); + return NULL; } rvToken->base.refCount = 1; rvToken->base.lock = PZ_NewLock(nssILockOther); if (!rvToken->base.lock) { - nssArena_Destroy(arena); - return NULL; + nssArena_Destroy(arena); + return NULL; } rvToken->base.arena = arena; rvToken->pk11slot = nss3slot; rvToken->epv = nss3slot->functionList; rvToken->defaultSession = nssSession_ImportNSS3Session(td->arena, - nss3slot->session, - nss3slot->sessionLock, - nss3slot->defRWSession); + nss3slot->session, + nss3slot->sessionLock, + nss3slot->defRWSession); #if 0 /* we should do this instead of blindly continuing. */ if (!rvToken->defaultSession) { - PORT_SetError(SEC_ERROR_NO_TOKEN); - goto loser; + PORT_SetError(SEC_ERROR_NO_TOKEN); + goto loser; } #endif if (!PK11_IsInternal(nss3slot) && PK11_IsHW(nss3slot)) { - rvToken->cache = nssTokenObjectCache_Create(rvToken, - PR_TRUE, PR_TRUE, PR_TRUE); - if (!rvToken->cache) - goto loser; + rvToken->cache = nssTokenObjectCache_Create(rvToken, + PR_TRUE, PR_TRUE, PR_TRUE); + if (!rvToken->cache) + goto loser; } rvToken->trustDomain = td; /* Grab the token name from the PKCS#11 fixed-length buffer */ - rvToken->base.name = nssUTF8_Duplicate(nss3slot->token_name,td->arena); + rvToken->base.name = nssUTF8_Duplicate(nss3slot->token_name, td->arena); rvToken->slot = nssSlot_CreateFromPK11SlotInfo(td, nss3slot); if (!rvToken->slot) { goto loser; } rvToken->slot->token = rvToken; if (rvToken->defaultSession) - rvToken->defaultSession->slot = rvToken->slot; + rvToken->defaultSession->slot = rvToken->slot; return rvToken; loser: PZ_DestroyLock(rvToken->base.lock); @@ -194,25 +189,19 @@ NSS_IMPLEMENT void nssToken_UpdateName(NSSToken *token) { if (!token) { - return; + return; } - token->base.name = nssUTF8_Duplicate(token->pk11slot->token_name,token->base.arena); + token->base.name = nssUTF8_Duplicate(token->pk11slot->token_name, token->base.arena); } NSS_IMPLEMENT PRBool -nssSlot_IsPermanent -( - NSSSlot *slot -) +nssSlot_IsPermanent(NSSSlot *slot) { return slot->pk11slot->isPerm; } NSS_IMPLEMENT PRBool -nssSlot_IsFriendly -( - NSSSlot *slot -) +nssSlot_IsFriendly(NSSSlot *slot) { return PK11_IsFriendly(slot->pk11slot); } @@ -223,43 +212,37 @@ nssToken_Refresh(NSSToken *token) PK11SlotInfo *nss3slot; if (!token) { - return PR_SUCCESS; + return PR_SUCCESS; } nss3slot = token->pk11slot; - token->defaultSession = - nssSession_ImportNSS3Session(token->slot->base.arena, - nss3slot->session, - nss3slot->sessionLock, - nss3slot->defRWSession); + token->defaultSession = + nssSession_ImportNSS3Session(token->slot->base.arena, + nss3slot->session, + nss3slot->sessionLock, + nss3slot->defRWSession); return token->defaultSession ? PR_SUCCESS : PR_FAILURE; } NSS_IMPLEMENT PRStatus -nssSlot_Refresh -( - NSSSlot *slot -) +nssSlot_Refresh(NSSSlot *slot) { PK11SlotInfo *nss3slot = slot->pk11slot; PRBool doit = PR_FALSE; if (slot->token && slot->token->base.name[0] == 0) { - doit = PR_TRUE; + doit = PR_TRUE; } if (PK11_InitToken(nss3slot, PR_FALSE) != SECSuccess) { - return PR_FAILURE; + return PR_FAILURE; } if (doit) { - nssTrustDomain_UpdateCachedTokenCerts(slot->token->trustDomain, - slot->token); + nssTrustDomain_UpdateCachedTokenCerts(slot->token->trustDomain, + slot->token); } return nssToken_Refresh(slot->token); } NSS_IMPLEMENT PRStatus -nssToken_GetTrustOrder -( - NSSToken *tok -) +nssToken_GetTrustOrder(NSSToken *tok) { PK11SlotInfo *slot; SECMODModule *module; @@ -269,18 +252,14 @@ nssToken_GetTrustOrder } NSS_IMPLEMENT PRBool -nssSlot_IsLoggedIn -( - NSSSlot *slot -) +nssSlot_IsLoggedIn(NSSSlot *slot) { if (!slot->pk11slot->needLogin) { - return PR_TRUE; + return PR_TRUE; } return PK11_IsLoggedIn(slot->pk11slot, NULL); } - NSSTrustDomain * nssToken_GetTrustDomain(NSSToken *token) { @@ -288,18 +267,13 @@ nssToken_GetTrustDomain(NSSToken *token) } NSS_EXTERN PRStatus -nssTrustDomain_RemoveTokenCertsFromCache -( - NSSTrustDomain *td, - NSSToken *token -); +nssTrustDomain_RemoveTokenCertsFromCache( + NSSTrustDomain *td, + NSSToken *token); NSS_IMPLEMENT PRStatus -nssToken_NotifyCertsNotVisible -( - NSSToken *tok -) +nssToken_NotifyCertsNotVisible( + NSSToken *tok) { return nssTrustDomain_RemoveTokenCertsFromCache(tok->trustDomain, tok); } - |