7 files changed, 372 insertions, 0 deletions
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart
new file mode 100644
index 0000000000..d5215872b3
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart
@@ -0,0 +1,54 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+This is a test message from Alice to Bob.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+xieMAAAAAAAA
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml
new file mode 100644
index 0000000000..200c40916b
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml
@@ -0,0 +1,59 @@
+MIME-Version: 1.0
+Date: Tue, 21 Nov 2023 20:50:06 +0000
+From: Alice@example.com
+To: Bob@example.com
+Subject: BAD clear-signed sig.SHA1
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+This is a FAKE message NOT from Alice to Bob.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml
new file mode 100644
index 0000000000..49c7722d29
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml
@@ -0,0 +1,59 @@
+MIME-Version: 1.0
+Date: Tue, 21 Nov 2023 20:50:06 +0000
+From: Alice@example.com
+To: Bob@example.com
+Subject: clear-signed sig.SHA1
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+This is a test message from Alice to Bob.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env
new file mode 100644
index 0000000000..7ae46f6c8a
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml
new file mode 100644
index 0000000000..9fc5639e62
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml
@@ -0,0 +1,84 @@
+MIME-Version: 1.0
+Date: Tue, 21 Nov 2023 20:50:06 +0000
+From: Alice@example.com
+To: Bob@example.com
+Subject: clear-signed then enveloped sig.SHA1
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+    smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+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
+EOmuA/ZN/RPo9TjuvjEKn5oAAAAAAAAAAAAA
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent
new file mode 100644
index 0000000000..861f10e1e9
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent
@@ -0,0 +1,55 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+This is a FAKE message NOT from Alice to Bob.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
+JIAER0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpbg0KDQpUaGlzIGlzIGEgdGVzdCBt
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
+AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
+bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
+IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMTkwNzAzMTczMDA3WhcNMjQw
+NzAzMTczMDA3WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
+FjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEgMB4G
+CSqGSIb3DQEJARYRQWxpY2VAZXhhbXBsZS5jb20xDjAMBgNVBAMTBUFsaWNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4F8PZSndSoPhUMMdVU8cIVqW
+Px1Hg+OUZzfTk7vf8dnwOWJqtoT6O+5Ff432kPbIdjIm3m7Seo0eBC1s1W0z2kYz
+tPkVCzSlAfMg/5bEpkPgVSWQjn2LxsYuDHRzrr/QnwUg+ZdwIFps29PcK8XFQeaK
+Nc/rm4UYhRTZ34iEUQf7QQVSQZaxPZCunxj+qk+T1KaIKd/KCLJX9hFXybbGM5TT
+0BaxQahdtls4aUnymmhoqQ3fJJwRIB6Lth/m1TPvKE5Xj6boivY0A0DGhFWNZmxO
+vDUJa9HcMwc3MamgzZdxnp41BawL6Vkwq1SzwCcqIBaM1kVaUYvGsAGl4H5xBwID
+AQABMA0GCSqGSIb3DQEBCwUAA4IBAQA0+5CEGeVmPLNJkwDBP8DPzobniH+y/s38
+aNRu24qJuvB522+HW+6BMwZW+Le/PFojvUPSQjgL4YFDvKnjtC/YarPiO3e3Q9hi
+lMRldunE1Yl8Ldh61zbNLP/JLgHroICza2F5YIb42qzAANeJqbZT+08ybxBiUJZl
+q2v0L+S2bLPhS4Jb1sNIQi3BnL5f/nlnpi3TsWgLH9lN2CDeMK3A6qSaEgZ8pdA8
+pHLRzJGD2mHUaXvUY/lrl76xYXuwqYlJDg+0vI8T/f0RC7FHPTdbqJZjutbvpm5E
+anXzRVL/rv3YzMYz767Xp22Qf9Tk+fOpUbsIvdj4f96+ytVusgx1MYICyTCCAsUC
+AQEwaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtO
+U1MgVGVzdCBDQQIBHjAJBgUrDgMCGgUAoIIBNTAYBgkqhkiG9w0BCQMxCwYJKoZI
+hvcNAQcBMCMGCSqGSIb3DQEJBDEWBBQ6lsBnOgG++otJRrNIvABL/tlP9DB4Bgkr
+BgEEAYI3EAQxazBpMGQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDAS
+BgNVBAMTC05TUyBUZXN0IENBAgEeMHoGCyqGSIb3DQEJEAILMWugaTBkMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
+VmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIB
+HjANBgkqhkiG9w0BAQEFAASCAQA3Ola6Yh8cBgYxColrYgWEVCRuAfcPDc+iX7EK
+5R5WDLEJL/6nLXTn8bi7ysnDUmeocPtyzxXh6vSx30D45WbsuYV1qZbXJGfe3xgM
+yGaYI99VRe2kuduA6rqNstg8MEpyjSTd0pQVekKdQLVWRoOF+7s8v32m4m1noGu6
+jHAsXcbb00Ck1WciSjOswXFCR6xm1o2nAQwzMpMSjclbXvi0epLOJpU2ww7mLG45
+LGMIV4SYMhP0v6sL/UUpmth4piL7OmhEfzXOvmKRxhaHkREdHJK1LUoCjLZ616Uo
+ZhbZrJSMf9uyftdsJXjML++R9Xh22MOqwP1FkejdiLNzqbXJAAAAAAAA
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml
new file mode 100644
index 0000000000..bc85350c5c
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml
@@ -0,0 +1,61 @@
+MIME-Version: 1.0
+Date: Tue, 21 Nov 2023 20:50:06 +0000
+From: Alice@example.com
+To: Bob@example.com
+Subject: BAD mismatch-econtent sig.SHA1
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+This is a FAKE message NOT from Alice to Bob.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
+JIAER0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpbg0KDQpUaGlzIGlzIGEgdGVzdCBt
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
+AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
+bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
+IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMjMxMTIxMjA1MDM2WhcNMjgx
+MTIxMjA1MDM2WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
+FjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEgMB4G
+CSqGSIb3DQEJARYRQWxpY2VAZXhhbXBsZS5jb20xDjAMBgNVBAMTBUFsaWNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnrphEw/IHleOHmnrFjqYWNfw
+rnakn9VHvJViCryO0GOOpSUFLbSTAl056anh68SDvozuWF+bK2ujstKVXby5RX8S
+Ycuc1v1z0WMGDr1S5fQ/dPEmzuiLW6Ss4CeLfmk+F3qaP6YGaELsZoEs6fUcl3FP
+MMf81KdYyFly3Vj2tHVFY8RsJWoD9QzrWpcWkxyL5RD8uDtjGOt+jCVZ1BJ7O1A/
+Joxik7YZtk35vZ1ovYoAQ7QBzTh7gqhqiiD9mEYrwkCq46SCs+yXeaeF2M6tlDWV
+rhreMs2zswmlFLCZfOr+IAwsSgez7r6s56vLRQe5OwWgPRRyQ33QIbsd7cmL3QID
+AQABMA0GCSqGSIb3DQEBCwUAA4IBAQCHRK/STffwuqI8lGIM4ZdRDNaXy5PukmbT
+f4l8EuaXjKJWwy5la/TdOxpqg5tbf7k1AWyA88CVKjQnMnqXqbeD/qaUUDUzGI/2
+LtxNZzcY5BaU5PauvHllDdq4HpjuUfIoupvj71XdsXvvnVbDYgOZXDbWRKuby3by
+YenhugTLsd27A4/VkeLu93rlpJaXS6EiexEqQ9KNfEg9ZazK3TYlAlQDMp/Iyb72
+WVCJmLJ1PSsbDKlpiMOzLTL8JxsIRBITWLkLEb6ZjLBbvCga9KgL+Wnpz06keqUb
+tOg6BBjBOiXw2PY5aPVNRCZdLujuxjwqMN7JZnDmQz0DH920bp2/MYIC5zCCAuMC
+AQEwaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtO
+U1MgVGVzdCBDQQIBHjAJBgUrDgMCGgUAoIIBUzAYBgkqhkiG9w0BCQMxCwYJKoZI
+hvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMzExMjEyMDUyMDVaMCMGCSqGSIb3DQEJ
+BDEWBBQ6lsBnOgG++otJRrNIvABL/tlP9DB4BgkrBgEEAYI3EAQxazBpMGQxCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFp
+biBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENB
+AgEeMHoGCyqGSIb3DQEJEAILMWugaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMK
+Q2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9H
+VVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjANBgkqhkiG9w0BAQEFAASC
+AQCC8kXRuO8IiCkyCMhOAp+URAoBKsokWbpFG8Vmr0GFge7+rOoOeBwJk+n9Lq0y
+CsPyOEKe1oPOPAcU48R/B6eh9wfdMcWTdmg0RxxptQIsE7D37ETRr4aG0kPMD5Ay
+fGsEttlXprBwrsClr3skd05QNlFPEhEsp/SYBeNl21oJhFeGq9kxDfP5VJ0vVMEb
+XEjdP/YiJFBiwX/es7p2BNnmzVPgquHRMtN7ZIR8y3c6PgHovAzxvxhVYrKuxaEp
+u0oKkS+CEQasNYF8nOOkT6ER9KnM9G/wA1aQflDtR9Lf9gn/QVb12HnVoWhUSKtQ
+e9uhSUBVTeVrORDGqQAVtDCSAAAAAAAA
+--------------ms030903020902020502030404--
+