security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg-mail-tube: Support templates.

Browse source 
* tools/gpg-mail-tube.c: Include i18n.h.
(main): Call i18n.h
(only_ascii): New.
(mail_tube_encrypt): Use a template or fallback to the old version.

* doc/mail-tube.txt, doc/mail-tube.de.txt: Two standard templates.
* doc/Makefile.am (helpfiles): Add them.
--

GnuPG-bug-id: 7381
This commit is contained in:
Werner Koch 2025-05-30 14:55:12 +02:00
parent 61514f7cd8
commit 982f45c8c7
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
5 changed files with 128 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tools/gpg-mail-tube.c
View file

@ -37,6 +37,7 @@
#include "../common/ccparray.h"
#include "../common/mbox-util.h"
#include "../common/zb32.h"
#include "../common/i18n.h"
#include "rfc822parse.h"
#include "mime-maker.h"
@ -256,6 +257,7 @@ main (int argc, char **argv)
log_set_prefix ("gpg-mail-tube", GPGRT_LOG_WITH_PREFIX);
/* Make sure that our subsystems are ready. */
i18n_init(); /* Required for gnupg_get_template. */
init_common_subsystems (&argc, &argv);
/* Parse the command line. */
@ -369,6 +371,18 @@ main (int argc, char **argv)
}
/* Return true if TSRING has only ascii chacrterst or is NULL. */
static int
only_ascii (const char *string)
{
if (string)
for ( ; *string; string++)
if ((*string & 0x80))
return 0;
return 1;
}
/* This function is called by the mail parser to communicate events.
* This callback communicates with the main function using a structure
* passed in OPAQUE. Should return 0 or set errno and return -1. */
@ -549,20 +563,46 @@ 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. */
char *templ, *tmpstr;
const char *charset = "us-ascii";
const char *ctencode = "";
templ = gnupg_get_template ("mail-tube",
ct_is_text? "encrypted-file-attached"
: "encrypted-mail-attached",
(GET_TEMPLATE_SUBST_ENVVARS
| GET_TEMPLATE_CRLF));
if (templ && !only_ascii (templ))
{
charset = "utf-8";
ctencode = "Content-Transfer-Encoding: quoted-printable\r\n";
tmpstr = mime_maker_qp_encode (templ);
if (!tmpstr)
{
log_error ("QP encoding failed: %s\n",
gpg_strerror (gpg_error_from_syserror ()));
exit (1);
}
xfree (templ);
templ = tmpstr;
}
es_fprintf (es_stdout,
"\r\n"
"\r\n"
"--=-=mt-%s=-=\r\n"
"Content-Type: text/plain; charset=us-ascii\r\n"
"Content-Type: text/plain; charset=%s\r\n"
"%s"
"Content-Disposition: inline\r\n"
"\r\n"
"Please find attached an encrypted %s.\r\n"
"%s"
"\r\n"
"--=-=mt-%s=-=\r\n",
boundary,
ct_is_text? "file":"message",
charset, ctencode,
templ? templ
: "Please find attached an encrypted file/mail.\r\n",
boundary);
xfree (templ);
if (ct_is_text)
es_fprintf (es_stdout,
"Content-Type: text/plain; charset=us-ascii\r\n"