diff options
| -rw-r--r-- | show-message.c | 2 | ||||
| -rwxr-xr-x | test/crypto | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/show-message.c b/show-message.c index 37252b22..849c6862 100644 --- a/show-message.c +++ b/show-message.c @@ -105,8 +105,6 @@ show_message_part (GMimeObject *part, } if ((selected || state->in_zone) && format->part_sigstatus) format->part_sigstatus (sigvalidity); - /* extract only data part, and ignore signature part */ - part = g_mime_multipart_get_part (multipart, 0); if (sigvalidity) g_mime_signature_validity_free (sigvalidity); } diff --git a/test/crypto b/test/crypto index 21a60139..02516430 100755 --- a/test/crypto +++ b/test/crypto @@ -57,8 +57,12 @@ expected='[[[{"id": "XXXXX", "sigstatus": [{"status": "good", "fingerprint": "'$FINGERPRINT'", "created": 946728000}], + "content-type": "multipart/signed", + "content": [{"id": 2, "content-type": "text/plain", - "content": "This is a test signed message.\n"}]}, + "content": "This is a test signed message.\n"}, + {"id": 3, + "content-type": "application/pgp-signature"}]}]}, []]]]' test_expect_equal \ "$output" \ @@ -88,8 +92,12 @@ expected='[[[{"id": "XXXXX", "fingerprint": "'$FINGERPRINT'", "created": 946728000, "userid": " Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}], + "content-type": "multipart/signed", + "content": [{"id": 2, "content-type": "text/plain", - "content": "This is a test signed message.\n"}]}, + "content": "This is a test signed message.\n"}, + {"id": 3, + "content-type": "application/pgp-signature"}]}]}, []]]]' test_expect_equal \ "$output" \ @@ -117,8 +125,12 @@ expected='[[[{"id": "XXXXX", "sigstatus": [{"status": "error", "keyid": "'$(echo $FINGERPRINT | cut -c 25-)'", "errors": 2}], + "content-type": "multipart/signed", + "content": [{"id": 2, "content-type": "text/plain", - "content": "This is a test signed message.\n"}]}, + "content": "This is a test signed message.\n"}, + {"id": 3, + "content-type": "application/pgp-signature"}]}]}, []]]]' test_expect_equal \ "$output" \ @@ -320,8 +332,12 @@ expected='[[[{"id": "XXXXX", "sigstatus": [{"status": "error", "keyid": "6D92612D94E46381", "errors": 8}], + "content-type": "multipart/signed", + "content": [{"id": 2, "content-type": "text/plain", - "content": "This is a test signed message.\n"}]}, + "content": "This is a test signed message.\n"}, + {"id": 3, + "content-type": "application/pgp-signature"}]}]}, []]]]' test_expect_equal \ "$output" \ |