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: Silence gpg-wks-client diagnostics from gpg.

Browse Source 
* tools/gpg-wks-client.c (add_user_id): PAss --quiet to gpg unless we
are running in double verbose mode.
(decrypt_stream): Ditto
(encrypt_response): Ditto.
(mirror_one_keys_userid): Ditto.
* tools/wks-util.c (wks_get_key): Ditto.
(wks_list_key): Ditto.
(wks_filter_uid): Ditto.

(cherry picked from commit 4364283f757fceab454d48d461a9f88c31247a07)
This commit is contained in:
Werner Koch 2022-10-07 15:01:02 +02:00
parent a946343f14
commit b18b9b972e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gpg-wks-client.c
View File

@ -532,9 +532,9 @@ add_user_id (const char *fingerprint, const char *uid)
ccparray_init (&ccp, 0);
ccparray_put (&ccp, "--no-options");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--always-trust");
@ -621,9 +621,9 @@ decrypt_stream (estream_t *r_output, struct decrypt_stream_parm_s *decinfo,
* tricks. A regular client will anyway only send a minimal key;
* that is one w/o key signatures and attribute packets. */
ccparray_put (&ccp, "--max-output=0x10000");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--status-fd=2");
@ -1269,9 +1269,9 @@ encrypt_response (estream_t *r_output, estream_t input, const char *addrspec,
ccparray_init (&ccp, 0);
ccparray_put (&ccp, "--no-options");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--status-fd=2");
@ -1692,7 +1692,7 @@ mirror_one_keys_userid (estream_t key, const char *mbox, uidinfo_list_t uidlist,
}
err = wks_install_key_core (newkey? newkey : key, mbox);
if (!opt.quiet)
if (opt.verbose)
log_info ("key %s published for '%s'\n", fpr, mbox);
mirror_one_key_parm.nuids++;
if (!opt.quiet && !(mirror_one_key_parm.nuids % 25))

12
tools/wks-util.c
View File

@ -216,9 +216,9 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
ccparray_init (&ccp, 0);
ccparray_put (&ccp, "--no-options");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--status-fd=2");
@ -313,9 +313,9 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
ccparray_init (&ccp, 0);
ccparray_put (&ccp, "--no-options");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--status-fd=2");
@ -489,9 +489,9 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid,
ccparray_init (&ccp, 0);
ccparray_put (&ccp, "--no-options");
if (!opt.verbose)
if (opt.verbose < 2)
ccparray_put (&ccp, "--quiet");
else if (opt.verbose > 1)
else
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--batch");
ccparray_put (&ccp, "--status-fd=2");