diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-11-30 03:59:27 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-12-04 21:39:24 -0400 |
| commit | 5f2832ae2171714dfef6d0d3302f473526480157 (patch) | |
| tree | 8a6d8801c1f51a1e9613f1a7d58db5b25f127596 /util/crypto.c | |
| parent | 9beda4b9811323d1fd9eb120d6e7a2ef69beed14 (diff) | |
crypto: add _notmuch_crypto_decrypt wrapper function
We will use this centralized function to consolidate the awkward
behavior around different gmime versions.
It's only invoked from two places: mime-node.c's
node_decrypt_and_verify() and lib/index.cc's
_index_encrypted_mime_part().
However, those two places have some markedly distinct logic, so the
interface for this _notmuch_crypto_decrypt function is going to get a
little bit clunky. It's worthwhile, though, for the sake of keeping
these #if directives reasonably well-contained.
Diffstat (limited to 'util/crypto.c')
| -rw-r--r-- | util/crypto.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/util/crypto.c b/util/crypto.c index 5c84282e..087536ec 100644 --- a/util/crypto.c +++ b/util/crypto.c @@ -138,3 +138,21 @@ void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto)) { } #endif + +GMimeObject * +_notmuch_crypto_decrypt (g_mime_3_unused(GMimeCryptoContext* crypto_ctx), + GMimeMultipartEncrypted *part, + GMimeDecryptResult **decrypt_result, + GError **err) +{ + GMimeObject *ret = NULL; + +#if (GMIME_MAJOR_VERSION < 3) + ret = g_mime_multipart_encrypted_decrypt(part, crypto_ctx, + decrypt_result, err); +#else + ret = g_mime_multipart_encrypted_decrypt(part, GMIME_DECRYPT_NONE, NULL, + decrypt_result, err); +#endif + return ret; +} |