security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Detect non operational readers.

Browse source 
Backport from 2.0.
This commit is contained in:
Werner Koch 2010-05-03 11:10:49 +00:00
parent 05a3f56391
commit ca2d315765
5 changed files with 52 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scd/command.c
View file

@ -70,6 +70,10 @@
&& (c)->reader_slot == locked_session->ctrl_backlink->reader_slot)
/* Flag indicating that the reader has been disabled. */
static int reader_disabled;
/* This structure is used to keep track of open readers (slots). */
struct slot_status_s
{
@ -394,7 +398,15 @@ get_reader_slot (void)
/* Try to open the reader. */
if (ss->slot == -1)
ss->slot = apdu_open_reader (opt.reader_port);
{
int no_service_flag;
ss->slot = apdu_open_reader (opt.reader_port, &no_service_flag);
if (no_service_flag)
{
log_info ("no card services - disabling scdaemon\n");
reader_disabled = 1;
}
}
/* Return the slot_table index. */
return 0;
@ -409,6 +421,9 @@ open_card (ctrl_t ctrl, const char *apptype)
gpg_error_t err;
int slot;
if (reader_disabled)
return gpg_error (GPG_ERR_NOT_OPERATIONAL);
/* If we ever got a card not present error code, return that. Only
the SERIALNO command and a reset are able to clear from that
state. */
@ -441,7 +456,7 @@ open_card (ctrl_t ctrl, const char *apptype)
slot = get_reader_slot ();
ctrl->reader_slot = slot;
if (slot == -1)
err = gpg_error (GPG_ERR_CARD);
err = gpg_error (reader_disabled? GPG_ERR_NOT_OPERATIONAL: GPG_ERR_CARD);
else
{
/* Fixme: We should move the apdu_connect call to
@ -495,7 +510,7 @@ cmd_serialno (assuan_context_t ctx, char *line)
time_t stamp;
/* Clear the remove flag so that the open_card is able to reread it. */
if (ctrl->server_local->card_removed)
if (!reader_disabled && ctrl->server_local->card_removed)
{
if ( IS_LOCKED (ctrl) )
return gpg_error (GPG_ERR_LOCKED);
@ -1993,7 +2008,7 @@ scd_command_handler (ctrl_t ctrl, int fd)
BUG ();
sl->next_session = ctrl->server_local->next_session;
}
stopme = ctrl->server_local->stopme;
stopme = ctrl->server_local->stopme || reader_disabled;
xfree (ctrl->server_local);
ctrl->server_local = NULL;