diff options
author | Werner Koch <[email protected]> | 2024-11-12 11:04:02 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2024-11-12 13:01:27 +0000 |
commit | c8a7e8d2532f4059e00a6393f95d5fe7ce3c12a0 (patch) | |
tree | dd7fbe213fc49ef6f7b70d7c109e4e721769895b | |
parent | scd: Clean up app_send_active_apps and app_send_card_list. (diff) | |
download | gnupg-c8a7e8d2532f4059e00a6393f95d5fe7ce3c12a0.tar.gz gnupg-c8a7e8d2532f4059e00a6393f95d5fe7ce3c12a0.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 b9b23b7da..c04ba71f8 100644 --- a/tools/gpg-mail-tube.c +++ b/tools/gpg-mail-tube.c @@ -532,6 +532,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" @@ -553,12 +554,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" |