7 files changed, 377 insertions, 0 deletions
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart
new file mode 100644
index 0000000000..5a1a1c2fdc
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart
@@ -0,0 +1,54 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-384; 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.SHA384.multipart.bad.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.bad.eml
new file mode 100644
index 0000000000..1423fa9482
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.bad.eml
@@ -0,0 +1,60 @@
+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.SHA384
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-384; 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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
+tsxPOCAraEuvsJffxIEaQYLrpeVKAAAAAAAA
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml
new file mode 100644
index 0000000000..a81560e276
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml
@@ -0,0 +1,60 @@
+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.SHA384
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-384; 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
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgIFADCABgkqhkiG9w0B
+BwEAAKCCA2IwggNeMIICRqADAgECAgEeMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBW
+aWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4X
+DTIzMTEyMTIwNTAzNloXDTI4MTEyMTIwNTAzNlowgYAxCzAJBgNVBAYTAlVTMRMw
+EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYD
+VQQKEwlCT0dVUyBOU1MxIDAeBgkqhkiG9w0BCQEWEUFsaWNlQGV4YW1wbGUuY29t
+MQ4wDAYDVQQDEwVBbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ66YRMPyB5Xjh5p6xY6mFjX8K52pJ/VR7yVYgq8jtBjjqUlBS20kwJdOemp4evE
+g76M7lhfmytro7LSlV28uUV/EmHLnNb9c9FjBg69UuX0P3TxJs7oi1ukrOAni35p
+Phd6mj+mBmhC7GaBLOn1HJdxTzDH/NSnWMhZct1Y9rR1RWPEbCVqA/UM61qXFpMc
+i+UQ/Lg7YxjrfowlWdQSeztQPyaMYpO2GbZN+b2daL2KAEO0Ac04e4Koaoog/ZhG
+K8JAquOkgrPsl3mnhdjOrZQ1la4a3jLNs7MJpRSwmXzq/iAMLEoHs+6+rOery0UH
+uTsFoD0UckN90CG7He3Ji90CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAh0Sv0k33
+8LqiPJRiDOGXUQzWl8uT7pJm03+JfBLml4yiVsMuZWv03TsaaoObW3+5NQFsgPPA
+lSo0JzJ6l6m3g/6mlFA1MxiP9i7cTWc3GOQWlOT2rrx5ZQ3auB6Y7lHyKLqb4+9V
+3bF7751Ww2IDmVw21kSrm8t28mHp4boEy7HduwOP1ZHi7vd65aSWl0uhInsRKkPS
+jXxIPWWsyt02JQJUAzKfyMm+9llQiZiydT0rGwypaYjDsy0y/CcbCEQSE1i5CxG+
+mYywW7woGvSoC/lp6c9OpHqlG7ToOgQYwTol8Nj2OWj1TUQmXS7o7sY8KjDeyWZw
+5kM9Ax/dtG6dvzGCAwcwggMDAgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
+R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAICBQCg
+ggFvMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIz
+MTEyMTIwNTIwOFowPwYJKoZIhvcNAQkEMTIEMFHSxq+v2uYEt+1Cl18IAFzsK6a/
+jcQXxa6IzEYbHrHifrdlGO5onbLdf1KfAHKiPTB4BgkrBgEEAYI3EAQxazBpMGQx
+CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3Vu
+dGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0
+IENBAgEeMHoGCyqGSIb3DQEJEAILMWugaTBkMQswCQYDVQQGEwJVUzETMBEGA1UE
+CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJ
+Qk9HVVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjANBgkqhkiG9w0BAQEF
+AASCAQB6l943JrgvaAWL7sW/rbb2DdlcnJXS3o5hFDqe32YNBXNITY5xP9F3vrgJ
+TS54PWaJ9f7eD6HLaU77l98ySgkrxPHoP/EFHNmuO1a/T6PSuc3YkVxhXoIkJSz8
+3TEyTpuRm5UwBAjwZEV8BaKiq6bFi803L5NUEuRibrlQ3C/MldoDEd+7/0sAb0Md
+JPgD7R5oZZWEtosxH6B60tgH0Daotx/AZkNcjLrZ3YH6iHjUJKkQAPpUacGJChNj
+ibFZu57S3KjJSd3wfWfQk44bGYevMZGqXLl8PQMoOZQD1coWpLBvY1hZUeHGUyvC
+tsxPOCAraEuvsJffxIEaQYLrpeVKAAAAAAAA
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env
new file mode 100644
index 0000000000..07f2160fba
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml
new file mode 100644
index 0000000000..8151234896
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml
@@ -0,0 +1,85 @@
+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.SHA384
+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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
+EFRZEjk7+hbeGdekn0pePRwAAAAAAAAAAAAA
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent
new file mode 100644
index 0000000000..827bb480c4
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent
@@ -0,0 +1,56 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-384; 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.SHA384.multipart.mismatch-econtent.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent.eml
new file mode 100644
index 0000000000..6772b1bbbe
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent.eml
@@ -0,0 +1,62 @@
+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.SHA384
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-384; 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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
+YuZE1YxxAAAAAAAA
+--------------ms030903020902020502030404--
+