security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Print passphrase encoding info only in PEM mode.

This commit is contained in:
Werner Koch 2007-05-29 20:11:17 +00:00
parent bc078f97a9
commit c2b08ff908
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,6 +1,8 @@
Noteworthy changes in version 2.0.5 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) Noteworthy changes in version 2.0.4 (2007-05-09)
------------------------------------------------ ------------------------------------------------

5
sm/ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-29 Werner Koch <wk@g10code.com>
* export.c (gpgsm_p12_export): Print passphrase encoding info only
in PEM mode.
2007-05-18 Marcus Brinkmann <marcus@g10code.de> 2007-05-18 Marcus Brinkmann <marcus@g10code.de>
* qualified.c (gpgsm_qualified_consent, * qualified.c (gpgsm_qualified_consent,

2
sm/export.c
View File

@ -416,7 +416,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, FILE *fp)
putc ('\n', fp); putc ('\n', fp);
} }
if (opt.p12_charset) if (opt.p12_charset && ctrl->create_pem)
{ {
fprintf (fp, "The passphrase is %s encoded.\n\n", fprintf (fp, "The passphrase is %s encoded.\n\n",
opt.p12_charset); opt.p12_charset);