aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/gpgconf-comp.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index c369506ae..d5f3c4d75 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-20 Werner Koch <[email protected]>
+
+ * gpgconf-comp.c (gc_options_gpgsm): Add p12-charset.
+
2007-03-07 Werner Koch <[email protected]>
* applygnupgdefaults: New.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 1eb6353fb..7bb92ebd9 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -665,6 +665,9 @@ static gc_option_t gc_options_gpgsm[] =
{ "prefer-system-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
"gnupg", "use system's dirmngr if available",
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
+ { "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+ "gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
{ "Debug",
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,