Ticket #1: 2046.patch

opensc/src/include/winconfig.h

@@ -54 +54 @@
 
 #define PATH_MAX _MAX_PATH
 
-#define sleep(t) Sleep((t) * 1000)
-
 #ifndef VERSION
 #define VERSION "0.9.4"
 #endif

opensc/src/libopensc/card-belpic.c

@@ -1008 +1008 @@
                                      SC_ALGORITHM_RSA_PAD_PKCS1 | SC_ALGORITHM_RSA_HASH_NONE, 0);
         }
 
+        /* V1 applets have a problem: if the card sends a 6C XX (only XX bytes available),
+         * and we resend the command too soon (i.e. the reader is too fast), the card
+         * doesn't respond. So we build in a delay. */
+        card->wait_resend_apdu = 40;
+
         /* State that we have an RNG */
         card->caps |= SC_CARD_CAP_RNG;
 

opensc/src/libopensc/card.c

@@ -260 +260 @@
         if (apdu->sw1 == 0x6C && apdu->resplen == 0) {
                 apdu->resplen = orig_resplen;
                 apdu->le = apdu->sw2;
+                /* Fix for cards (e.g. belpic) that need a delay on fast readers */
+                if (card->wait_resend_apdu != 0)
+                        msleep(card->wait_resend_apdu);
                 r = sc_transceive(card, apdu);
                 if (r != 0) {
                         sc_unlock(card);

opensc/src/libopensc/opensc.h

@@ -179 +179 @@
 /* A 64-bit uint, used in sc_current_time() */
 #ifndef _WIN32
 typedef unsigned long long sc_timestamp_t;
+#define msleep(t)       usleep((t) * 1000)
 #else
 typedef unsigned __int64 sc_timestamp_t;
+#define msleep(t)       Sleep(t)
+#define sleep(t)        Sleep((t) * 1000)
 #endif
 
 /* Event masks for sc_wait_for_event() */
@@ -440 +443 @@
         struct sc_slot_info *slot;
 
         unsigned long caps, flags;
+        unsigned int wait_resend_apdu;  /* Delay (msec) before responding to an SW12 = 6CXX */
         int cla;
         u8 atr[SC_MAX_ATR_SIZE];
         size_t atr_len;