Re: [PATCH v3 03/16] make shared crypto code behave library-like

diff --git a/13/1bd5420f8089df58f5cfc8fcfd2c4286831774 b/13/1bd5420f8089df58f5cfc8fcfd2c4286831774
new file mode 100644 (file)
index 0000000..d4487c8
--- /dev/null
+++ b/13/1bd5420f8089df58f5cfc8fcfd2c4286831774
@@ -0,0 +1,98 @@
+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 3C9E36DE0231\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 18:37:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.308\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.308 tagged_above=-999 required=5 tests=[AWL=0.243,\r
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 WUl1xY7pFNwf for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 18:37:07 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 622E56DE021E\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 18:37:07 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1aTKdl-0001dj-H1; Tue, 09 Feb 2016 21:36:25 -0500\r
+Received: (nullmailer pid 14530 invoked by uid 1000);\r
+ Wed, 10 Feb 2016 02:37:04 -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 v3 03/16] make shared crypto code behave library-like\r
+In-Reply-To: <1454272801-23623-4-git-send-email-dkg@fifthhorseman.net>\r
+References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1454272801-23623-4-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.21+5~gca076ce (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 09 Feb 2016 22:37:04 -0400\r
+Message-ID: <87twlhuw8f.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: Wed, 10 Feb 2016 02:37:09 -0000\r
+\r
+Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:\r
+> -static GMimeCryptoContext*\r
+> -create_gpg_context (_notmuch_crypto_t *crypto)\r
+> +static notmuch_status_t\r
+> +get_gpg_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx)\r
+\r
+I was a littled puzzled by this renaming. I guess it's fine, it just\r
+creates a bit more diff noise.\r
+>  /* Create a PKCS7 context (GMime 2.6) */\r
+> -static notmuch_crypto_context_t *\r
+> -create_pkcs7_context (notmuch_crypto_t *crypto)\r
+> +static notmuch_status_t \r
+> +create_pkcs7_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx)\r
+\r
+Especially since you only renamed the gpg version. Or did I miss\r
+something?\r
+> +notmuch_status_t\r
+> +_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto,\r
+> +                                        const char *protocol,\r
+> +                                        GMimeCryptoContext **ctx)\r
+>  {\r
+> -    GMimeCryptoContext *cryptoctx = NULL;\r
+> -    size_t i;\r
+> -\r
+> -    if (! protocol) {\r
+> -    fprintf (stderr, "Cryptographic protocol is empty.\n");\r
+> -    return cryptoctx;\r
+> -    }\r
+> +    if (! protocol)\r
+> +    return NOTMUCH_STATUS_MALFORMED_CRYPTO_PROTOCOL;\r
+>  \r
+>      /* As per RFC 1847 section 2.1: "the [protocol] value token is\r
+>       * comprised of the type and sub-type tokens of the Content-Type".\r
+> @@ -112,15 +112,12 @@ _notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protoc\r
+>       * parameter names as defined in this document are\r
+>       * case-insensitive."  Thus, we use strcasecmp for the protocol.\r
+>       */\r
+> -    for (i = 0; i < ARRAY_SIZE (protocols); i++) {\r
+> +    for (size_t i = 0; i < ARRAY_SIZE (protocols); i++) {\r
+\r
+I forget whether we are using C99 for loop variable declarations.  I\r
+like them myself. If someone figures out the answer, maybe they can\r
+update devel/STYLE.\r
+\r
+d\r
+\r
+\r