From: Marcus Brinkmann Date: Thu, 13 Dec 2001 22:12:06 +0000 (+0000) Subject: 2001-12-13 Marcus Brinkmann X-Git-Tag: gpgme-0-3-0~39 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77a72c0d5e8552f25bc70d0ddd2b7e84143fefc6;p=gpgme.git 2001-12-13 Marcus Brinkmann * 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 c314452..0aca485 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,10 @@ +2001-12-13 Marcus Brinkmann + + * 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 * engine-gpgsm.c (close_notify_handler): New function. diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 776ef0b..887e9ef 100644 --- 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);