[svn] GnuPG - r4507 - in trunk: . sm

[svn author wk]

Author: wk
Date: 2007-05-29 22:11:17 +0200 (Tue, 29 May 2007)
New Revision: 4507

Modified:
   trunk/NEWS
   trunk/sm/ChangeLog
   trunk/sm/export.c
Log:
Print passphrase encoding info only in PEM mode.


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-05-18 23:32:51 UTC (rev 4506)
+++ trunk/NEWS	2007-05-29 20:11:17 UTC (rev 4507)
@@ -1,7 +1,9 @@
 Noteworthy changes in version 2.0.5
 ------------------------------------------------
 
+ * Fixed bug when using the --p12-charset without --armor.
 
+
 Noteworthy changes in version 2.0.4 (2007-05-09)
 ------------------------------------------------
 

Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2007-05-18 23:32:51 UTC (rev 4506)
+++ trunk/sm/ChangeLog	2007-05-29 20:11:17 UTC (rev 4507)
@@ -1,3 +1,8 @@
+2007-05-29  Werner Koch  <wk at g10code.com>
+
+	* export.c (gpgsm_p12_export): Print passphrase encoding info only
+	in PEM mode.
+
 2007-05-18  Marcus Brinkmann  <marcus at g10code.de>
 
 	* qualified.c (gpgsm_qualified_consent,

Modified: trunk/sm/export.c
===================================================================
--- trunk/sm/export.c	2007-05-18 23:32:51 UTC (rev 4506)
+++ trunk/sm/export.c	2007-05-29 20:11:17 UTC (rev 4507)
@@ -416,7 +416,7 @@
       putc ('\n', fp);
     }
 
-  if (opt.p12_charset)
+  if (opt.p12_charset && ctrl->create_pem)
     {
       fprintf (fp, "The passphrase is %s encoded.\n\n",
                opt.p12_charset);