--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 79A9D431FB6\r
+ for <notmuch@notmuchmail.org>; Fri, 18 May 2012 12:09:55 -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 ORZ8BLt6FL07 for <notmuch@notmuchmail.org>;\r
+ Fri, 18 May 2012 12:09:53 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 394A7431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 18 May 2012 12:09:53 -0700 (PDT)\r
+X-AuditID: 12074425-b7f966d0000008b6-87-4fb69e7f5b30\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 9B.08.02230.F7E96BF4; Fri, 18 May 2012 15:09:51 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4IJ9pwx005420; \r
+ Fri, 18 May 2012 15:09:51 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4IJ9n41018569\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Fri, 18 May 2012 15:09:50 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SVSYe-000714-V6; Fri, 18 May 2012 15:09:49 -0400\r
+Date: Fri, 18 May 2012 15:09:48 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>\r
+Subject: Re: [PATCH v2 3/5] cli: modify mime_node_context to use the new\r
+ notmuch_crypto_t\r
+Message-ID: <20120518190925.GU11804@mit.edu>\r
+References: <1337362357-31281-1-git-send-email-jrollins@finestructure.net>\r
+ <1337362357-31281-2-git-send-email-jrollins@finestructure.net>\r
+ <1337362357-31281-3-git-send-email-jrollins@finestructure.net>\r
+ <1337362357-31281-4-git-send-email-jrollins@finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1337362357-31281-4-git-send-email-jrollins@finestructure.net>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42IR4hRV1q2ft83fYN9lU4s9+7wsrt+cyezA\r
+ 5HH3NJfHs1W3mAOYorhsUlJzMstSi/TtErgybk5aw1pwVaZi/+9nrA2MN8S6GDk4JARMJI78\r
+ kO1i5AQyxSQu3FvP1sXIxSEksI9Rovn3CSYIZwOjxPGfT5lAqoQETjJJTG8xgEgsYZRY+vsx\r
+ K0iCRUBVYnJPK1gRm4CGxLb9yxlBbBEBM4meL3/AbGYBLYmtGz+A2cIC0RLf/r9hA7F5BXQk\r
+ TszbB7WtF2jBuT/MEAlBiZMzn7DANN/495IJ5GxmAWmJ5f84QExOAW+Jvg4xkApRARWJKSe3\r
+ sU1gFJqFpHkWkuZZCM0LGJlXMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Vro5WaW6KWmlG5iBAU0\r
+ u4vqDsYJh5QOMQpwMCrx8F6ctM1fiDWxrLgy9xCjJAeTkihv1EygEF9SfkplRmJxRnxRaU5q\r
+ 8SFGCQ5mJRHemdOBcrwpiZVVqUX5MClpDhYlcV5NrXd+QgLpiSWp2ampBalFMFkZDg4lCd6F\r
+ c4EaBYtS01Mr0jJzShDSTBycIMN5gIbvBqnhLS5IzC3OTIfIn2JUlBLn3QuSEABJZJTmwfXC\r
+ Es4rRnGgV4R5T4JU8QCTFVz3K6DBTECDK9nABpckIqSkGhhtsmfu2z39o/2ND/23FU9+f36A\r
+ I+xw4P3dcyvzj8qcfnrpNNO1m6IGthPvlhV0SxsIMNssyTmoVZKwUmwOgwzf02gZyZ33eQLa\r
+ Y3flLPvjXTzhA/cPptVB1R4tr58sfF3/t9lDao6/b3D1iTw73uS/3MdElqtdmeL7RuauahDX\r
+ 8fdtmSonj6srsRRnJBpqMRcVJwIAa9tjihMDAAA=\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\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: Fri, 18 May 2012 19:09:55 -0000\r
+\r
+Quoth Jameson Graef Rollins on May 18 at 10:32 am:\r
+> This simplifies some more interfaces and gets rid of another #ifdef.\r
+> ---\r
+> mime-node.c | 22 ++++++++--------------\r
+> 1 file changed, 8 insertions(+), 14 deletions(-)\r
+> \r
+> diff --git a/mime-node.c b/mime-node.c\r
+> index 183ff5d..3dda900 100644\r
+> --- a/mime-node.c\r
+> +++ b/mime-node.c\r
+> @@ -33,12 +33,7 @@ typedef struct mime_node_context {\r
+> GMimeMessage *mime_message;\r
+> \r
+> /* Context provided by the caller. */\r
+> -#ifdef GMIME_ATLEAST_26\r
+> - GMimeCryptoContext *cryptoctx;\r
+> -#else\r
+> - GMimeCipherContext *cryptoctx;\r
+> -#endif\r
+> - notmuch_bool_t decrypt;\r
+> + notmuch_crypto_t *crypto;\r
+> } mime_node_context_t;\r
+> \r
+> static int\r
+> @@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,\r
+> goto DONE;\r
+> }\r
+> \r
+> - mctx->cryptoctx = crypto->gpgctx;\r
+> - mctx->decrypt = crypto->decrypt;\r
+> + mctx->crypto = crypto;\r
+> \r
+> /* Create the root node */\r
+> root->part = GMIME_OBJECT (mctx->mime_message);\r
+> @@ -190,7 +184,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+> \r
+> /* Handle PGP/MIME parts */\r
+> if (GMIME_IS_MULTIPART_ENCRYPTED (part)\r
+> - && node->ctx->cryptoctx && node->ctx->decrypt) {\r
+> + && node->ctx->crypto->gpgctx && node->ctx->crypto->decrypt) {\r
+> if (node->nchildren != 2) {\r
+> /* this violates RFC 3156 section 4, so we won't bother with it. */\r
+> fprintf (stderr, "Error: %d part(s) for a multipart/encrypted "\r
+> @@ -203,10 +197,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+> #ifdef GMIME_ATLEAST_26\r
+> GMimeDecryptResult *decrypt_result = NULL;\r
+> node->decrypted_child = g_mime_multipart_encrypted_decrypt\r
+> - (encrypteddata, node->ctx->cryptoctx, &decrypt_result, &err);\r
+> + (encrypteddata, node->ctx->crypto->gpgctx, &decrypt_result, &err);\r
+> #else\r
+> node->decrypted_child = g_mime_multipart_encrypted_decrypt\r
+> - (encrypteddata, node->ctx->cryptoctx, &err);\r
+> + (encrypteddata, node->ctx->crypto->gpgctx, &err);\r
+> #endif\r
+> if (node->decrypted_child) {\r
+> node->decrypt_success = node->verify_attempted = TRUE;\r
+> @@ -224,7 +218,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+> (err ? err->message : "no error explanation given"));\r
+> }\r
+> }\r
+> - } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->cryptoctx) {\r
+> + } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->gpgctx) {\r
+> if (node->nchildren != 2) {\r
+> /* this violates RFC 3156 section 5, so we won't bother with it. */\r
+> fprintf (stderr, "Error: %d part(s) for a multipart/signed message "\r
+> @@ -233,7 +227,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+> } else {\r
+> #ifdef GMIME_ATLEAST_26\r
+> node->sig_list = g_mime_multipart_signed_verify\r
+> - (GMIME_MULTIPART_SIGNED (part), node->ctx->cryptoctx, &err);\r
+> + (GMIME_MULTIPART_SIGNED (part), node->ctx->crypto->gpgctx, &err);\r
+> node->verify_attempted = TRUE;\r
+> \r
+> if (!node->sig_list)\r
+> @@ -249,7 +243,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+> * In GMime 2.6, they're both non-const, so we'll be able\r
+> * to clean up this asymmetry. */\r
+> GMimeSignatureValidity *sig_validity = g_mime_multipart_signed_verify\r
+> - (GMIME_MULTIPART_SIGNED (part), node->ctx->cryptoctx, &err);\r
+> + (GMIME_MULTIPART_SIGNED (part), node->ctx->crypto.gpgctx, &err);\r
+\r
+This should be crypto->gpgctx.\r
+\r
+> node->verify_attempted = TRUE;\r
+> node->sig_validity = sig_validity;\r
+> if (sig_validity) {\r
projects / notmuch-archives.git / commitdiff