aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gpgme/ChangeLog7
-rw-r--r--gpgme/engine-gpgsm.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index c3144523..0aca485b 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,12 @@
2001-12-13 Marcus Brinkmann <[email protected]>
+ * 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 <[email protected]>
+
* 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.
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 776ef0b0..887e9ef9 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);