From 6b0bc6187dbe933f96ce514d084da612eb9f9438 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 17 May 2012 14:55:55 +1700 Subject: [PATCH] [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t --- ec/a9c5c9f240c62724653d711d9262218f02c717 | 140 ++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 ec/a9c5c9f240c62724653d711d9262218f02c717 diff --git a/ec/a9c5c9f240c62724653d711d9262218f02c717 b/ec/a9c5c9f240c62724653d711d9262218f02c717 new file mode 100644 index 000000000..e66e5f9c9 --- /dev/null +++ b/ec/a9c5c9f240c62724653d711d9262218f02c717 @@ -0,0 +1,140 @@ +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 0999F431FBC + for ; Wed, 16 May 2012 14:56:13 -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 wZOFzPRf6G2n for ; + Wed, 16 May 2012 14:56:11 -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 0C605431FBD + for ; Wed, 16 May 2012 14:56:10 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id 34B3D2E50378 + for ; Wed, 16 May 2012 14:56:06 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-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 fire-doxen-submit (Postfix) with ESMTP id 0EF8F32801D + for ; Wed, 16 May 2012 14:56:04 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 1810A5D4; Wed, 16 May 2012 14:56:02 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH 2/6] cli: modify mime_node_context to use the new + notmuch_crypto_t +Date: Wed, 16 May 2012 14:55:55 -0700 +Message-Id: <1337205359-2444-3-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337205359-2444-2-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> +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:13 -0000 + +This simplifies some more interfaces and gets rid of another #ifdef. +--- + 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 + -- 2.26.2