Changeset 3512 for trunk/src

Timestamp:

05/10/08 09:55:01 (8 months ago)

Author:

alonbl

Message:

Better handle openct reader replug, revert last change in pkcs11-pin

Location:

trunk/src/libopensc

Files:

• pkcs15-pin.c (modified) (1 diff)
• reader-openct.c (modified) (1 diff)

trunk/src/libopensc/pkcs15-pin.c

@@ -204 +204 @@
         card = p15card->card;
 
-        /*
-         * PC/SC
-         * First call: returns SC_ERROR_CARD_RESET or SC_ERROR_READER_REATTACHED if card available.
-         * Second call: succeeds.
-         *
-         * OpenCT
-         * First call: returns SC_ERROR_READER_DETACHED even if card is available.
-         * Second call: SC_ERROR_READER_REATTACHED if card is available.
-         * Third call: succeeds.
-         */
         r = sc_lock(card);
-        if (r == SC_ERROR_CARD_RESET || r == SC_ERROR_READER_DETACHED || r == SC_ERROR_READER_REATTACHED) {
+        if (r == SC_ERROR_CARD_RESET || r == SC_ERROR_READER_REATTACHED) {
                 r = sc_lock(card);
-                if (r == SC_ERROR_READER_REATTACHED)
-                        r = sc_lock(card);
         }
         SC_TEST_RET(card->ctx, r, "sc_lock() failed");

trunk/src/libopensc/reader-openct.c

@@ -431 +431 @@
                 ct_reader_disconnect(data->h);
                 data->h = NULL;
-                return SC_ERROR_READER_DETACHED;
+
+                /* Try to reconnect as reader may be plugged-in again */
+                return openct_reader_reconnect(reader, slot);
         }