From: Jani Nikula <jani@nikula.org>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH 6/8] cli: crypto: S/MIME verification support
Date: Sat, 26 Sep 2015 14:58:41 +0300 [thread overview]
Message-ID: <87bncpmlxq.fsf@nikula.org> (raw)
In-Reply-To: <1439746876-23654-7-git-send-email-david@tethera.net>
On Sun, 16 Aug 2015, David Bremner <david@tethera.net> wrote:
> From: Jani Nikula <jani@nikula.org>
>
> notmuch-show --verify will now also process S/MIME multiparts if
> encountered. Requires gmime-2.6 and gpgsm.
>
> Based on work by Jameson Graef Rollins <jrollins@finestructure.net>.
> ---
> crypto.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> notmuch-client.h | 7 +++++--
> test/T355-smime.sh | 1 -
> 3 files changed, 55 insertions(+), 3 deletions(-)
>
> diff --git a/crypto.c b/crypto.c
> index 11c167e..ce683d2 100644
> --- a/crypto.c
> +++ b/crypto.c
> @@ -43,6 +43,51 @@ create_gpg_context (notmuch_crypto_t *crypto)
> return gpgctx;
> }
>
> +/* Create a PKCS7 context (GMime 2.6) */
> +static notmuch_crypto_context_t *
> +create_pkcs7_context (notmuch_crypto_t *crypto)
> +{
> + notmuch_crypto_context_t *pkcs7ctx;
> +
> + if (crypto->pkcs7ctx)
> + return crypto->pkcs7ctx;
> +
> + /* TODO: GMimePasswordRequestFunc */
> + pkcs7ctx = g_mime_pkcs7_context_new (NULL);
> + if (! pkcs7ctx) {
> + fprintf (stderr, "Failed to construct pkcs7 context.\n");
> + return NULL;
> + }
> + crypto->pkcs7ctx = pkcs7ctx;
> +
> + g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context *) pkcs7ctx,
> + FALSE);
> +
> + return pkcs7ctx;
> +}
> +
> +static const struct {
> + const char *protocol;
> + notmuch_crypto_context_t *(*get_context) (notmuch_crypto_t *crypto);
> +} protocols[] = {
> + {
> + .protocol = "application/pgp-signature",
> + .get_context = create_gpg_context,
> + },
> + {
> + .protocol = "application/pgp-encrypted",
> + .get_context = create_gpg_context,
> + },
> + {
> + .protocol = "application/pkcs7-signature",
> + .get_context = create_pkcs7_context,
> + },
> + {
> + .protocol = "application/x-pkcs7-signature",
> + .get_context = create_pkcs7_context,
> + },
> +};
The array itself should be added in patch 2 as it depends on it, and
this patch should only add the pkcs7 ones. I guess this got broken at
some rebase.
BR,
Jani.
> +
> /* for the specified protocol return the context pointer (initializing
> * if needed) */
> notmuch_crypto_context_t *
> @@ -81,5 +126,10 @@ notmuch_crypto_cleanup (notmuch_crypto_t *crypto)
> crypto->gpgctx = NULL;
> }
>
> + if (crypto->pkcs7ctx) {
> + g_object_unref (crypto->pkcs7ctx);
> + crypto->pkcs7ctx = NULL;
> + }
> +
> return 0;
> }
> diff --git a/notmuch-client.h b/notmuch-client.h
> index 1f82656..774b620 100644
> --- a/notmuch-client.h
> +++ b/notmuch-client.h
> @@ -31,6 +31,8 @@
> #include <gmime/gmime.h>
>
> typedef GMimeCryptoContext notmuch_crypto_context_t;
> +/* This is automatically included only since gmime 2.6.10 */
> +#include <gmime/gmime-pkcs7-context.h>
>
> #include "notmuch.h"
>
> @@ -69,6 +71,7 @@ typedef struct notmuch_show_format {
>
> typedef struct notmuch_crypto {
> notmuch_crypto_context_t* gpgctx;
> + notmuch_crypto_context_t* pkcs7ctx;
> notmuch_bool_t verify;
> notmuch_bool_t decrypt;
> const char *gpgpath;
> @@ -406,8 +409,8 @@ struct mime_node {
> /* Construct a new MIME node pointing to the root message part of
> * message. If crypto->verify is true, signed child parts will be
> * verified. If crypto->decrypt is true, encrypted child parts will be
> - * decrypted. If crypto->gpgctx is NULL, it will be lazily
> - * initialized.
> + * decrypted. If the crypto contexts (crypto->gpgctx or
> + * crypto->pkcs7) are NULL, they will be lazily initialized.
> *
> * Return value:
> *
> diff --git a/test/T355-smime.sh b/test/T355-smime.sh
> index b3cc76e..caedf5e 100755
> --- a/test/T355-smime.sh
> +++ b/test/T355-smime.sh
> @@ -56,7 +56,6 @@ EOF
> test_expect_equal_file OUTPUT EXPECTED
>
> test_begin_subtest "signature verification (notmuch CLI)"
> -test_subtest_known_broken
> output=$(notmuch show --format=json --verify subject:"test signed message 001" \
> | notmuch_json_show_sanitize \
> | sed -e 's|"created": [1234567890]*|"created": 946728000|' \
> --
> 2.5.0
next prev parent reply other threads:[~2015-09-26 11:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 12:42 gmime and S/MIME David Bremner
2015-01-29 14:40 ` [gmime-devel] " Jeffrey Stedfast
2015-08-16 17:41 ` David Bremner
2015-08-16 17:41 ` [PATCH 1/8] crypto: refactor context creation to facilitate further work David Bremner
2015-08-16 17:41 ` [PATCH 2/8] crypto: make crypto ctx initialization an array David Bremner
2015-08-16 17:41 ` [PATCH 3/8] cli: let the user know which protocol is unknown or unsupported David Bremner
2015-08-16 17:41 ` [PATCH 4/8] test: initial tests for S/MIME and notmuch-emacs David Bremner
2015-08-16 17:41 ` [PATCH 5/8] test: add broken S/MIME signature verification test for notmuch CLI David Bremner
2015-08-16 17:41 ` [PATCH 6/8] cli: crypto: S/MIME verification support David Bremner
2015-09-26 11:58 ` Jani Nikula [this message]
2015-08-16 17:41 ` [PATCH 7/8] debian: Recommend gpgsm for S/MIME support David Bremner
2015-08-16 17:41 ` [PATCH 8/8] debian: add gpgsm as build dependency David Bremner
2015-09-26 17:32 ` Daniel Kahn Gillmor
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=87bncpmlxq.fsf@nikula.org \
--to=jani@nikula.org \
--cc=david@tethera.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).