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

Improved Handling of PKCS11 Slots 

OpenSC PKCS11 now retains slots even when the reader is removed.
It can do this because existing OpenSC reader handling in ctx.c,
reader-pcsc.c and PC/SC allow OpenSC to do this.

This simplifies the code, and allow a reader to be reinserted
and use the existing slot. This matching is actually done
in reader-pcsc.c because PC/SC returns the unique ids based on
the OS reader names. This is then used as the manufacturerID

By not deleting slots the slot list can only increase which is a
restriction of Firefox. It does not fix all the Firefox issues, but
it does not go into a loop, when all the readers are removed.

The defaults in opensc.conf for max-virtual-readers and slots-per-card
allow for 4 different readers used during one session.

 On branch PKCS11-SLOTS-3
 Changes to be committed:
	modified:   sc-pkcs11.h
	modified:   slot.c
This commit is contained in:
Doug Engert 2020-02-25 20:24:00 -06:00 committed by Frank Morgner
parent ad7eb834cf
commit af40303fe8
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkcs11/sc-pkcs11.h
View File

@ -206,6 +206,11 @@ struct sc_pkcs11_card {
* the application calls `C_GetSlotList` with `NULL`. This flag tracks the
* visibility to the application */
#define SC_PKCS11_SLOT_FLAG_SEEN 1
/* reader-pcsc.c can reuse a removed reader, as the ctx->reader list contains
* readers which have been removed retain removed readers.
* Take advantage of this feature to allow for reinsertion of a reader*/
#define SC_PKCS11_SLOT_FLAG_READER_REMOVED 2
struct sc_pkcs11_slot {
CK_SLOT_ID id; /* ID of the slot */

43
src/pkcs11/slot.c
View File

@ -133,18 +133,8 @@ CK_RV create_slot(sc_reader_t *reader)
void empty_slot(struct sc_pkcs11_slot *slot)
{
if (slot) {
if (slot->flags & SC_PKCS11_SLOT_FLAG_SEEN) {
/* Keep the slot visible to the application. The slot's state has
* already been reset by `slot_token_removed()`, lists have been
* emptied. We replace the reader with a virtual hotplug slot. */
slot->reader = NULL;
init_slot_info(&slot->slot_info, NULL);
} else {
list_destroy(&slot->objects);
list_destroy(&slot->logins);
list_delete(&virtual_slots, slot);
free(slot);
}
list_clear(&slot->objects);
list_clear(&slot->logins);
}
}
@ -383,21 +373,38 @@ fail:
CK_RV
card_detect_all(void)
{
unsigned int i;
unsigned int i, j;
sc_log(context, "Detect all cards");
/* Detect cards in all initialized readers */
for (i=0; i< sc_ctx_get_reader_count(context); i++) {
sc_reader_t *reader = sc_ctx_get_reader(context, i);
int removed = 0; /* have we called card_removed for this reader */
if (reader->flags & SC_READER_REMOVED) {
struct sc_pkcs11_slot *slot;
card_removed(reader);
while ((slot = reader_get_slot(reader))) {
empty_slot(slot);
/* look at all slots to call card_removed amd empty_slot */
for (j = 0; j<list_size(&virtual_slots); j++) {
slot = (sc_pkcs11_slot_t *) list_get_at(&virtual_slots, j);
if (slot->reader == reader) {
if (!removed) {
card_removed(reader);
removed = 1; /* only need to call once for this reader */
}
if (slot->flags & SC_PKCS11_SLOT_FLAG_READER_REMOVED) {
empty_slot(slot);
slot->flags |= SC_PKCS11_SLOT_FLAG_READER_REMOVED;
}
}
}
_sc_delete_reader(context, reader);
i--;
} else {
struct sc_pkcs11_slot *slot;
for (j = 0; j<list_size(&virtual_slots); j++) {
slot = (sc_pkcs11_slot_t *) list_get_at(&virtual_slots, j);
if (slot->reader == reader)
slot->flags &= ~SC_PKCS11_SLOT_FLAG_READER_REMOVED;
}
if (!reader_get_slot(reader))
initialize_reader(reader);
else