From 831e8e9cc63e6c2bb8b3639a42e374d3feb765ab Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 17 May 2012 14:55:56 +1700 Subject: [PATCH] [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument --- 7a/174e4db050817b7bb589c898a87516ea8cc508 | 164 ++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 7a/174e4db050817b7bb589c898a87516ea8cc508 diff --git a/7a/174e4db050817b7bb589c898a87516ea8cc508 b/7a/174e4db050817b7bb589c898a87516ea8cc508 new file mode 100644 index 000000000..58e50d06c --- /dev/null +++ b/7a/174e4db050817b7bb589c898a87516ea8cc508 @@ -0,0 +1,164 @@ +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 238A1431FC0 + for ; Wed, 16 May 2012 14:56:11 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 9NGOGiYe6tE0 for ; + Wed, 16 May 2012 14:56:08 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id 6833E431FAF + for ; Wed, 16 May 2012 14:56:08 -0700 (PDT) +Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by earth-doxen-postvirus (Postfix) with ESMTP id 0C76366E0179 + for ; Wed, 16 May 2012 14:56:06 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new +Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com + [184.74.199.219]) (Authenticated sender: jrollins) + by earth-doxen-submit (Postfix) with ESMTP id B823166E01A1 + for ; Wed, 16 May 2012 14:56:03 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 1AA705DA; Wed, 16 May 2012 14:56:02 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as + argument +Date: Wed, 16 May 2012 14:55:56 -0700 +Message-Id: <1337205359-2444-4-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +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> +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: Wed, 16 May 2012 21:56:11 -0000 + +Again, for interface simplification and getting rid of more #ifdefs. +--- + mime-node.c | 10 ++-------- + notmuch-client.h | 14 +++++--------- + notmuch-reply.c | 6 ++---- + notmuch-show.c | 3 +-- + 4 files changed, 10 insertions(+), 23 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index 79a3654..4faeffc 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -56,12 +56,7 @@ _mime_node_context_free (mime_node_context_t *res) + + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +-#ifdef GMIME_ATLEAST_26 +- GMimeCryptoContext *cryptoctx, +-#else +- GMimeCipherContext *cryptoctx, +-#endif +- notmuch_bool_t decrypt, mime_node_t **root_out) ++ notmuch_crypto_t *crypto, mime_node_t **root_out) + { + const char *filename = notmuch_message_get_filename (message); + mime_node_context_t *mctx; +@@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message, + goto DONE; + } + +- mctx->crypto.gpgctx = cryptoctx; +- mctx->crypto.decrypt = decrypt; ++ mctx->crypto = *crypto; + + /* Create the root node */ + root->part = GMIME_OBJECT (mctx->mime_message); +diff --git a/notmuch-client.h b/notmuch-client.h +index 2ad24cf..d86fab3 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -345,9 +345,10 @@ struct mime_node { + }; + + /* Construct a new MIME node pointing to the root message part of +- * message. If cryptoctx is non-NULL, it will be used to verify +- * signatures on any child parts. If decrypt is true, then cryptoctx +- * will additionally be used to decrypt any encrypted child parts. ++ * message. If crypto.gpgctx is non-NULL, it will be used to verify ++ * signatures on any child parts. If crypto.decrypt is true, then ++ * crypto.gpgctx will additionally be used to decrypt any encrypted ++ * child parts. + * + * Return value: + * +@@ -359,12 +360,7 @@ struct mime_node { + */ + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +-#ifdef GMIME_ATLEAST_26 +- GMimeCryptoContext *cryptoctx, +-#else +- GMimeCipherContext *cryptoctx, +-#endif +- notmuch_bool_t decrypt, mime_node_t **node_out); ++ notmuch_crypto_t *crypto, mime_node_t **node_out); + + /* Return a new MIME node for the requested child part of parent. + * parent will be used as the talloc context for the returned child +diff --git a/notmuch-reply.c b/notmuch-reply.c +index ed87899..6662adb 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx, + g_object_unref (G_OBJECT (reply)); + reply = NULL; + +- if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt, +- &root) == NOTMUCH_STATUS_SUCCESS) { ++ if (mime_node_open (ctx, message, crypto, &root) == NOTMUCH_STATUS_SUCCESS) { + format_part_reply (root); + talloc_free (root); + } +@@ -574,8 +573,7 @@ notmuch_reply_format_json(void *ctx, + + messages = notmuch_query_search_messages (query); + message = notmuch_messages_get (messages); +- if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt, +- &node) != NOTMUCH_STATUS_SUCCESS) ++ if (mime_node_open (ctx, message, crypto, &node) != NOTMUCH_STATUS_SUCCESS) + return 1; + + reply = create_reply_message (ctx, config, message, reply_all); +diff --git a/notmuch-show.c b/notmuch-show.c +index d254179..8b4d308 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -810,8 +810,7 @@ show_message (void *ctx, + mime_node_t *root, *part; + notmuch_status_t status; + +- status = mime_node_open (local, message, params->crypto.gpgctx, +- params->crypto.decrypt, &root); ++ status = mime_node_open (local, message, &(params->crypto), &root); + if (status) + goto DONE; + part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); +-- +1.7.10 + -- 2.26.2