debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-30 14:44:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

smime: Index cleartext of envelopedData when requested

Browse source 
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2020-05-12 18:29:39 -04:00 committed by David Bremner
parent cb88b51fe5
commit 6cdf4b7e38
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/index.cc
View file

@ -656,8 +656,9 @@ _index_pkcs7_part (notmuch_message_t *message,
_index_mime_part (message, indexopts, toindex, msg_crypto); _index_mime_part (message, indexopts, toindex, msg_crypto);
} else if (p7type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) { } else if (p7type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) {
_notmuch_message_add_term (message, "tag", "encrypted"); _notmuch_message_add_term (message, "tag", "encrypted");
if (notmuch_indexopts_get_decrypt_policy (indexopts) != NOTMUCH_DECRYPT_FALSE) _index_encrypted_mime_part (message, indexopts,
_notmuch_database_log (notmuch, "Cannot decrypt PKCS#7 envelopedData (S/MIME encrypted messages)\n"); part,
msg_crypto);
} else { } else {
_notmuch_database_log (notmuch, "Cannot currently handle PKCS#7 smime-type '%s'\n", _notmuch_database_log (notmuch, "Cannot currently handle PKCS#7 smime-type '%s'\n",
g_mime_object_get_content_type_parameter (part, "smime-type")); g_mime_object_get_content_type_parameter (part, "smime-type"));

2
test/T355-smime.sh
View file

@ -107,12 +107,10 @@ test_begin_subtest "Reindex cleartext"
test_expect_success "notmuch reindex --decrypt=true subject:'test encrypted message 001'" test_expect_success "notmuch reindex --decrypt=true subject:'test encrypted message 001'"
test_begin_subtest "signature is now known" test_begin_subtest "signature is now known"
test_subtest_known_broken
output=$(notmuch search subject:"test encrypted message 001") 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_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_begin_subtest "Encrypted body is indexed"
test_subtest_known_broken
output=$(notmuch search 'this is a test encrypted message') 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)" test_expect_equal "$output" "thread:0000000000000002 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message 001 (encrypted inbox signed)"