security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

scd: Fix an action after card removal.

Browse Source 
* scd/command.c (update_card_removed): Call apdu_close_reader here.

--
Backport of master commit: f9e49c80e706a27d5e30d4b3237ff26367a67130

This is update of the commit 8fe81055762d9c9e6f03fb7853a985c94ef73ac3
It is better apdu_close_reader is called in update_card_removed.

The commit 1598a4476466822e7e9c757ac471089d3db4b545 introduced a
regression, it doesn't close the reader after removal of the card, while
the code before the commit call apdu_close_reader in do_reset.
So, this fix.

GnuPG-bug-id: 2449
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-09-03 15:27:30 +09:00
parent 710d0ce0fd
commit 68d3e461f6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scd/command.c
View File

@ -200,6 +200,7 @@ update_card_removed (int slot, int value)
if (value)
{
log_debug ("Removal of a card: %d\n", slot);
apdu_close_reader (slot);
application_notify_card_reset (slot);
slot_table[slot].slot = -1;
}
@ -2315,10 +2316,7 @@ update_reader_status_file (int set_card_removed_flag)
/* Set the card removed flag for all current sessions. */
if (ss->any && ss->status == 0 && set_card_removed_flag)
{
apdu_close_reader (ss->slot);
update_card_removed (ss->slot, 1);
}
update_card_removed (ss->slot, 1);
ss->any = 1;