summaryrefslogtreecommitdiffstats
path: root/notmuch-client.h
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2015-08-16 19:41:14 +0200
committerDavid Bremner <david@tethera.net>2016-01-29 17:45:46 -0400
commit2355f1522ae77a1012ca3ef08d97098a5951d142 (patch)
tree320bab0244bec95e4cf3c313f1604e803dc8a4b7 /notmuch-client.h
parenta530a1706aa96cd20d7053bd91ecc5bfbee17756 (diff)
cli: crypto: S/MIME verification support
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>.
Diffstat (limited to 'notmuch-client.h')
-rw-r--r--notmuch-client.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/notmuch-client.h b/notmuch-client.h
index 3bd2903e..18e6c60b 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"
@@ -70,6 +72,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;
@@ -407,8 +410,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:
*