giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- C_CloseAllSessions would block on some Win32 versions because it tried

Browse Source 
to acquire the global pkcs11 mutex twice.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1704 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
okir 2003-12-30 08:00:10 +00:00
parent f761d1504f
commit 8a97a69d1d
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pkcs11/pkcs11-session.c
View File

@ -76,21 +76,17 @@ out: sc_pkcs11_unlock();
return rv;
}
CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) /* the session's handle */
/* Internal version of C_CloseSession that gets called with
* the global lock held */
CK_RV sc_pkcs11_close_session(CK_SESSION_HANDLE hSession)
{
struct sc_pkcs11_slot *slot;
struct sc_pkcs11_session *session;
int rv;
rv = sc_pkcs11_lock();
if (rv != CKR_OK)
return rv;
rv = pool_find_and_delete(&session_pool, hSession, (void**) &session);
if (rv != CKR_OK)
goto out;
sc_debug(context, "C_CloseSession(slot %d)\n", session->slot->id);
return rv;
/* If we're the last session using this slot, make sure
* we log out */
@ -102,9 +98,7 @@ CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) /* the session's handle */
}
free(session);
out: sc_pkcs11_unlock();
return rv;
return CKR_OK;
}
/* Internal version of C_CloseAllSessions that gets called with
@ -114,19 +108,31 @@ CK_RV sc_pkcs11_close_all_sessions(CK_SLOT_ID slotID)
struct sc_pkcs11_pool_item *item, *next;
struct sc_pkcs11_session *session;
sc_debug(context, "C_CloseAllSessions().\n");
sc_debug(context, "C_CloseAllSessions(slot %d).\n", (int) slotID);
for (item = session_pool.head; item != NULL; item = next) {
session = (struct sc_pkcs11_session*) item->item;
next = item->next;
if (session->slot->id == slotID) {
C_CloseSession(item->handle);
}
if (session->slot->id == slotID)
sc_pkcs11_close_session(item->handle);
}
return CKR_OK;
}
CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) /* the session's handle */
{
int rv;
sc_debug(context, "C_CloseSession(%lx)\n", (long) hSession);
rv = sc_pkcs11_lock();
if (rv == CKR_OK)
rv = sc_pkcs11_close_session(hSession);
sc_pkcs11_unlock();
return rv;
}
CK_RV C_CloseAllSessions(CK_SLOT_ID slotID) /* the token's slot */
{
struct sc_pkcs11_slot *slot;