security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd: Add a libusb debug level.

Browse Source 
* scd/ccid-driver.c (USE_LIBUSB_DEBUG_CB): New const.
(debug_libusb_cb): new.
(ccid_set_debug_level): Use it.
--

This allows to see the libusb log in our usual debug output.  For this
the option debug-ccid-driver needs to be given 5 or more times.
This commit is contained in:
Werner Koch 2022-08-22 12:04:40 +02:00
parent 203dcc19eb
commit f4b01ddc6a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scd/ccid-driver.c
View File

@ -166,6 +166,11 @@
#endif /* This source is not used by scdaemon. */ #endif /* This source is not used by scdaemon. */
#undef USE_LIBUSB_DEBUG_CB
#if LIBUSB_API_VERSION >= 0x01000107
# define USE_LIBUSB_DEBUG_CB 1
#endif
#ifndef EAGAIN #ifndef EAGAIN
#define EAGAIN EWOULDBLOCK #define EAGAIN EWOULDBLOCK
@ -1231,6 +1236,23 @@ scan_devices (char **r_rid)
} }
#ifdef USE_LIBUSB_DEBUG_CB
static void
debug_libusb_cb (libusb_context *ctx, enum libusb_log_level level,
const char *str)
{
int n = str? strlen (str):0;
(void)ctx;
/* Strip the LF so that our logging filter does not escape it. */
if (n && str[n-1] == '\n')
n--;
log_debug ("libusb{%d}: %.*s\n", level, n, str);
}
#endif /* USE_LIBUSB_DEBUG_CB */
/* Set the level of debugging to LEVEL and return the old level. -1 /* Set the level of debugging to LEVEL and return the old level. -1
just returns the old level. A level of 0 disables debugging, 1 just returns the old level. A level of 0 disables debugging, 1
enables debugging, 2 enables additional tracing of the T=1 enables debugging, 2 enables additional tracing of the T=1
@ -1245,6 +1267,16 @@ ccid_set_debug_level (int level)
int old = debug_level; int old = debug_level;
if (level != -1) if (level != -1)
debug_level = level; debug_level = level;
#ifdef USE_LIBUSB_DEBUG_CB
if (level > 4)
{
log_debug ("libusb: Enable logging\n");
libusb_set_log_cb (NULL, debug_libusb_cb, LIBUSB_LOG_CB_GLOBAL);
libusb_set_option (NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
}
else
libusb_set_log_cb (NULL, NULL, LIBUSB_LOG_CB_GLOBAL);
#endif /* USE_LIBUSB_DEBUG_CB */
return old; return old;
} }
@ -4050,7 +4082,7 @@ main (int argc, char **argv)
} }
/* /*
* Local Variables: * Disabled Local Variables:
* compile-command: "gcc -DTEST -DGPGRT_ENABLE_ES_MACROS -DHAVE_NPTH -DUSE_NPTH -Wall -I/usr/include/libusb-1.0 -I/usr/local/include -lusb-1.0 -g ccid-driver.c -lnpth -lgpg-error" * compile-command: "gcc -DTEST -DGPGRT_ENABLE_ES_MACROS -DHAVE_NPTH -DUSE_NPTH -Wall -I/usr/include/libusb-1.0 -I/usr/local/include -lusb-1.0 -g ccid-driver.c -lnpth -lgpg-error"
* End: * End:
*/ */