Signed-off-by: Daniel Kahn Gillmor <d...@fifthhorseman.net>
---
lib/index.cc | 5 +++--
test/T355-smime.sh | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/index.cc b/lib/index.cc
index da9a3abe..826aa341 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -656,8 +656,9 @@ _index_pkcs7_part (notmuch_message_t *message,
_index_mime_part (message, indexopts, toindex, msg_crypto);
} else if (p7type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) {
_notmuch_message_add_term (message, "tag", "encrypted");
- if (notmuch_indexopts_get_decrypt_policy (indexopts) !=
NOTMUCH_DECRYPT_FALSE)
- _notmuch_database_log (notmuch, "Cannot decrypt PKCS#7
envelopedData (S/MIME encrypted messages)\n");
+ _index_encrypted_mime_part (message, indexopts,
+ part,
+ msg_crypto);
} else {
_notmuch_database_log (notmuch, "Cannot currently handle PKCS#7
smime-type '%s'\n",
g_mime_object_get_content_type_parameter (part,
"smime-type"));
diff --git a/test/T355-smime.sh b/test/T355-smime.sh
index 1f11725f..170f8649 100755
--- a/test/T355-smime.sh
+++ b/test/T355-smime.sh
@@ -107,12 +107,10 @@ test_begin_subtest "Reindex cleartext"
test_expect_success "notmuch reindex --decrypt=true subject:'test encrypted
message 001'"
test_begin_subtest "signature is now known"
-test_subtest_known_broken
output=$(notmuch search subject:"test encrypted message 001")
test_expect_equal "$output" "thread:0000000000000002 2000-01-01 [1/1]
Notmuch Test Suite; test encrypted message 001 (encrypted inbox signed)"
test_begin_subtest "Encrypted body is indexed"
-test_subtest_known_broken
output=$(notmuch search 'this is a test encrypted message')
test_expect_equal "$output" "thread:0000000000000002 2000-01-01 [1/1]
Notmuch Test Suite; test encrypted message 001 (encrypted inbox signed)"
--
2.26.2
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
