diff options
| author | Werner Koch <wk@gnupg.org> | 2007-05-29 22:11:17 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-05-29 22:11:17 +0200 |
| commit | c2b08ff90821b5acc10d1ffb218b4a960200e5d3 (patch) | |
| tree | 3248608cb5e0a4922b49d4437ad527b93d50c322 | |
| parent | 2007-05-19 Marcus Brinkmann <marcus@g10code.de> (diff) | |
| download | gnupg2-c2b08ff90821b5acc10d1ffb218b4a960200e5d3.tar.xz gnupg2-c2b08ff90821b5acc10d1ffb218b4a960200e5d3.zip | |
Print passphrase encoding info only in PEM mode.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sm/ChangeLog | 5 | ||||
| -rw-r--r-- | sm/export.c | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,6 +1,8 @@ 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) ------------------------------------------------ diff --git a/sm/ChangeLog b/sm/ChangeLog index d4af923a2..ddd392280 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -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> * qualified.c (gpgsm_qualified_consent, diff --git a/sm/export.c b/sm/export.c index ec8a764c3..93b74bf7b 100644 --- a/sm/export.c +++ b/sm/export.c @@ -416,7 +416,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, FILE *fp) 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); |