diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 2 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 84ee1a7c8..83692d461 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,7 @@ 2006-10-23 Werner Koch <[email protected]> + * gpg-agent.c (main): New command --gpgconf-test. + * minip12.c (parse_bag_encrypted_data, parse_bag_data): Allow for a salt of 20 bytes. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 60a7cffb4..5201be8d5 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -61,6 +61,7 @@ enum cmd_and_opt_values oNoVerbose = 500, aGPGConfList, + aGPGConfTest, oOptions, oDebug, oDebugAll, @@ -105,6 +106,7 @@ enum cmd_and_opt_values static ARGPARSE_OPTS opts[] = { { aGPGConfList, "gpgconf-list", 256, "@" }, + { aGPGConfTest, "gpgconf-test", 256, "@" }, { 301, NULL, 0, N_("@Options:\n ") }, @@ -620,6 +622,7 @@ main (int argc, char **argv ) switch (pargs.r_opt) { case aGPGConfList: gpgconf_list = 1; break; + case aGPGConfTest: gpgconf_list = 2; break; case oBatch: opt.batch=1; break; case oDebugWait: debug_wait = pargs.r.ret_int; break; @@ -719,6 +722,8 @@ main (int argc, char **argv ) log_debug ("... okay\n"); } + if (gpgconf_list == 2) + agent_exit (0); if (gpgconf_list) { char *filename; |