cli/reindex: destroy stashed session keys when --decrypt=false

[notmuch] / lib / index.cc

diff --git a/lib/index.cc b/lib/index.cc
index 6eb60f300a87e10fa1527467de6ecec00095d6c7..3914012afddc1a25832e180ec6e3cae2be467483 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -525,7 +525,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
     notmuch_database_t * notmuch = NULL;
     GMimeObject *clear = NULL;
 
-    if (!indexopts || !notmuch_indexopts_get_try_decrypt (indexopts))
+    if (!indexopts || (notmuch_indexopts_get_decrypt_policy (indexopts) == NOTMUCH_DECRYPT_FALSE))
        return;
 
     notmuch = _notmuch_message_database (message);
@@ -548,11 +548,19 @@ _index_encrypted_mime_part (notmuch_message_t *message,
        }
     }
 #endif
-    clear = _notmuch_crypto_decrypt (message, 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);
-       g_error_free(err);
+    bool attempted = false;
+    clear = _notmuch_crypto_decrypt (&attempted, notmuch_indexopts_get_decrypt_policy (indexopts),
+                                    message, crypto_ctx, encrypted_data, NULL, &err);
+    if (!attempted)
+       return;
+    if (err || !clear) {
+       if (err) {
+           _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n",
+                                  err->domain, err->code, err->message);
+           g_error_free(err);
+       } else {
+           _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (unknown error)\n");
+       }
        /* Indicate that we failed to decrypt during indexing */
        status = notmuch_message_add_property (message, "index.decryption", "failure");
        if (status)