security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

(close_ct_reader, close_pcsc_reader): Implemented.

Browse Source 
(get_ccid_error_string): New.  Not very useful messages, though.
This commit is contained in:
Werner Koch 2003-10-30 09:30:20 +00:00
parent fcc72f915b
commit 06865e7164
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-30 Werner Koch <wk@gnupg.org>
* apdu.c (close_ct_reader, close_pcsc_reader): Implemented.
(get_ccid_error_string): New. Not very useful messages, though.
2003-10-29 Werner Koch <wk@gnupg.org> 2003-10-29 Werner Koch <wk@gnupg.org>
* cardglue.c (open_card): Ask for card insertion. * cardglue.c (open_card): Ask for card insertion.

15
g10/apdu.c
View File

@ -363,7 +363,7 @@ open_ct_reader (int port)
static int static int
close_ct_reader (int slot) close_ct_reader (int slot)
{ {
/* FIXME: Implement. */ CT_close (slot);
reader_table[slot].used = 0; reader_table[slot].used = 0;
return 0; return 0;
} }
@ -594,7 +594,7 @@ pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
static int static int
close_pcsc_reader (int slot) close_pcsc_reader (int slot)
{ {
/* FIXME: Implement. */ pcsc_release_context (reader_table[slot].pcsc.context);
reader_table[slot].used = 0; reader_table[slot].used = 0;
return 0; return 0;
} }
@ -608,6 +608,15 @@ close_pcsc_reader (int slot)
Internal CCID driver interface. Internal CCID driver interface.
*/ */
static const char *
get_ccid_error_string (long err)
{
if (!err)
return "okay";
else
return "unknown CCID error";
}
static int static int
open_ccid_reader (void) open_ccid_reader (void)
{ {
@ -1062,7 +1071,7 @@ error_string (int slot, long rc)
return ct_error_string (rc); return ct_error_string (rc);
#ifdef HAVE_LIBUSB #ifdef HAVE_LIBUSB
else if (reader_table[slot].is_ccid) else if (reader_table[slot].is_ccid)
return "no CCID driver error strings yet"; return get_ccid_error_string (rc);
#endif #endif
#ifdef HAVE_OPENSC #ifdef HAVE_OPENSC
else if (reader_table[slot].is_osc) else if (reader_table[slot].is_osc)