1 Return-Path: <jrollins@finestructure.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 13648431FC3
\r
6 for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id yMudU-WPcgSA for <notmuch@notmuchmail.org>;
\r
16 Mon, 14 Apr 2014 12:40:52 -0700 (PDT)
\r
17 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 40010431FC0
\r
20 for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:52 -0700 (PDT)
\r
21 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by fire-doxen-postvirus (Postfix) with ESMTP id DE03A32824B
\r
23 for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:51 -0700 (PDT)
\r
24 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
25 Received: from finestructure.net (cpe-107-185-189-81.socal.res.rr.com
\r
26 [107.185.189.81]) (Authenticated sender: jrollins)
\r
27 by fire-doxen-submit (Postfix) with ESMTP id 98FE0328274
\r
28 for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:50 -0700 (PDT)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id 56CBC60123; Mon, 14 Apr 2014 12:40:50 -0700 (PDT)
\r
31 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
32 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
33 Subject: [PATCH] emacs: remove auto-signing of replies to signed messages
\r
34 Date: Mon, 14 Apr 2014 12:40:50 -0700
\r
35 Message-Id: <1397504450-15498-1-git-send-email-jrollins@finestructure.net>
\r
36 X-Mailer: git-send-email 1.9.1
\r
37 In-Reply-To: <87mwfnd9eh.fsf@tethera.net>
\r
38 References: <87mwfnd9eh.fsf@tethera.net>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Mon, 14 Apr 2014 19:40:56 -0000
\r
53 It was decided that auto-signing is potentially too troublesome for the
\r
54 apparently common case of users who enable crypto processing for the
\r
55 purpose of checking signature validity but who are not in a position to
\r
56 sign out-going messages. Users can still manually invoke signing as needed.
\r
58 Encrypting replies to encrypted messages is more of a security issue
\r
59 so we leave it in place.
\r
61 emacs/notmuch-mua.el | 7 +++----
\r
62 1 file changed, 3 insertions(+), 4 deletions(-)
\r
64 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
65 index bf6253f..95e4a4d 100644
\r
66 --- a/emacs/notmuch-mua.el
\r
67 +++ b/emacs/notmuch-mua.el
\r
68 @@ -116,10 +116,9 @@ list."
\r
69 notmuch-mua-hidden-headers))
\r
71 (defun notmuch-mua-reply-crypto (parts)
\r
72 + "Add mml sign-encrypt flag if any part of original message is encrypted."
\r
73 (loop for part in parts
\r
74 - if (notmuch-match-content-type (plist-get part :content-type) "multipart/signed")
\r
75 - do (mml-secure-message-sign)
\r
76 - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")
\r
77 + if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")
\r
78 do (mml-secure-message-sign-encrypt)
\r
79 else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
\r
80 do (notmuch-mua-reply-crypto (plist-get part :content))))
\r
81 @@ -236,7 +235,7 @@ list."
\r
82 ;; Quote the original message according to the user's configured style.
\r
83 (message-cite-original)))
\r
85 - ;; Sign and/or encrypt replies to signed and/or encrypted messages.
\r
86 + ;; Crypto processing based crypto content of the original message
\r
87 (when process-crypto
\r
88 (notmuch-mua-reply-crypto (plist-get original :body))))
\r