From: Jani Nikula <jani@nikula.org>
To: Jameson Graef Rollins <jrollins@finestructure.net>,
Notmuch Mail <notmuch@notmuchmail.org>
Subject: Re: [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t
Date: Thu, 17 May 2012 10:37:21 +0300 [thread overview]
Message-ID: <87bolni7gu.fsf@nikula.org> (raw)
In-Reply-To: <1337205359-2444-3-git-send-email-jrollins@finestructure.net>
On Thu, 17 May 2012, Jameson Graef Rollins <jrollins@finestructure.net> 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
next prev parent reply other threads:[~2012-05-17 7:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 21:55 [PATCH 0/6] cli: improve handling of crypto parameters contexts Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 1/6] cli: new crypto structure to store crypto contexts and parameters Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 4/6] cli: intialize crypto structure in show and reply Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 5/6] cli: new crypto verify flag to handle verification Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 6/6] cli: lazily create the crypto gpg context only when needed Jameson Graef Rollins
2012-05-17 22:29 ` Austin Clements
2012-05-17 7:47 ` [PATCH 4/6] cli: intialize crypto structure in show and reply Jani Nikula
2012-05-17 14:26 ` Jameson Graef Rollins
2012-05-17 16:31 ` Jani Nikula
2012-05-17 16:45 ` Jameson Graef Rollins
2012-05-17 20:23 ` Jani Nikula
2012-05-17 20:53 ` Jameson Graef Rollins
2012-05-17 21:51 ` Daniel Kahn Gillmor
2012-05-18 6:59 ` Tomi Ollila
2012-05-18 8:20 ` Jani Nikula
2012-05-18 17:09 ` Daniel Kahn Gillmor
2012-05-17 22:29 ` Austin Clements
2012-05-17 7:40 ` [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument Jani Nikula
2012-05-17 22:26 ` Austin Clements
2012-05-17 7:37 ` Jani Nikula [this message]
2012-05-17 7:36 ` [PATCH 1/6] cli: new crypto structure to store crypto contexts and parameters Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bolni7gu.fsf@nikula.org \
--to=jani@nikula.org \
--cc=jrollins@finestructure.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).