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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/index.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/index.cc b/lib/index.cc index 6e684f5f..19d03456 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -530,9 +530,9 @@ _index_encrypted_mime_part (notmuch_message_t *message, notmuch = _notmuch_message_database (message); + GMimeCryptoContext* crypto_ctx = NULL; #if (GMIME_MAJOR_VERSION < 3) { - GMimeCryptoContext* crypto_ctx = NULL; const char *protocol = NULL; protocol = g_mime_content_type_get_parameter (content_type, "protocol"); status = _notmuch_crypto_get_gmime_ctx_for_protocol (&(indexopts->crypto), @@ -546,13 +546,9 @@ _index_encrypted_mime_part (notmuch_message_t *message, "property (%d)\n", status); return; } - clear = g_mime_multipart_encrypted_decrypt(encrypted_data, crypto_ctx, - NULL, &err); } -#else - clear = g_mime_multipart_encrypted_decrypt(encrypted_data, GMIME_DECRYPT_NONE, NULL, - NULL, &err); #endif + clear = _notmuch_crypto_decrypt (crypto_ctx, encrypted_data, NULL, &err); if (err) { _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n", err->domain, err->code, err->message); |