security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

scd fixes on error.

Browse Source 
* scd/apdu.c (open_pcsc_reader_wrapped): Show error number.

* scd/command.c (get_reader_slot): Return -1 on error.
This commit is contained in:
NIIBE Yutaka 2012-06-12 14:51:52 +09:00
parent c86e9bd1bc
commit 03be1a059b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scd/apdu.c
View File

@ -1728,7 +1728,8 @@ open_pcsc_reader_wrapped (const char *portstr)
| (msgbuf[7] << 8 ) | msgbuf[8]); | (msgbuf[7] << 8 ) | msgbuf[8]);
if (err) if (err)
{ {
log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err)); log_error ("PC/SC OPEN failed: %s (0x%08x)\n",
pcsc_error_string (err), err);
/*sw = pcsc_error_to_sw (err);*/ /*sw = pcsc_error_to_sw (err);*/
goto command_failed; goto command_failed;
} }

15
scd/command.c
View File

@ -414,18 +414,19 @@ get_reader_slot (void)
int no_service_flag; int no_service_flag;
ss->slot = apdu_open_reader (opt.reader_port, &no_service_flag); ss->slot = apdu_open_reader (opt.reader_port, &no_service_flag);
/* If we still don't have a slot, we have no readers.
Invalidate for now until a reader is attached. */
if(ss->slot == -1)
{
ss->valid = 0;
}
if (no_service_flag) if (no_service_flag)
{ {
log_info ("no card services - disabling scdaemon\n"); log_info ("no card services - disabling scdaemon\n");
reader_disabled = 1; reader_disabled = 1;
} }
/* If we still don't have a slot, we have no readers.
Invalidate for now until a reader is attached. */
if(ss->slot == -1)
{
ss->valid = 0;
return -1;
}
} }
/* Return the slot_table index. */ /* Return the slot_table index. */