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 /mime-node.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 'mime-node.c')
| -rw-r--r-- | mime-node.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mime-node.c b/mime-node.c index 7c8b2602..ae3ebef6 100644 --- a/mime-node.c +++ b/mime-node.c @@ -199,12 +199,8 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); node->decrypt_attempted = true; - node->decrypted_child = g_mime_multipart_encrypted_decrypt -#if (GMIME_MAJOR_VERSION < 3) - (encrypteddata, cryptoctx, &decrypt_result, &err); -#else - (encrypteddata, GMIME_DECRYPT_NONE, NULL, &decrypt_result, &err); -#endif + if (! node->decrypted_child) + node->decrypted_child = _notmuch_crypto_decrypt (cryptoctx, encrypteddata, &decrypt_result, &err); if (! node->decrypted_child) { fprintf (stderr, "Failed to decrypt part: %s\n", err ? err->message : "no error explanation given"); |