diff options
| author | Werner Koch <wk@gnupg.org> | 2024-11-12 12:04:02 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2024-11-12 12:07:24 +0100 |
| commit | 813bd4f3d258ac3f32382070dd2370ba4cd19d55 (patch) | |
| tree | ddea693ddf14fa2dc462aec70549855a57517eea | |
| parent | scd: Clean up app_send_active_apps and app_send_card_list. (diff) | |
| download | gnupg2-813bd4f3d258ac3f32382070dd2370ba4cd19d55.tar.xz gnupg2-813bd4f3d258ac3f32382070dd2370ba4cd19d55.zip | |
gpg-mail-tube: Fix content type for an attached non-plaintext.
* tools/gpg-mail-tube.c (mail_tube_encrypt): Fix content type for an
attached message.
--
We can't use message/rfc822 if we encrypt this message as a simple PGP
file.
| -rw-r--r-- | tools/gpg-mail-tube.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/gpg-mail-tube.c b/tools/gpg-mail-tube.c index ec32d3f43..0133e9d81 100644 --- a/tools/gpg-mail-tube.c +++ b/tools/gpg-mail-tube.c @@ -549,6 +549,7 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients) /* Output the plain or PGP/MIME boilerplate. */ if (opt.as_attach) { + /* FIXME: Need to have a configurable message here. */ es_fprintf (es_stdout, "\r\n" "\r\n" @@ -570,12 +571,12 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients) "\r\n", "pgp-encrypted-file.txt.asc"); else es_fprintf (es_stdout, - "Content-Type: message/rfc822\r\n" + "Content-Type: text/plain; charset=us-ascii\r\n" "Content-Description: PGP encrypted message\r\n" "Content-Disposition: attachment; filename=\"%s\"\r\n" "\r\n", "pgp-encrypted-msg.eml.asc"); } - else + else /* PGP/MIME */ es_fprintf (es_stdout, "\r\n" "\r\n" |