From 581b5c4c25be936f3a6f4733c4a4a18c737e86a3 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Sun, 3 Apr 2016 19:40:23 +0100 Subject: [PATCH] [PATCH v1] emacs: Decrypt non-text/plain parts during reply generation. --- 5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad | 105 ++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad diff --git a/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad b/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad new file mode 100644 index 000000000..8c123de1f --- /dev/null +++ b/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad @@ -0,0 +1,105 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 316136DE01C2 + for ; Sun, 3 Apr 2016 11:40:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.17 +X-Spam-Level: +X-Spam-Status: No, score=-0.17 tagged_above=-999 required=5 tests=[AWL=-0.103, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, + UNPARSEABLE_RELAY=0.001] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 0NJw8T4s2p9z for ; + Sun, 3 Apr 2016 11:40:28 -0700 (PDT) +Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com + [209.85.215.65]) + by arlo.cworth.org (Postfix) with ESMTPS id A4FF06DE0159 + for ; Sun, 3 Apr 2016 11:40:27 -0700 (PDT) +Received: by mail-lf0-f65.google.com with SMTP id c62so19536106lfc.2 + for ; Sun, 03 Apr 2016 11:40:27 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=dme-org.20150623.gappssmtp.com; s=20150623; + h=from:to:subject:date:message-id; + bh=DXjpIUP75UvJO6u1ldprwaW+6tY8wlODFcRLSIt1EFk=; + b=cydRT5PYtQA6gTJQjJiyyUpQ5K5xz1x7/7yEzpT1Qt2eGhi7WJVvZkOMKiqQf6OYB1 + yqq0yicwXO3ZSIa2gEASTx8NSlupkihZQu8r/ekd/Q8WQukjLkrPfgeqgPU0yW6geD+3 + 9hxXKA/1hQvy/ktf2QtFRXfEQC7zmuty4tVuctMF8xfoX5wf93tM38kKhJKpaY/lC35J + t0RuNl39Qd/sd5xiNxkjVGfZX3pIsiwtrwJrrazHy5b3d0SdOhjT0AkXDIJTs6O9Bwto + XISgce0Iqv9BoTngOLStqSKL/BrSSFxGMq1k0raa5GsGzDKh5ck5vBfaRaYH9/Lp81KS + d2eg== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id; + bh=DXjpIUP75UvJO6u1ldprwaW+6tY8wlODFcRLSIt1EFk=; + b=k9WKQowyX2qmF8lRLlQrUOPFR5AG1+eI5IFCP4AHWefkiltKfd6o4r7dt6PTsoohjO + V+ZYbEBVU43n0b2kK1eTYymQPQtaNJHi1gkGVD4Uw+h1hEOSf/de/+y+2jE7p0Oj5O8J + yRfLSJDQwkexB1T4vO4kU33LQ17NACXw1q0x6aizcccRxXya1knInbKFzyAOGh7E3CYA + lueoIqcMTwUtw7V6pbT9rGa3+Y0VzJ7K6IT4q8VleIgi6ZUdCT1JIqMc3yKeP9o8clZh + qMEZLgm/M8if7IoT7mgXsU4SW+rv6eYg6E8khvEPgwA/l9JZuvJcrsTSwCPyUJoae4RN + GMPQ== +X-Gm-Message-State: + AD7BkJI7ms2t8kJqrIFZWA0gaeK/i+0WijuDQBqJKRE+oIuLclwqP/cMzgtp1kRQUZfB2w== +X-Received: by 10.194.157.65 with SMTP id wk1mr496816wjb.83.1459708825488; + Sun, 03 Apr 2016 11:40:25 -0700 (PDT) +Received: from disaster-area.hh.sledj.net + ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) + by smtp.gmail.com with ESMTPSA id kj9sm25104388wjb.14.2016.04.03.11.40.24 + for + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 03 Apr 2016 11:40:24 -0700 (PDT) +Received: from localhost (disaster-area.hh.sledj.net [local]) + by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 119113cd + for ; Sun, 3 Apr 2016 18:40:23 +0000 (UTC) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v1] emacs: Decrypt non-text/plain parts during reply + generation. +Date: Sun, 3 Apr 2016 19:40:23 +0100 +Message-Id: <1459708823-1852-1-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.1.4 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 03 Apr 2016 18:40:36 -0000 + +If a user replies to a message which contains encrypted parts other than +text/plain, ensure that the parts are decrypted when generating the +cited text of the reply. +--- + emacs/notmuch-mua.el | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index cfdac0e..9bd3c82 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -248,7 +248,11 @@ mutiple parts get a header." + ;; Don't omit long parts. + (notmuch-show-max-text-part-size 0) + ;; Insert headers for parts as appropriate for replying. +- (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)) ++ (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function) ++ ;; Ensure that any encrypted parts are ++ ;; decrypted during the generation of the reply ++ ;; text. ++ (notmuch-show-process-crypto process-crypto)) + (notmuch-show-insert-body original (plist-get original :body) 0) + (buffer-substring-no-properties (point-min) (point-max))))) + +-- +2.1.4 + -- 2.26.2