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

pkcs11: simpify reader removal 

- reader (slot) description is already initialized init_slot_info()
- objects and logins are already released in slot_token_removed
This commit is contained in:
Frank Morgner 2020-03-02 22:24:54 +01:00
parent af40303fe8
commit d54f346937
3 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkcs11/pkcs11-global.c
View File

@ -475,10 +475,8 @@ CK_RV C_GetSlotList(CK_BBOOL tokenPresent, /* only slots with token prese
*/
if ((!tokenPresent && !slot->reader)
|| (!tokenPresent && slot->reader != prev_reader)
|| (slot->slot_info.flags & CKF_TOKEN_PRESENT)
|| (slot->flags & SC_PKCS11_SLOT_FLAG_SEEN)) {
|| (slot->slot_info.flags & CKF_TOKEN_PRESENT)) {
found[numMatches++] = slot->id;
slot->flags |= SC_PKCS11_SLOT_FLAG_SEEN;
}
prev_reader = slot->reader;
}

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

@ -201,16 +201,6 @@ struct sc_pkcs11_card {
unsigned int nmechanisms;
};
/* If the slot did already show with `C_GetSlotList`, then we need to keep this
* slot alive. PKCS#11 2.30 allows allows adding but not removing slots until
* 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 */
@ -232,7 +222,6 @@ struct sc_pkcs11_slot {
};
typedef struct sc_pkcs11_slot sc_pkcs11_slot_t;
/* Forward decl */
typedef struct sc_pkcs11_operation sc_pkcs11_operation_t;

43
src/pkcs11/slot.c
View File

@ -121,24 +121,11 @@ CK_RV create_slot(sc_reader_t *reader)
if (reader != NULL) {
slot->reader = reader;
strcpy_bp(slot->slot_info.manufacturerID, reader->vendor, 32);
strcpy_bp(slot->slot_info.slotDescription, reader->name, 64);
slot->slot_info.hardwareVersion.major = reader->version_major;
slot->slot_info.hardwareVersion.minor = reader->version_minor;
}
return CKR_OK;
}
void empty_slot(struct sc_pkcs11_slot *slot)
{
if (slot) {
list_clear(&slot->objects);
list_clear(&slot->logins);
}
}
/* create slots associated with a reader, called whenever a reader is seen. */
CK_RV initialize_reader(sc_reader_t *reader)
{
@ -373,38 +360,20 @@ fail:
CK_RV
card_detect_all(void)
{
unsigned int i, j;
unsigned int i;
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;
/* 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;
}
}
}
card_removed(reader);
/* do not remove slots related to this reader which would be
* possible according to PKCS#11 2.20 and later, because NSS can't
* handle a shrinking slot list
* https://bugzilla.mozilla.org/show_bug.cgi?id=1613632 */
} 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