summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-07-17 20:11:24 +0200
committerWerner Koch <wk@gnupg.org>2007-07-17 20:11:24 +0200
commit11573b09c4a00c94107edd40ec84c7de4008151e (patch)
treec98e84d1c790a82ec0e94be1b7d86f7cbb24981f /tools
parent2007-07-16 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-11573b09c4a00c94107edd40ec84c7de4008151e.tar.xz
gnupg2-11573b09c4a00c94107edd40ec84c7de4008151e.zip
Typo fixes.
Made --default-key work for gpgsm Add --default-key and --encrypt-to to gpgconf.
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog5
-rw-r--r--tools/gpgconf-comp.c12
2 files changed, 17 insertions, 0 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 2afcf51b7..c5acee5da 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-17 Werner Koch <wk@g10code.com>
+
+ * gpgconf-comp.c: Add --encrypt-to and --default-key to gpg and
+ gpgsm.
+
2007-07-16 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Bail out if write fails.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index ba147ad48..ae2902b94 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -616,6 +616,12 @@ static gc_option_t gc_options_gpg[] =
{ "Configuration",
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
"gnupg", N_("Options controlling the configuration") },
+ { "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+ "gnupg", N_("|NAME|use NAME as default secret key"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+ { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+ "gnupg", N_("|NAME|encrypt to user ID NAME as well"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
"gnupg", "|FILE|read options from FILE",
GC_ARG_TYPE_PATHNAME, GC_BACKEND_GPG },
@@ -672,6 +678,12 @@ static gc_option_t gc_options_gpgsm[] =
{ "Configuration",
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
"gnupg", N_("Options controlling the configuration") },
+ { "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+ "gnupg", N_("|NAME|use NAME as default secret key"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
+ { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+ "gnupg", N_("|NAME|encrypt to user ID NAME as well"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
"gnupg", "|FILE|read options from FILE",
GC_ARG_TYPE_PATHNAME, GC_BACKEND_GPGSM },