security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

wkd: Make use of --debug extprog.

Browse Source 
* tools/wks-util.c (debug_gpg_invocation): New.
(get_key_status_cb): Enable debug output.
(wks_get_key): Show gpg invocation.
(wks_list_key): Ditto.
(wks_filter_uid): Ditto.
This commit is contained in:
Werner Koch 2022-11-29 10:43:54 +01:00
parent edbe30c152
commit deac3e91eb
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/wks-util.c
View File

@ -150,6 +150,21 @@ free_uidinfo_list (uidinfo_list_t list)
} }
static void
debug_gpg_invocation (const char *func, const char **argv)
{
int i;
if (!(opt.debug & DBG_EXTPROG_VALUE))
return;
log_debug ("%s: exec '%s' with", func, opt.gpg_program);
for (i=0; argv[i]; i++)
log_printf (" '%s'", argv[i]);
log_printf ("\n");
}
struct get_key_status_parm_s struct get_key_status_parm_s
{ {
@ -164,7 +179,8 @@ get_key_status_cb (void *opaque, const char *keyword, char *args)
{ {
struct get_key_status_parm_s *parm = opaque; struct get_key_status_parm_s *parm = opaque;
/*log_debug ("%s: %s\n", keyword, args);*/ if (DBG_CRYPTO)
log_debug ("%s: %s\n", keyword, args);
if (!strcmp (keyword, "EXPORTED")) if (!strcmp (keyword, "EXPORTED"))
{ {
parm->count++; parm->count++;
@ -239,6 +255,7 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
goto leave; goto leave;
} }
parm.fpr = fingerprint; parm.fpr = fingerprint;
debug_gpg_invocation (__func__, argv);
err = gnupg_exec_tool_stream (opt.gpg_program, argv, NULL, err = gnupg_exec_tool_stream (opt.gpg_program, argv, NULL,
NULL, key, NULL, key,
get_key_status_cb, &parm); get_key_status_cb, &parm);
@ -332,6 +349,7 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto leave; goto leave;
} }
debug_gpg_invocation (__func__, argv);
err = gnupg_exec_tool_stream (opt.gpg_program, argv, key, err = gnupg_exec_tool_stream (opt.gpg_program, argv, key,
NULL, listing, NULL, listing,
key_status_cb, NULL); key_status_cb, NULL);
@ -510,6 +528,7 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid,
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto leave; goto leave;
} }
debug_gpg_invocation (__func__, argv);
err = gnupg_exec_tool_stream (opt.gpg_program, argv, key, err = gnupg_exec_tool_stream (opt.gpg_program, argv, key,
NULL, newkey, NULL, newkey,
key_status_cb, NULL); key_status_cb, NULL);