[svn] GnuPG - r5057 - trunk/scd

[svn author wk]

Author: wk
Date: 2009-06-30 10:19:28 +0200 (Tue, 30 Jun 2009)
New Revision: 5057

Modified:
   trunk/scd/ChangeLog
   trunk/scd/ccid-driver.c
Log:
small fix for Omnikey.  Works with CM4040 now.


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2009-06-29 20:54:00 UTC (rev 5056)
+++ trunk/scd/ChangeLog	2009-06-30 08:19:28 UTC (rev 5057)
@@ -1,3 +1,7 @@
+2009-06-30  Werner Koch  <wk at g10code.com>
+
+	* ccid-driver.c (ccid_transceive): Set RESYNCING flag.
+
 2009-06-29  Werner Koch  <wk at g10code.com>
 
 	* ccid-driver.c (ccid_transceive): Add a hack to support extended

Modified: trunk/scd/ccid-driver.c
===================================================================
--- trunk/scd/ccid-driver.c	2009-06-29 20:54:00 UTC (rev 5056)
+++ trunk/scd/ccid-driver.c	2009-06-30 08:19:28 UTC (rev 5057)
@@ -2637,6 +2637,7 @@
   if (via_escape)
     nad_byte = 0;
 
+  last_tpdulen = 0;  /* Avoid gcc warning (controlled by RESYNCING). */
   for (;;)
     {
       if (next_chunk)
@@ -2870,6 +2871,7 @@
               if (use_crc)
                 tpdu[tpdulen++] = (edc >> 8);
               tpdu[tpdulen++] = edc;
+              resyncing = 1;
               DEBUGOUT_1 ("T=1: requesting an ifsc=%d\n", ifsc);
             }
           else if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 3 && tpdu[2])