From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [Patch v4 2/5] cli: S/MIME verification/decryption support
Date: Sun, 18 Jan 2015 09:02:44 +0100 [thread overview]
Message-ID: <1421568167-18683-3-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1421568167-18683-1-git-send-email-david@tethera.net>
From: Jameson Graef Rollins <jrollins@finestructure.net>
The notmuch-show flags --decrypt and --verify will now also process
S/MIME multiparts if encountered. Requires gmime-2.6 and gpgsm.
---
crypto.c | 20 ++++++++++++++++++++
notmuch-client.h | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/crypto.c b/crypto.c
index 6f4a6db..d66aa66 100644
--- a/crypto.c
+++ b/crypto.c
@@ -88,6 +88,21 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
fprintf (stderr, "Failed to construct gpg context.\n");
}
cryptoctx = crypto->gpgctx;
+#ifdef GMIME_ATLEAST_26
+ } else if ((strcasecmp (protocol, "application/pkcs7-signature") == 0)
+ || (strcasecmp (protocol, "application/x-pkcs7-signature") == 0)
+ || (strcasecmp (protocol, "application/pkcs7-encrypted") == 0)) {
+ if (! crypto->pkcs7ctx) {
+ /* TODO: GMimePasswordRequestFunc */
+ crypto->pkcs7ctx = g_mime_pkcs7_context_new (NULL);
+ if (crypto->pkcs7ctx) {
+ g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context*) crypto->pkcs7ctx, FALSE);
+ } else {
+ fprintf (stderr, "Failed to construct pkcs7 context.\n");
+ }
+ }
+ cryptoctx = crypto->pkcs7ctx;
+#endif
} else {
fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");
}
@@ -103,5 +118,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 5e0d475..986f6cd 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -78,6 +78,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;
} notmuch_crypto_t;
@@ -414,8 +415,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:
*
--
2.1.4
next prev parent reply other threads:[~2015-01-18 8:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-18 8:02 S/MIME patches, v4 David Bremner
2015-01-18 8:02 ` [Patch v4 1/5] test: initial tests for S/MIME and notmuch-emacs David Bremner
2015-01-18 8:02 ` David Bremner [this message]
2015-01-18 10:45 ` [PATCH 0/3] smime with some refactoring Jani Nikula
2015-01-18 10:45 ` [PATCH 1/3] crypto: refactor context creation to facilitate further work Jani Nikula
2015-01-18 17:07 ` David Bremner
2015-01-18 10:45 ` [PATCH 2/3] crypto: make crypto ctx initialization an array Jani Nikula
2015-01-18 17:10 ` David Bremner
2015-01-18 10:45 ` [PATCH 3/3] cli: crypto: S/MIME verification/decryption support Jani Nikula
2015-01-18 17:14 ` David Bremner
2015-03-02 17:56 ` Jameson Graef Rollins
2015-01-18 8:02 ` [Patch v4 3/5] test: add S/MIME signature verification test for notmuch CLI David Bremner
2015-01-18 8:02 ` [Patch v4 4/5] debian: Recommend gpgsm for S/MIME support David Bremner
2015-01-18 8:02 ` [Patch v4 5/5] test: add broken test for SMIME decryption with notmuch CLI David Bremner
2015-01-26 22:59 ` David Bremner
2015-01-28 7:36 ` David Bremner
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=1421568167-18683-3-git-send-email-david@tethera.net \
--to=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).