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

* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver.

Browse source 
* ccid-driver.c (read_device_info): Removed.
(make_reader_id, scan_or_find_devices): New.
(ccid_open_reader): Simplified by make use of the new functions.
(ccid_set_debug_level): New.  Changed the macros to make use of
it.  It has turned out that it is often useful to enable debugging
at runtime so I added this option.
This commit is contained in:
Werner Koch 2004-09-15 15:26:38 +00:00
parent cffee05e57
commit 58cf95534e
4 changed files with 366 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

14
g10/g10.c
View file

@ -53,6 +53,11 @@
#include "keyserver-internal.h"
#include "exec.h"
#include "cardglue.h"
#ifdef ENABLE_CARD_SUPPORT
#include "ccid-driver.h"
#endif
enum cmd_and_opt_values
{
@ -167,6 +172,7 @@ enum cmd_and_opt_values
oOptions,
oDebug,
oDebugAll,
oDebugCCIDDriver,
oStatusFD,
#ifdef __riscos__
oStatusFile,
@ -683,6 +689,9 @@ static ARGPARSE_OPTS opts[] = {
{ octapiDriver, "ctapi-driver", 2, "@"},
{ opcscDriver, "pcsc-driver", 2, "@"},
{ oDisableCCID, "disable-ccid", 0, "@"},
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
{ oDebugCCIDDriver, "debug-ccid-driver", 0, "@"},
#endif
{0,NULL,0,NULL}
};
@ -1886,6 +1895,11 @@ main( int argc, char **argv )
break;
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break;
case oDebugCCIDDriver:
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
ccid_set_debug_level (1);
#endif
break;
case oStatusFD:
set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
break;