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

gpg: Add option '--disable-dirmngr'.

Browse Source 
* doc/gpg.texi: Document new option.
* g10/call-dirmngr.c (create_context): Fail if option is given.
* g10/gpg.c (cmd_and_opt_values): New value.
(opts): New option.
(gpgconf_list): Add new option.
(main): Handle new option.
* g10/options.h (struct opt): New field 'disable_dirmngr'.
* tools/gpgconf-comp.c (gc_options_gpg): New option.

GnuPG-bug-id: 3334
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-08-08 11:43:22 +02:00
parent 81074c3b02
commit c4506f624e
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/gpg.texi
View File

@ -1976,6 +1976,9 @@ file name.
Specify a dirmngr program to be used for keyserver access. The Specify a dirmngr program to be used for keyserver access. The
default value is @file{@value{BINDIR}/dirmngr}. default value is @file{@value{BINDIR}/dirmngr}.
@item --disable-dirmngr
Entirely disable the use of the Dirmngr.
@item --no-autostart @item --no-autostart
@opindex no-autostart @opindex no-autostart
Do not start the gpg-agent or the dirmngr if it has not yet been Do not start the gpg-agent or the dirmngr if it has not yet been

4
g10/call-dirmngr.c
View File

@ -184,6 +184,10 @@ create_context (ctrl_t ctrl, assuan_context_t *r_ctx)
assuan_context_t ctx; assuan_context_t ctx;
*r_ctx = NULL; *r_ctx = NULL;
if (opt.disable_dirmngr)
return gpg_error (GPG_ERR_NO_DIRMNGR);
err = start_new_dirmngr (&ctx, err = start_new_dirmngr (&ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
opt.dirmngr_program, opt.dirmngr_program,

4
g10/gpg.c
View File

@ -374,6 +374,7 @@ enum cmd_and_opt_values
oPersonalCompressPreferences, oPersonalCompressPreferences,
oAgentProgram, oAgentProgram,
oDirmngrProgram, oDirmngrProgram,
oDisableDirmngr,
oDisplay, oDisplay,
oTTYname, oTTYname,
oTTYtype, oTTYtype,
@ -837,6 +838,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"), ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"), ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
ARGPARSE_s_s (oDisplay, "display", "@"), ARGPARSE_s_s (oDisplay, "display", "@"),
ARGPARSE_s_s (oTTYname, "ttyname", "@"), ARGPARSE_s_s (oTTYname, "ttyname", "@"),
ARGPARSE_s_s (oTTYtype, "ttytype", "@"), ARGPARSE_s_s (oTTYtype, "ttytype", "@"),
@ -1857,6 +1859,7 @@ gpgconf_list (const char *configfile)
es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg"); es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE); es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE);
es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE); es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE);
es_printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
/* The next one is an info only item and should match the macros at /* The next one is an info only item and should match the macros at
the top of keygen.c */ the top of keygen.c */
@ -3388,6 +3391,7 @@ main (int argc, char **argv)
break; break;
case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; case oAgentProgram: opt.agent_program = pargs.r.ret_str; break;
case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break; case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break;
case oDisableDirmngr: opt.disable_dirmngr = 1; break;
case oWeakDigest: case oWeakDigest:
additional_weak_digest(pargs.r.ret_str); additional_weak_digest(pargs.r.ret_str);
break; break;

1
g10/options.h
View File

@ -121,6 +121,7 @@ struct
int max_cert_depth; int max_cert_depth;
const char *agent_program; const char *agent_program;
const char *dirmngr_program; const char *dirmngr_program;
int disable_dirmngr;
const char *def_new_key_algo; const char *def_new_key_algo;

3
tools/gpgconf-comp.c
View File

@ -759,6 +759,9 @@ static gc_option_t gc_options_gpg[] =
NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
{ "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
{ "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
"gnupg", N_("disable all access to the dirmngr"),
GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
GC_OPTION_NULL GC_OPTION_NULL