diff options
| author | Jani Nikula <jani@nikula.org> | 2015-08-16 19:41:14 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-01-29 17:45:46 -0400 |
| commit | 2355f1522ae77a1012ca3ef08d97098a5951d142 (patch) | |
| tree | 320bab0244bec95e4cf3c313f1604e803dc8a4b7 /crypto.c | |
| parent | a530a1706aa96cd20d7053bd91ecc5bfbee17756 (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 'crypto.c')
| -rw-r--r-- | crypto.c | 35 |
1 files changed, 35 insertions, 0 deletions
@@ -43,6 +43,28 @@ 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); @@ -55,6 +77,14 @@ static const struct { .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, + }, }; /* for the specified protocol return the context pointer (initializing @@ -95,5 +125,10 @@ notmuch_crypto_cleanup (notmuch_crypto_t *crypto) crypto->gpgctx = NULL; } + if (crypto->pkcs7ctx) { + g_object_unref (crypto->pkcs7ctx); + crypto->pkcs7ctx = NULL; + } + return 0; } |
