diff options
| author | Werner Koch <[email protected]> | 2011-12-19 17:26:47 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2012-06-15 07:36:41 +0000 |
| commit | 2586eac997911869008cb3ba57865a7d63a2afc3 (patch) | |
| tree | 3358ea1d7038f5f9cbacf2060749ff3a351990d5 | |
| parent | Merge ccid_driver_improvement branch. (backport) (diff) | |
| download | gnupg-2586eac997911869008cb3ba57865a7d63a2afc3.tar.gz gnupg-2586eac997911869008cb3ba57865a7d63a2afc3.zip | |
scd: Fix for card change returning GPG_ERR_CARD_RESET.
* scd/apdu.c (apdu_connect): Do not test for zero atrlen.
--
When gpg-agent prompts for insertion of a card this error would be
returned.
Co-authored-by: Ben Kibbey <[email protected]>
| -rw-r--r-- | scd/apdu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 2effa8c95..0e52909f4 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -3078,8 +3078,7 @@ apdu_connect (int slot) ; else if (!(status & APDU_CARD_PRESENT)) sw = SW_HOST_NO_CARD; - else if (((status & APDU_CARD_PRESENT) && !(status & APDU_CARD_ACTIVE)) - || !reader_table[slot].atrlen) + else if ((status & APDU_CARD_PRESENT) && !(status & APDU_CARD_ACTIVE)) sw = SW_HOST_CARD_INACTIVE; |