1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From: Antonio Radici <antonio@debian.org>
Date: Thu, 27 Feb 2014 14:45:01 +0100
Subject: patch-1.5.4.vk.pgp_verbose_mime
Enable pgp_mime_signature_filename and
pgp_mime_signature_description.
Gbp-Pq: Topic features-old
---
globals.h | 2 ++
init.h | 12 ++++++++++++
pgp.c | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/globals.h b/globals.h
index 6a1b8da..282fde3 100644
--- a/globals.h
+++ b/globals.h
@@ -247,6 +247,8 @@ WHERE char *PgpVerifyKeyCommand;
WHERE char *PgpListSecringCommand;
WHERE char *PgpListPubringCommand;
WHERE char *PgpGetkeysCommand;
+WHERE char *PgpMimeSignatureFilename;
+WHERE char *PgpMimeSignatureDescription;
/*-- formerly in smime.h --*/
WHERE char *SmimeDefaultKey;
diff --git a/init.h b/init.h
index 1fba2f2..e3bcc89 100644
--- a/init.h
+++ b/init.h
@@ -2657,6 +2657,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/
+ { "pgp_mime_signature_filename", DT_STR, 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_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
+ /*
+ ** .pp
+ ** This option sets the Content-Description used for signature parts in
+ ** PGP/MIME signed messages.
+ */
diff --git a/pgp.c b/pgp.c
index 9c03db7..497ff06 100644
--- a/pgp.c
+++ b/pgp.c
@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = 1; /* 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);
}
|