From 9375096f9f253ab0f1d0363e0a7cdc46b17908d1 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 27 May 2012 11:45:43 +1700 Subject: [PATCH] [PATCH v5 4/7] cli: modify mime_node_open to take new crypto struct as argument --- 5d/22c606113ab788ceb2fe3eac0ba49dc8496532 | 158 ++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 5d/22c606113ab788ceb2fe3eac0ba49dc8496532 diff --git a/5d/22c606113ab788ceb2fe3eac0ba49dc8496532 b/5d/22c606113ab788ceb2fe3eac0ba49dc8496532 new file mode 100644 index 000000000..9cc0ec963 --- /dev/null +++ b/5d/22c606113ab788ceb2fe3eac0ba49dc8496532 @@ -0,0 +1,158 @@ +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 C78EC429E56 + for ; Sat, 26 May 2012 11:45:59 -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 82uAvoSDAdXM for ; + Sat, 26 May 2012 11:45:57 -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 E63A9429E28 + for ; Sat, 26 May 2012 11:45:55 -0700 (PDT) +Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by earth-doxen-postvirus (Postfix) with ESMTP id D055C66E001B + for ; Sat, 26 May 2012 11:45:53 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new +Received: from finestructure.net (unknown [76.89.192.57]) + (Authenticated sender: jrollins) + by earth-doxen-submit (Postfix) with ESMTP id CD59C66E00C0 + for ; Sat, 26 May 2012 11:45:51 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 6F71BB69; Sat, 26 May 2012 11:45:51 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH v5 4/7] cli: modify mime_node_open to take new crypto struct + as argument +Date: Sat, 26 May 2012 11:45:43 -0700 +Message-Id: <1338057946-29209-5-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1338057946-29209-4-git-send-email-jrollins@finestructure.net> +References: <1338057946-29209-1-git-send-email-jrollins@finestructure.net> + <1338057946-29209-2-git-send-email-jrollins@finestructure.net> + <1338057946-29209-3-git-send-email-jrollins@finestructure.net> + <1338057946-29209-4-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: Sat, 26 May 2012 18:46:00 -0000 + +This simplifies the interface considerably. +--- + mime-node.c | 7 +++---- + notmuch-client.h | 10 +++++----- + notmuch-reply.c | 6 ++---- + notmuch-show.c | 3 +-- + 4 files changed, 11 insertions(+), 15 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index a5645e5..67f4b16 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -57,8 +57,7 @@ _mime_node_context_free (mime_node_context_t *res) + + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +- notmuch_crypto_context_t *cryptoctx, +- 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; +@@ -110,8 +109,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message, + goto DONE; + } + +- mctx->cryptoctx = cryptoctx; +- mctx->decrypt = decrypt; ++ mctx->cryptoctx = crypto->gpgctx; ++ mctx->decrypt = crypto->decrypt; + + /* Create the root node */ + root->part = GMIME_OBJECT (mctx->mime_message); +diff --git a/notmuch-client.h b/notmuch-client.h +index ead7fbd..962c747 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -350,9 +350,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: + * +@@ -364,8 +365,7 @@ struct mime_node { + */ + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +- notmuch_crypto_context_t *cryptoctx, +- 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 11f269f..6f368c9 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -575,8 +575,7 @@ notmuch_reply_format_default(void *ctx, + g_object_unref (G_OBJECT (reply)); + reply = NULL; + +- if (mime_node_open (ctx, message, params->crypto.gpgctx, params->crypto.decrypt, +- &root) == NOTMUCH_STATUS_SUCCESS) { ++ if (mime_node_open (ctx, message, &(params->crypto), &root) == NOTMUCH_STATUS_SUCCESS) { + format_part_reply (root); + talloc_free (root); + } +@@ -605,8 +604,7 @@ notmuch_reply_format_json(void *ctx, + + messages = notmuch_query_search_messages (query); + message = notmuch_messages_get (messages); +- if (mime_node_open (ctx, message, params->crypto.gpgctx, params->crypto.decrypt, +- &node) != NOTMUCH_STATUS_SUCCESS) ++ if (mime_node_open (ctx, message, &(params->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 cc509a6..fb5e9b6 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