[svn] GnuPG - r4765 - trunk/sm

[svn author wk]

Author: wk
Date: 2008-05-20 10:00:40 +0200 (Tue, 20 May 2008)
New Revision: 4765

Modified:
   trunk/sm/ChangeLog
   trunk/sm/export.c
   trunk/sm/gpgsm.c
   trunk/sm/import.c
Log:
Fix --output option used when with --export-secret-kety-p12.


Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2008-05-19 22:46:41 UTC (rev 4764)
+++ trunk/sm/ChangeLog	2008-05-20 08:00:40 UTC (rev 4765)
@@ -1,3 +1,8 @@
+2008-05-20  Werner Koch  <wk at g10code.com>
+
+	* gpgsm.c (main) <aExportSecretKeyP12>: Pass FP and not stdout to
+	the export function.  Reported by Marc Mutz.
+
 2008-05-06  Werner Koch  <wk at g10code.com>
 
 	* keylist.c (list_external_keys): Ignore NOT FOUND error code.

Modified: trunk/sm/export.c
===================================================================
--- trunk/sm/export.c	2008-05-19 22:46:41 UTC (rev 4764)
+++ trunk/sm/export.c	2008-05-20 08:00:40 UTC (rev 4765)
@@ -369,7 +369,7 @@
       goto leave;
     }
 
-  /* Lookup the certificate an make sure that it is unique. */
+  /* Lookup the certificate and make sure that it is unique. */
   rc = keydb_search (hd, desc, 1);
   if (!rc)
     {

Modified: trunk/sm/gpgsm.c
===================================================================
--- trunk/sm/gpgsm.c	2008-05-19 22:46:41 UTC (rev 4764)
+++ trunk/sm/gpgsm.c	2008-05-20 08:00:40 UTC (rev 4765)
@@ -1808,7 +1808,7 @@
         FILE *fp = open_fwrite (opt.outfile?opt.outfile:"-");
 
         if (argc == 1)
-          gpgsm_p12_export (&ctrl, *argv, stdout);
+          gpgsm_p12_export (&ctrl, *argv, fp);
         else
           wrong_args ("--export-secret-key-p12 KEY-ID");
         if (fp != stdout)

Modified: trunk/sm/import.c
===================================================================
--- trunk/sm/import.c	2008-05-19 22:46:41 UTC (rev 4764)
+++ trunk/sm/import.c	2008-05-20 08:00:40 UTC (rev 4765)
@@ -652,7 +652,7 @@
     {
       /* We only write a plain error code and not direct
          BAD_PASSPHRASE because the pkcs12 parser might issue this
-         message multiple times, BAd_PASSPHRASE in general requires a
+         message multiple times, BAD_PASSPHRASE in general requires a
          keyID and parts of the import might actually succeed so that
          IMPORT_PROBLEM is also not appropriate. */
       gpgsm_status_with_err_code (ctrl, STATUS_ERROR,