mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
scd: PC/SC status fix.
* scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when PCSC_STATE_PRESENT. * scd/pcsc-wrapper.c (handle_status): Ditto.
This commit is contained in:
parent
247bec6a6f
commit
c3495209ee
@ -914,9 +914,11 @@ pcsc_get_status_direct (int slot, unsigned int *status)
|
||||
|
||||
*status = 0;
|
||||
if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
|
||||
*status |= APDU_CARD_PRESENT;
|
||||
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
|
||||
*status |= APDU_CARD_ACTIVE;
|
||||
{
|
||||
*status |= APDU_CARD_PRESENT;
|
||||
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
|
||||
*status |= APDU_CARD_ACTIVE;
|
||||
}
|
||||
#ifndef HAVE_W32_SYSTEM
|
||||
/* We indicate a useful card if it is not in use by another
|
||||
application. This is because we only use exclusive access
|
||||
|
@ -602,9 +602,11 @@ handle_status (unsigned char *argbuf, size_t arglen)
|
||||
if ( !(rdrstates[0].event_state & PCSC_STATE_UNKNOWN) )
|
||||
{
|
||||
if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
|
||||
status |= 2;
|
||||
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
|
||||
status |= 4;
|
||||
{
|
||||
status |= 2;
|
||||
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
|
||||
status |= 4;
|
||||
}
|
||||
/* We indicate a useful card if it is not in use by another
|
||||
application. This is because we only use exclusive access
|
||||
mode. */
|
||||
|
Loading…
x
Reference in New Issue
Block a user