51 lines
1.7 KiB
Plaintext
51 lines
1.7 KiB
Plaintext
---
|
|
globals.h | 2 ++
|
|
init.h | 12 ++++++++++++
|
|
ncrypt/pgp.c | 3 ++-
|
|
3 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
--- globals.h
|
|
+++ globals.h 2017-09-11 12:01:55.090752808 +0000
|
|
@@ -292,6 +292,8 @@ WHERE struct Regex PgpDecryptionOkay;
|
|
WHERE char *PgpSignAs;
|
|
WHERE short PgpTimeout;
|
|
WHERE char *PgpEntryFormat;
|
|
+WHERE char *PgpMimeSignatureFilename;
|
|
+WHERE char *PgpMimeSignatureDescription;
|
|
WHERE char *PgpClearSignCommand;
|
|
WHERE char *PgpDecodeCommand;
|
|
WHERE char *PgpVerifyCommand;
|
|
--- init.h
|
|
+++ init.h 2017-09-11 12:03:41.660816163 +0000
|
|
@@ -3466,6 +3466,18 @@ struct Option MuttVars[] = {
|
|
** a line quoted text if it also matches $$smileys. This mostly
|
|
** happens at the beginning of a line.
|
|
*/
|
|
+ { "pgp_mime_signature_filename", DT_STRING, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
|
|
+ /*
|
|
+ ** .pp
|
|
+ ** This option sets the filename used for signature parts in PGP/MIME
|
|
+ ** signed messages.
|
|
+ */
|
|
+ { "pgp_mime_signature_description", DT_STRING, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
|
|
+ /*
|
|
+ ** .pp
|
|
+ ** This option sets the Content-Description used for signature parts in
|
|
+ ** PGP/MIME signed messages.
|
|
+ */
|
|
{ "smime_ask_cert_label", DT_BOOL, R_NONE, OPT_SMIME_ASK_CERT_LABEL, 1 },
|
|
/*
|
|
** .pp
|
|
--- ncrypt/pgp.c
|
|
+++ ncrypt/pgp.c 2017-09-11 12:01:55.090752808 +0000
|
|
@@ -1208,7 +1208,8 @@ struct Body *pgp_sign_message(struct Bod
|
|
t->disposition = DISPNONE;
|
|
t->encoding = ENC7BIT;
|
|
t->unlink = true; /* ok to remove this file after sending. */
|
|
- mutt_set_parameter("name", "signature.asc", &t->parameter);
|
|
+ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
|
|
+ t->description = safe_strdup (PgpMimeSignatureDescription);
|
|
|
|
return a;
|
|
}
|