X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=mime-node.c;h=daaae9f81ad5d510ed798aa20f55c7d14efe029a;hb=a99058540823cd520cf2a5333e8ffe99799aa285;hp=7c8b26024460346ff3387df68234dddfd1256a36;hpb=9beda4b9811323d1fd9eb120d6e7a2ef69beed14;p=notmuch

diff --git a/mime-node.c b/mime-node.c
index 7c8b2602..daaae9f8 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -198,13 +198,16 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
     GMimeDecryptResult *decrypt_result = NULL;
     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) {
+	mime_node_t *parent;
+	for (parent = node; parent; parent = parent->parent)
+	    if (parent->envelope_file)
+		break;
+
+	node->decrypt_attempted = true;
+	node->decrypted_child = _notmuch_crypto_decrypt (parent ? parent->envelope_file : NULL,
+							 cryptoctx, encrypteddata, &decrypt_result, &err);
+    }
     if (! node->decrypted_child) {
 	fprintf (stderr, "Failed to decrypt part: %s\n",
 		 err ? err->message : "no error explanation given");