2001-12-13 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 13 Dec 2001 22:12:06 +0000 (22:12 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 13 Dec 2001 22:12:06 +0000 (22:12 +0000)
* engine-gpgsm.c (_gpgme_gpgsm_op_encrypt): Do not add `armor'
option to `ENCRYPT'.
* engine-gpgsm.c (gpgsm_set_recipients): Free LINE when returning
successfully.

gpgme/ChangeLog
gpgme/engine-gpgsm.c

index c314452..0aca485 100644 (file)
@@ -1,5 +1,12 @@
 2001-12-13  Marcus Brinkmann  <marcus@g10code.de>
 
+       * engine-gpgsm.c (_gpgme_gpgsm_op_encrypt): Do not add `armor'
+       option to `ENCRYPT'.
+       * engine-gpgsm.c (gpgsm_set_recipients): Free LINE when returning
+       successfully.
+
+2001-12-13  Marcus Brinkmann  <marcus@g10code.de>
+
        * engine-gpgsm.c (close_notify_handler): New function.
        (_gpgme_gpgsm_new): Manage the file descriptors a
        bit differently.  Do not set close-on-exec flags.
index 776ef0b..887e9ef 100644 (file)
@@ -335,6 +335,7 @@ gpgsm_set_recipients (ASSUAN_CONTEXT ctx, GpgmeRecipients recp)
          return err;
        }
     }
+  xfree (line);
   return 0;
 }
 
@@ -347,7 +348,7 @@ _gpgme_gpgsm_op_encrypt (GpgsmObject gpgsm, GpgmeRecipients recp,
   if (!gpgsm)
     return mk_error (Invalid_Value);
 
-  gpgsm->command = xtrystrdup (use_armor ? "ENCRYPT armor" : "ENCRYPT");
+  gpgsm->command = xtrystrdup ("ENCRYPT");
   if (!gpgsm->command)
     return mk_error (Out_Of_Core);