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

wks: Make --add-revocs the default.

Browse Source 
* tools/gpg-wks-client.c (opt): New option --no-add-revocs.
(main): Make --add-revocs the default.

(command_send): Rename to ...
(command_create): to match the command name.
This commit is contained in:
Werner Koch 2023-06-21 11:34:58 +02:00
parent 2c7f7a5a27
commit 10c937ee68
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/wks.texi
View File

@ -216,12 +216,14 @@ addrspec, e.g. "postel@@isi.edu") per line. Empty lines and lines
starting with a '#' are ignored. starting with a '#' are ignored.
@item --add-revocs @item --add-revocs
@itemx --no-add-revocs
@opindex add-revocs @opindex add-revocs
@opindex no-add-revocs
If enabled append revocation certificates for the same addrspec as If enabled append revocation certificates for the same addrspec as
used in the WKD to the key. Modern gpg version are able to import and used in the WKD to the key. Modern gpg version are able to import and
apply them for existing keys. Note that when used with the apply them for existing keys. Note that when used with the
@option{--mirror} command the revocation are searched in the local @option{--mirror} command the revocation are searched in the local
keyring and not in an LDAP directory. keyring and not in an LDAP directory. The default is @option{--add-revocs}.
@item --verbose @item --verbose
@opindex verbose @opindex verbose

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

@ -77,6 +77,7 @@ enum cmd_and_opt_values
oBlacklist, oBlacklist,
oNoAutostart, oNoAutostart,
oAddRevocs, oAddRevocs,
oNoAddRevocs,
oDummy oDummy
}; };
@ -121,6 +122,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_s (oBlacklist, "blacklist", "@"), ARGPARSE_s_s (oBlacklist, "blacklist", "@"),
ARGPARSE_s_s (oDirectory, "directory", "@"), ARGPARSE_s_s (oDirectory, "directory", "@"),
ARGPARSE_s_n (oAddRevocs, "add-revocs", "add revocation certificates"), ARGPARSE_s_n (oAddRevocs, "add-revocs", "add revocation certificates"),
ARGPARSE_s_n (oNoAddRevocs, "no-add-revocs", "do not add revocation certificates"),
ARGPARSE_s_s (oFakeSubmissionAddr, "fake-submission-addr", "@"), ARGPARSE_s_s (oFakeSubmissionAddr, "fake-submission-addr", "@"),
@ -158,7 +160,7 @@ static gpg_error_t proc_userid_from_stdin (gpg_error_t (*func)(const char *),
const char *text); const char *text);
static gpg_error_t command_supported (char *userid); static gpg_error_t command_supported (char *userid);
static gpg_error_t command_check (char *userid); static gpg_error_t command_check (char *userid);
static gpg_error_t command_send (const char *fingerprint, const char *userid); static gpg_error_t command_create (const char *fingerprint, const char *userid);
static gpg_error_t encrypt_response (estream_t *r_output, estream_t input, static gpg_error_t encrypt_response (estream_t *r_output, estream_t input,
const char *addrspec, const char *addrspec,
const char *fingerprint); const char *fingerprint);
@ -262,6 +264,9 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
case oAddRevocs: case oAddRevocs:
opt.add_revocs = 1; opt.add_revocs = 1;
break; break;
case oNoAddRevocs:
opt.add_revocs = 0;
break;
case aSupported: case aSupported:
case aCreate: case aCreate:
@ -304,6 +309,8 @@ main (int argc, char **argv)
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);
opt.add_revocs = 1; /* Default add revocation certs. */
/* Parse the command line. */ /* Parse the command line. */
pargs.argc = &argc; pargs.argc = &argc;
pargs.argv = &argv; pargs.argv = &argv;
@ -397,7 +404,7 @@ main (int argc, char **argv)
case aCreate: case aCreate:
if (argc != 2) if (argc != 2)
wrong_args ("--create FINGERPRINT USER-ID"); wrong_args ("--create FINGERPRINT USER-ID");
err = command_send (argv[0], argv[1]); err = command_create (argv[0], argv[1]);
if (err) if (err)
log_error ("creating request failed: %s\n", gpg_strerror (err)); log_error ("creating request failed: %s\n", gpg_strerror (err));
break; break;
@ -1153,7 +1160,7 @@ command_check (char *userid)
/* Locate the key by fingerprint and userid and send a publication /* Locate the key by fingerprint and userid and send a publication
* request. */ * request. */
static gpg_error_t static gpg_error_t
command_send (const char *fingerprint, const char *userid) command_create (const char *fingerprint, const char *userid)
{ {
gpg_error_t err; gpg_error_t err;
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;