[svn] GnuPG - r4467 - in trunk: sm tools

[svn author wk]

Author: wk
Date: 2007-03-20 11:17:05 +0100 (Tue, 20 Mar 2007)
New Revision: 4467

Modified:
   trunk/sm/gpgsm.c
   trunk/tools/ChangeLog
   trunk/tools/gpgconf-comp.c
Log:
Make gpgconf aware of --p12-charset.

Modified: trunk/sm/gpgsm.c
===================================================================
--- trunk/sm/gpgsm.c	2007-03-20 10:00:55 UTC (rev 4466)
+++ trunk/sm/gpgsm.c	2007-03-20 10:17:05 UTC (rev 4467)
@@ -1439,6 +1439,8 @@
                 GC_OPT_FLAG_NONE );
         printf ("cipher-algo:%lu:\"3DES:\n",
                 GC_OPT_FLAG_DEFAULT );
+        printf ("p12-charset:%lu:\n",
+                GC_OPT_FLAG_DEFAULT );
 
       }
       break;

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2007-03-20 10:00:55 UTC (rev 4466)
+++ trunk/tools/ChangeLog	2007-03-20 10:17:05 UTC (rev 4467)
@@ -1,3 +1,7 @@
+2007-03-20  Werner Koch  <wk at g10code.com>
+
+	* gpgconf-comp.c (gc_options_gpgsm): Add p12-charset.
+
 2007-03-07  Werner Koch  <wk at g10code.com>
 
 	* applygnupgdefaults: New.

Modified: trunk/tools/gpgconf-comp.c
===================================================================
--- trunk/tools/gpgconf-comp.c	2007-03-20 10:00:55 UTC (rev 4466)
+++ trunk/tools/gpgconf-comp.c	2007-03-20 10:17:05 UTC (rev 4467)
@@ -665,6 +665,9 @@
    { "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,