Make gpgconf aware of --p12-charset.
authorWerner Koch <wk@gnupg.org>
Tue, 20 Mar 2007 10:17:05 +0000 (10:17 +0000)
committerWerner Koch <wk@gnupg.org>
Tue, 20 Mar 2007 10:17:05 +0000 (10:17 +0000)
sm/gpgsm.c
tools/ChangeLog
tools/gpgconf-comp.c

index 9abd063..263632c 100644 (file)
@@ -1439,6 +1439,8 @@ main ( int argc, char **argv)
                 GC_OPT_FLAG_NONE );
         printf ("cipher-algo:%lu:\"3DES:\n",
                 GC_OPT_FLAG_DEFAULT );
+        printf ("p12-charset:%lu:\n",
+                GC_OPT_FLAG_DEFAULT );
 
       }
       break;
index c369506..d5f3c4d 100644 (file)
@@ -1,3 +1,7 @@
+2007-03-20  Werner Koch  <wk@g10code.com>
+
+       * gpgconf-comp.c (gc_options_gpgsm): Add p12-charset.
+
 2007-03-07  Werner Koch  <wk@g10code.com>
 
        * applygnupgdefaults: New.
index 1eb6353..7bb92eb 100644 (file)
@@ -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,