Re: [PATCH v4 02/16] Move crypto.c into libutil

diff --git a/c0/9acaf712d6ac170b16aef98e5c20b7f3140a69 b/c0/9acaf712d6ac170b16aef98e5c20b7f3140a69
new file mode 100644 (file)
index 0000000..280e400
--- /dev/null
+++ b/c0/9acaf712d6ac170b16aef98e5c20b7f3140a69
@@ -0,0 +1,77 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 75DC16DE0926\r
+ for <notmuch@notmuchmail.org>; Thu, 11 Aug 2016 23:17:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.008\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.008 tagged_above=-999 required=5 tests=[AWL=0.003,\r
+  SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id AiIIQJSqcdSU for <notmuch@notmuchmail.org>;\r
+ Thu, 11 Aug 2016 23:17:32 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 0A60D6DE091F\r
+ for <notmuch@notmuchmail.org>; Thu, 11 Aug 2016 23:17:31 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1bY5mq-0006tH-P3; Fri, 12 Aug 2016 02:17:44 -0400\r
+Received: (nullmailer pid 21013 invoked by uid 1000);\r
+ Fri, 12 Aug 2016 06:17:28 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v4 02/16] Move crypto.c into libutil\r
+In-Reply-To: <1467970047-8013-3-git-send-email-dkg@fifthhorseman.net>\r
+References: <1467970047-8013-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1467970047-8013-3-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.22.1+61~g2ce0f13 (https://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Fri, 12 Aug 2016 15:17:28 +0900\r
+Message-ID: <874m6qqznr.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 12 Aug 2016 06:17:40 -0000\r
+\r
+Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:\r
+> +++ b/util/crypto.c\r
+> @@ -0,0 +1,138 @@\r
+\r
+> +#include "notmuch.h"\r
+\r
+It feels wrong to me for a file in util/ to include notmuch.h.  It seems\r
+the same situation holds with search-path.h.  There it seems we use\r
+notmuch_bool_t (although I'm not convinced that's the right return\r
+type). If that's the only reason maybe we should either factor out the\r
+definition or just return ints.\r
+\r
+> +/* Create a PKCS7 context (GMime 2.6) */\r
+> +static notmuch_crypto_context_t *\r
+> +create_pkcs7_context (notmuch_crypto_t *crypto)\r
+> +{\r
+> +    notmuch_crypto_context_t *pkcs7ctx;\r
+\r
+I guess this is leftover, and causes the build failure.\r
+\r
+> +\r
+> +#include "notmuch.h"\r
+\r
+Same questions notmuch.h here.\r
+\r
+d\r