debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: add _notmuch_crypto_decrypt wrapper function

Browse source 
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.
This commit is contained in:
Daniel Kahn Gillmor 2017-11-30 03:59:27 -05:00 • committed by David Bremner
parent 9beda4b981
commit 5f2832ae21
4 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/index.cc
View file

@ -530,9 +530,9 @@ _index_encrypted_mime_part (notmuch_message_t *message,
notmuch = _notmuch_message_database (message); notmuch = _notmuch_message_database (message);
GMimeCryptoContext* crypto_ctx = NULL;
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
{ {
GMimeCryptoContext* crypto_ctx = NULL;
const char *protocol = NULL; const char *protocol = NULL;
protocol = g_mime_content_type_get_parameter (content_type, "protocol"); protocol = g_mime_content_type_get_parameter (content_type, "protocol");
status = _notmuch_crypto_get_gmime_ctx_for_protocol (&(indexopts->crypto), 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); "property (%d)\n", status);
return; 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 #endif
clear = _notmuch_crypto_decrypt (crypto_ctx, encrypted_data, NULL, &err);
if (err) { if (err) {
_notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n", _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n",
err->domain, err->code, err->message); err->domain, err->code, err->message);

8
mime-node.c
View file

@ -199,12 +199,8 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
node->decrypt_attempted = true; node->decrypt_attempted = true;
node->decrypted_child = g_mime_multipart_encrypted_decrypt if (! node->decrypted_child)
#if (GMIME_MAJOR_VERSION < 3) node->decrypted_child = _notmuch_crypto_decrypt (cryptoctx, encrypteddata, &decrypt_result, &err);
(encrypteddata, cryptoctx, &decrypt_result, &err);
#else
(encrypteddata, GMIME_DECRYPT_NONE, NULL, &decrypt_result, &err);
#endif
if (! node->decrypted_child) { if (! node->decrypted_child) {
fprintf (stderr, "Failed to decrypt part: %s\n", fprintf (stderr, "Failed to decrypt part: %s\n",
err ? err->message : "no error explanation given"); err ? err->message : "no error explanation given");

18
util/crypto.c
View file

@ -138,3 +138,21 @@ void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto))
{ {
} }
#endif #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;
}

7
util/crypto.h
View file

@ -2,10 +2,8 @@
#define _CRYPTO_H #define _CRYPTO_H
#include <stdbool.h> #include <stdbool.h>
#if (GMIME_MAJOR_VERSION < 3)
#include "gmime-extra.h" #include "gmime-extra.h"
#include "notmuch.h" #include "notmuch.h"
#endif
typedef struct _notmuch_crypto { typedef struct _notmuch_crypto {
bool verify; bool verify;
@ -17,6 +15,11 @@ typedef struct _notmuch_crypto {
#endif #endif
} _notmuch_crypto_t; } _notmuch_crypto_t;
GMimeObject *
_notmuch_crypto_decrypt (GMimeCryptoContext* crypto_ctx,
GMimeMultipartEncrypted *part,
GMimeDecryptResult **decrypt_result,
GError **err);
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
notmuch_status_t notmuch_status_t