From a391c577a191978f8df33d23e522017fd31295eb Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 17 May 2012 10:37:21 +0300 Subject: [PATCH] Re: [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t --- 65/b23d3146f4fffe4ed4bd308eca5d27b787d319 | 165 ++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 65/b23d3146f4fffe4ed4bd308eca5d27b787d319 diff --git a/65/b23d3146f4fffe4ed4bd308eca5d27b787d319 b/65/b23d3146f4fffe4ed4bd308eca5d27b787d319 new file mode 100644 index 000000000..2bc03537c --- /dev/null +++ b/65/b23d3146f4fffe4ed4bd308eca5d27b787d319 @@ -0,0 +1,165 @@ +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 9C44E431FAF + for ; Thu, 17 May 2012 00:37:27 -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 HC7M6BJG7I8W for ; + Thu, 17 May 2012 00:37:27 -0700 (PDT) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AC837431FAE + for ; Thu, 17 May 2012 00:37:26 -0700 (PDT) +Received: by lagu2 with SMTP id u2so1266761lag.26 + for ; Thu, 17 May 2012 00:37:25 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:subject:in-reply-to:references:user-agent:date:message-id + :mime-version:content-type:x-gm-message-state; + bh=eFBqjgKqEMBwO0Ser/USnktTsHY87Fkz2ao5Vit23Ys=; + b=h8wuW8GZkYdpwnW9aQ8F8SyFs9uQ1RtgEOSkdZt7wsChUrQkDp3catbs/4TY7BYylJ + RXPgtZ4nJUHcf9k0vH3WBEYgMRa7NPqRIFZnw7ZfCBP1hFvyzxuEKjscsSgrFj0Kc4oG + dwSy4zxIBFtZdc7JuUp6TN6cKbY2z2DiyY1XvMhaOt9OQN6pr7HZqzpQxE1hKA8v83Td + vE/P7Syi43/3H3PJ9CQM7M9vPiKsNh5YCUVGjCCf4TCTLWlGYj3uxUpK/pUCOV4oNHEM + 67NW1gV4hSKzcjXGE9VyZi61O6ft/0KClUABahJfboT4hnPOXHsmpkTCw8amhyiO62yW + Sqrw== +Received: by 10.112.101.105 with SMTP id ff9mr2620161lbb.44.1337240245044; + Thu, 17 May 2012 00:37:25 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi. + [80.220.80.68]) + by mx.google.com with ESMTPS id hi14sm6708122lab.4.2012.05.17.00.37.23 + (version=SSLv3 cipher=OTHER); Thu, 17 May 2012 00:37:24 -0700 (PDT) +From: Jani Nikula +To: Jameson Graef Rollins , + Notmuch Mail +Subject: Re: [PATCH 2/6] cli: modify mime_node_context to use the new + notmuch_crypto_t +In-Reply-To: <1337205359-2444-3-git-send-email-jrollins@finestructure.net> +References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net> + <1337205359-2444-2-git-send-email-jrollins@finestructure.net> + <1337205359-2444-3-git-send-email-jrollins@finestructure.net> +User-Agent: Notmuch/0.13+13~gc259b9a (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +Date: Thu, 17 May 2012 10:37:21 +0300 +Message-ID: <87bolni7gu.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQnZoewMRl1+DRMZnmhjdTNrUk4W5g3qkNqRGv0gWjIhxA6KETuoiu7+pEQmJhVKysjmFRcd +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: Thu, 17 May 2012 07:37:27 -0000 + +On Thu, 17 May 2012, Jameson Graef Rollins wrote: +> This simplifies some more interfaces and gets rid of another #ifdef. + +LGTM. + +> --- +> mime-node.c | 23 +++++++++-------------- +> 1 file changed, 9 insertions(+), 14 deletions(-) +> +> diff --git a/mime-node.c b/mime-node.c +> index a95bdab..79a3654 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 +> @@ -118,8 +113,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message, +> goto DONE; +> } +> +> - mctx->cryptoctx = cryptoctx; +> - mctx->decrypt = decrypt; +> + mctx->crypto.gpgctx = cryptoctx; +> + mctx->crypto.decrypt = decrypt; +> +> /* Create the root node */ +> root->part = GMIME_OBJECT (mctx->mime_message); +> @@ -195,7 +190,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 " +> @@ -208,10 +203,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; +> @@ -229,7 +224,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 " +> @@ -238,7 +233,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) +> @@ -254,7 +249,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); +> node->verify_attempted = TRUE; +> node->sig_validity = sig_validity; +> if (sig_validity) { +> -- +> 1.7.10 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2