aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-06-30 08:19:28 +0000
committerWerner Koch <[email protected]>2009-06-30 08:19:28 +0000
commit35d41eb92719094e32a26f1d42a06d1ee153ea87 (patch)
tree3299c7ce75bac7835135613e01f75d407673d41d
parentMake soem omnikey readers work with extended length APDUs. (diff)
downloadgnupg-35d41eb92719094e32a26f1d42a06d1ee153ea87.tar.gz
gnupg-35d41eb92719094e32a26f1d42a06d1ee153ea87.zip
small fix for Omnikey. Works with CM4040 now.
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/ccid-driver.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index ab046b0c2..7862a97db 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-30 Werner Koch <[email protected]>
+
+ * ccid-driver.c (ccid_transceive): Set RESYNCING flag.
+
2009-06-29 Werner Koch <[email protected]>
* ccid-driver.c (ccid_transceive): Add a hack to support extended
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 3772b9208..5fe7dd5f8 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2637,6 +2637,7 @@ ccid_transceive (ccid_driver_t handle,
if (via_escape)
nad_byte = 0;
+ last_tpdulen = 0; /* Avoid gcc warning (controlled by RESYNCING). */
for (;;)
{
if (next_chunk)
@@ -2870,6 +2871,7 @@ ccid_transceive (ccid_driver_t handle,
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])