Re: [PATCH 2/2] cli: mime node: abstract decryption and signature verification

diff --git a/47/c894d66c51335e91cca4e2f24429c933423842 b/47/c894d66c51335e91cca4e2f24429c933423842
new file mode 100644 (file)
index 0000000..2508d15
--- /dev/null
+++ b/47/c894d66c51335e91cca4e2f24429c933423842
@@ -0,0 +1,100 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 503C3431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:17:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id lsWizJKcXX2Q for <notmuch@notmuchmail.org>;\r
+       Sat, 30 Mar 2013 06:17:51 -0700 (PDT)\r
+Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com\r
+       [209.85.217.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 754DA431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:17:51 -0700 (PDT)\r
+Received: by mail-lb0-f176.google.com with SMTP id y8so887275lbh.7\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:17:50 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=YwB402aNrVdwymkBHHjGaGHA7+NzjjBmqWo/ZY9c2V4=;\r
+       b=csuN4FxeRHUYW1jj3fiiGwiMEON4L6zcccWa3ny87M4VzM7ofSTKII6zgwHaTaeoHu\r
+       eo6CKyCwIVmoV5yhNGrpL1/pxYj//8imXC12VmXbAtvvjXQohZGoxIg8yCPqkRlt4F5K\r
+       TdIibw2Ytyo/DsDoT/mT2LR5BfQx8rEvireGZrnQ/MSaGu4BFAlxndLVHi0sQcabtcn4\r
+       inix1hLMmuBK4vfnBzpWYHd2fR8q3mc3QGnGK3Zg9yurMUfl6GCy05RINW4acEbNqL7R\r
+       IaQ/6DYgxDbAbuA+QAXJFbcPX9TmYQ7NaK0VjdPDLLYayrsOGW2UPGolLxJ7xfdpuSbH\r
+       U68w==\r
+X-Received: by 10.112.155.166 with SMTP id vx6mr2867800lbb.59.1364649468625;\r
+       Sat, 30 Mar 2013 06:17:48 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id v7sm2582962lbg.13.2013.03.30.06.17.46\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 30 Mar 2013 06:17:47 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] cli: mime node: abstract decryption and signature\r
+       verification\r
+In-Reply-To: <87k3opiz71.fsf@maritornes.cs.unb.ca>\r
+References:\r
+ <a9f12ba474fc51df71e2fd2b7a20a8d101729c6e.1362319765.git.jani@nikula.org>\r
+       <d250faaac8aae1f6383b7a77e84e4b4144791688.1362319765.git.jani@nikula.org>\r
+       <87k3opiz71.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.15.2+48~gc5630bf (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 30 Mar 2013 15:17:46 +0200\r
+Message-ID: <87ppyhrpqd.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Gm-Message-State:\r
+ ALoCoQkFSyWzlCnyMHcboy1Q1dzoQvwE0m9v+qGKIJdu8Y4oiTlVYn8ejSsE28qzN6Ec8vkK2JZG\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 30 Mar 2013 13:17:52 -0000\r
+\r
+On Sat, 30 Mar 2013, David Bremner <david@tethera.net> wrote:\r
+> Jani Nikula <jani@nikula.org> writes:\r
+>\r
+>> The code filled with #ifdef GMIME_ATLEAST_26 is difficult to\r
+>> read. Abstract the decryption and signature verification into\r
+>> functions, with separate implementations for GMime 2.4 and 2.6, to\r
+>> clarify the code.\r
+>\r
+> This series mostly looks OK, although it's a challenge to track all the\r
+> code movement.\r
+\r
+I agree it is. Personally I just tried to look at support for either 2.4\r
+or 2.6 at a time, and compare the old and new code paths, to wrap my\r
+head around it.\r
+\r
+BTW I didn't test the 2.4 support, I don't have a system with that\r
+anymore.\r
+\r
+> I'd like some way to make it more obvious to the reader which version of\r
+> the functions they are reading (when the #ifdef GMIME_ATLEAST_26 has\r
+> scrolled off screen). The simplest would just be a comment in front of\r
+> each function.\r
+\r
+That feels a bit excessive, but perhaps that is just because I'm very\r
+accustomed to this style of conditional build. I can add the comments.\r
+\r
+BR,\r
+Jani.\r