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