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.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index c3144523f3c196d142bb7ea5fad16e6fb49a70e9..0aca485bd7b2c334f9553d21a7a4413fe1a1ab2b 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 776ef0b0321073aa3f41c49c6599b1d0169111f1..887e9ef9aead62a20d091098d75a54f4c1363178 100644 (file)
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -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);