aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-11-23 19:18:04 +0000
committerWerner Koch <[email protected]>2009-11-23 19:18:04 +0000
commitcf2ec5673f02ddf3a4910ec47b476351dd68c243 (patch)
tree4e59734e24208f5d90dcc96f9d98c822860fbbc7 /tools
parentChange fallback keysize to 2048 (diff)
downloadgnupg-cf2ec5673f02ddf3a4910ec47b476351dd68c243.tar.gz
gnupg-cf2ec5673f02ddf3a4910ec47b476351dd68c243.zip
Add gpgconf related dummy options default_pubkey_algo.
Add option --skip-hidden-recipients Comment updates.
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/gpgconf-comp.c11
2 files changed, 15 insertions, 0 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 5ce91bd6c..eaa60bb99 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-23 Werner Koch <[email protected]>
+
+ * gpgconf-comp.c (gc_options_gpg): Add default_pubkey_algo.
+
2009-11-05 Marcus Brinkmann <[email protected]>
* gpg-connect-agent.c (start_agent): Update use of
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 7ba526f69..f8de9d650 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -667,6 +667,11 @@ static gc_option_t gc_options_gpg[] =
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
"gnupg", "|FILE|read options from FILE",
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },
+ { "default_pubkey_algo",
+ (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
+ NULL, NULL,
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+
{ "Debug",
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
@@ -695,6 +700,8 @@ static gc_option_t gc_options_gpg[] =
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+
+
GC_OPTION_NULL
};
@@ -744,6 +751,10 @@ static gc_option_t gc_options_gpgsm[] =
{ "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
"gnupg", N_("|SPEC|use this keyserver to lookup keys"),
GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_GPGSM },
+ { "default_pubkey_algo",
+ (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
+ NULL, NULL,
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
{ "Debug",
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,