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

wkd: New command --print-wkd-url for gpg-wks-client.

Browse source 
* tools/gpg-wks-client.c (aPrintWKDURL): New.
(opts): Add option.
(main): Implement.
* tools/wks-util.c (wks_cmd_print_wkd_url): New.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-03-25 15:13:59 +01:00
parent 2fc9a51751
commit 70c97a862a
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/gpg-wks-client.c
View file

@ -62,6 +62,7 @@ enum cmd_and_opt_values
aInstallKey,
aRemoveKey,
aPrintWKDHash,
aPrintWKDURL,
oGpgProgram,
oSend,
@ -93,6 +94,8 @@ static ARGPARSE_OPTS opts[] = {
"remove a key from a directory"),
ARGPARSE_c (aPrintWKDHash, "print-wkd-hash",
"Print the WKD identifier for the given user ids"),
ARGPARSE_c (aPrintWKDURL, "print-wkd-url",
"Print the WKD URL for the given user id"),
ARGPARSE_group (301, ("@\nOptions:\n ")),
@ -236,6 +239,7 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
case aInstallKey:
case aRemoveKey:
case aPrintWKDHash:
case aPrintWKDURL:
cmd = pargs->r_opt;
break;
@ -384,13 +388,24 @@ main (int argc, char **argv)
break;
case aPrintWKDHash:
case aPrintWKDURL:
if (!argc)
err = proc_userid_from_stdin (wks_cmd_print_wkd_hash, "printing hash");
{
if (cmd == aPrintWKDHash)
err = proc_userid_from_stdin (wks_cmd_print_wkd_hash,
"printing WKD hash");
else
err = proc_userid_from_stdin (wks_cmd_print_wkd_url,
"printing WKD URL");
}
else
{
for (err = delayed_err = 0; !err && argc; argc--, argv++)
{
err = wks_cmd_print_wkd_hash (*argv);
if (cmd == aPrintWKDHash)
err = wks_cmd_print_wkd_hash (*argv);
else
err = wks_cmd_print_wkd_url (*argv);
if (gpg_err_code (err) == GPG_ERR_INV_USER_ID)
{
/* Diagnostic already printed. */