diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2020-05-12 18:29:34 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-05-22 22:11:17 -0300 |
| commit | f12fb4d819956cb467b22183f0416fed44703d0f (patch) | |
| tree | 9c24a969cdb4e8294590acd064d7442ec3a04901 /test/T355-smime.sh | |
| parent | 5f4aceee26ca6db3cdd09ff69220a63e07976a01 (diff) | |
cli/show: If a leaf part has children, show them instead of omitting
Until we did PKCS#7 unwrapping, no leaf MIME part could have a child.
Now, we treat the unwrapped MIME part as the child of the PKCS#7
SignedData object. So in that case, we want to show it instead of
deliberately omitting the content.
This fixes the test of the protected subject in
id:smime-onepart-signed@protected-headers.example.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'test/T355-smime.sh')
| -rwxr-xr-x | test/T355-smime.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/T355-smime.sh b/test/T355-smime.sh index 4de0fbef..03aada20 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -177,12 +177,10 @@ On Tue, 26 Nov 2019 20:11:29 -0400, Alice Lovelace <alice@smime.example> wrote: test_expect_equal "$expected" "$output" test_begin_subtest "show PKCS#7 SignedData outputs valid JSON" -test_subtest_known_broken output=$(notmuch show --format=json id:smime-onepart-signed@protected-headers.example) test_valid_json "$output" test_begin_subtest "Verify signature on PKCS#7 SignedData message" -test_subtest_known_broken output=$(notmuch show --format=json id:smime-onepart-signed@protected-headers.example) test_json_nodes <<<"$output" \ @@ -192,7 +190,9 @@ test_json_nodes <<<"$output" \ 'status:[0][0][0]["crypto"]["signed"]["status"][0]["status"]="good"' test_begin_subtest "Verify signature on PKCS#7 SignedData message signer User ID" -test_subtest_known_broken +if [ $NOTMUCH_GMIME_X509_CERT_VALIDITY -ne 1 ]; then + test_subtest_known_broken +fi test_json_nodes <<<"$output" \ 'userid:[0][0][0]["crypto"]["signed"]["status"][0]["userid"]="CN=Alice Lovelace"' |