Changeset 3506 for trunk/src/pkcs11/slot.c

Timestamp:

04/29/08 19:01:19 (7 months ago)

Author:

alonbl

Message:

Plug&Play support

This is not the best solution, but focus on smallest code change.

Changes:

1. Add detect_readers() to reader opts, this adds new readers to the end

of the readers list until list is full.

2. Add sc_ctx_detect_readers() that calls readers' detect_readers().

3. Fixup pcsc_lock() so that it reconnect to the card and report proper

error so caller may be notified if session was lost.

4. Allow context to be created without readers.

5. Call sc_ctx_detect_readers() from PKCS#11 C_GetSlotList with NULL_PTR.

6. Allow no reader at detect_card, as reader my be removed.

7. Since I broke ABI, I updated the external module version requirement

to match OpenSC version. In the future a separate version should be
maintained for each interface, this should be unrelated to the package
version.

Alon

---

svn merge -r 3480:3505 https://www.opensc-project.org/svn/opensc/branches/alonbl/pnp

M src/tools/opensc-tool.c
M src/pkcs11/pkcs11-global.c
M src/pkcs11/slot.c
M src/libopensc/reader-pcsc.c
M src/libopensc/internal-winscard.h
M src/libopensc/ctx.c
M src/libopensc/reader-ctapi.c
M src/libopensc/libopensc.exports
M src/libopensc/reader-openct.c
M src/libopensc/opensc.h

Files:

• trunk/src/pkcs11/slot.c (modified) (1 diff)

trunk/src/pkcs11/slot.c

@@ -87 +87 @@
 
                 if (rdr == NULL)
-                        return CKR_GENERAL_ERROR;
+                        return CKR_TOKEN_NOT_PRESENT;
                 slot = virtual_slots + card->first_slot + i;
                 strcpy_bp(slot->slot_info.slotDescription, rdr->name, 64);