diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2020-05-12 18:29:38 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-05-22 22:11:51 -0300 |
| commit | cb88b51fe55fcb01235747d4b94072fa6efd501c (patch) | |
| tree | 28aa38afdbcefc82013e0ad7ea106547b13a18dd /test | |
| parent | 1a34f68a584c2731d33cd5d2a4ee4e6d7faf6a83 (diff) | |
smime: Pass PKCS#7 envelopedData to node_decrypt_and_verify
This change means we can support "notmuch show --decrypt=true" for
S/MIME encrypted messages, resolving several outstanding broken tests,
including all the remaining S/MIME protected header examples.
We do not yet handle indexing the cleartext of S/MIME encrypted
messages, though.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T355-smime.sh | 2 | ||||
| -rwxr-xr-x | test/T356-protected-headers.sh | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/T355-smime.sh b/test/T355-smime.sh index 8d225bc1..1f11725f 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -80,7 +80,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Decryption (notmuch CLI)" -test_subtest_known_broken notmuch show --decrypt=true subject:"test encrypted message 001" |\ grep "^This is a" > OUTPUT cat <<EOF > EXPECTED @@ -89,7 +88,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Cryptographic message status (encrypted+signed)" -test_subtest_known_broken output=$(notmuch show --format=json --decrypt=true subject:"test encrypted message 001") test_json_nodes <<<"$output" \ 'crypto_encrypted:[0][0][0]["crypto"]["decrypted"]["status"]="full"' \ diff --git a/test/T356-protected-headers.sh b/test/T356-protected-headers.sh index 5beffaf0..074a2345 100755 --- a/test/T356-protected-headers.sh +++ b/test/T356-protected-headers.sh @@ -173,7 +173,6 @@ done for variant in sign+enc sign+enc+legacy-disp; do test_begin_subtest "confirm signed and encrypted PKCS#7 subject ($variant)" - test_subtest_known_broken output=$(notmuch show --decrypt=true --format=json "id:smime-${variant}@protected-headers.example") test_json_nodes <<<"$output" \ 'signed_subject:[0][0][0]["crypto"]["signed"]["headers"]=["Subject"]' \ @@ -181,14 +180,15 @@ for variant in sign+enc sign+enc+legacy-disp; do 'sig_fpr:[0][0][0]["crypto"]["signed"]["status"][0]["fingerprint"]="702BA4B157F1E2B7D16B0C6A5FFC8A7DE2057DEB"' \ 'encrypted:[0][0][0]["crypto"]["decrypted"]={"status":"full","header-mask":{"Subject":"..."}}' test_begin_subtest "confirm signed and encrypted PKCS#7 subject ($variant) 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" \ 'sig_uid:[0][0][0]["crypto"]["signed"]["status"][0]["userid"]="CN=Alice Lovelace"' done test_begin_subtest "confirm encryption-protected PKCS#7 subject (enc+legacy-disp)" -test_subtest_known_broken output=$(notmuch show --decrypt=true --format=json "id:smime-enc+legacy-disp@protected-headers.example") test_json_nodes <<<"$output" \ 'encrypted:[0][0][0]["crypto"]["decrypted"]={"status":"full","header-mask":{"Subject":"..."}}' \ |