Changeset 3505 for branches/alonbl/pnp/src/libopensc/reader-pcsc.c

Timestamp:

04/29/08 14:44:49 (9 months ago)

Author:

alonbl

Message:

pcsc_lock() should not open its own transaction if had an error

This casued upper layer to got the impression that the card was not removed.
The PKCS#11 code did not drop credentials and just used cached PIN.

Files:

• branches/alonbl/pnp/src/libopensc/reader-pcsc.c (modified) (1 diff)

branches/alonbl/pnp/src/libopensc/reader-pcsc.c

@@ -645 +645 @@
         rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
 
-        if ((unsigned int)rv == SCARD_E_INVALID_HANDLE || (unsigned int)rv == SCARD_E_READER_UNAVAILABLE) {
-                rv = pcsc_connect(reader, slot);
-                if (rv != SCARD_S_SUCCESS) {
-                        PCSC_ERROR(reader->ctx, "SCardConnect failed", rv);
+        switch (rv) {
+                case SCARD_E_INVALID_HANDLE:
+                case SCARD_E_READER_UNAVAILABLE:
+                        rv = pcsc_connect(reader, slot);
+                        if (rv != SCARD_S_SUCCESS) {
+                                PCSC_ERROR(reader->ctx, "SCardConnect failed", rv);
+                                return pcsc_ret_to_error(rv);
+                        }
+                        /* return failure so that upper layers will be notified and try to lock again */
+                        return SC_ERROR_READER_REATTACHED;
+                case SCARD_W_RESET_CARD:
+                        /* try to reconnect if the card was reset by some other application */
+                        rv = pcsc_reconnect(reader, slot, 0);
+                        if (rv != SCARD_S_SUCCESS) {
+                                PCSC_ERROR(reader->ctx, "SCardReconnect failed", rv);
+                                return pcsc_ret_to_error(rv);
+                        }
+                        /* return failure so that upper layers will be notified and try to lock again */
+                        return SC_ERROR_CARD_RESET;
+                case SCARD_S_SUCCESS:
+                        pslot->locked = 1;
+                        return SC_SUCCESS;
+                default:
+                        PCSC_ERROR(reader->ctx, "SCardBeginTransaction failed", rv);
                         return pcsc_ret_to_error(rv);
-                }
-                /* Now try to begin a new transaction after we reconnected and we fail if
-                 some other program was faster to lock the reader */
-                rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
-        }
-
-        if ((unsigned int)rv == SCARD_W_RESET_CARD) {
-                /* try to reconnect if the card was reset by some other application */
-                rv = pcsc_reconnect(reader, slot, 0);
-                if (rv != SCARD_S_SUCCESS) {
-                        PCSC_ERROR(reader->ctx, "SCardReconnect failed", rv);
-                        return pcsc_ret_to_error(rv);
-                }
-                /* Now try to begin a new transaction after we reconnected and we fail if
-                 some other program was faster to lock the reader */
-                rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
-        }
-
-        if (rv != SCARD_S_SUCCESS) {
-                PCSC_ERROR(reader->ctx, "SCardBeginTransaction failed", rv);
-                return pcsc_ret_to_error(rv);
-        }
-
-        pslot->locked = 1;
-        
-        return SC_SUCCESS;
+        }
 }