7 files changed, 379 insertions, 0 deletions
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart
new file mode 100644
index 0000000000..1960da58a8
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart
@@ -0,0 +1,55 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; 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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
+oLOutbnYBQAAAAAAAA==
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.bad.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.bad.eml
new file mode 100644
index 0000000000..c5ec8af01e
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.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.SHA512
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; 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.SHA512.multipart.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.eml
new file mode 100644
index 0000000000..2115292414
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.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.SHA512
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; 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
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgMFADCABgkqhkiG9w0B
+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/dtG6dvzGCAxcwggMTAgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
+R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIDBQCg
+ggF/MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIz
+MTEyMTIwNTIxMFowTwYJKoZIhvcNAQkEMUIEQIDtIdbNbMpZ5GN0mWvd8LPPByCC
+dkoPPPx0FE23D5CwnagYOMkbOV35hzVG+C0VDZqE+HLxo4Ki0iR/UTmAz5kweAYJ
+KwYBBAGCNxAEMWswaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5p
+YTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQw
+EgYDVQQDEwtOU1MgVGVzdCBDQQIBHjB6BgsqhkiG9w0BCRACCzFroGkwZDELMAkG
+A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWlu
+IFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EC
+AR4wDQYJKoZIhvcNAQEBBQAEggEAFYqoaQ1WZBzIZr2ETwX9Zj2NU13Cp2HmCfrF
+AagfrDpd3rcuo2q66Eagv7nnEmviP7vV8ouqAHMRr0p3Q+8mS24XbCAKo30mh8/Q
+EaHl6sc42SVwJD9zhAfaMzwqKuN5wUEMYApYtg7xv1aaaWq+mzhC13O5aTjD9168
+tY60cUfGKlcg8qhXbkB4kPEZhsGOESkFfn81sD9Ug1FhQ0apYnjLHvBtwy4Zd2t+
+lmfywK6y8udNRmNDSlinfqF0XLnvmPyMVqZ03QDdCnbCGPzem2Zoq0b4Bv1P8NjK
+KEAW4jBPoy3A2/83gKCyFfllHIX1nlQ12uc3Mb4CqdlxAqeQlgAAAAAAAA==
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env
new file mode 100644
index 0000000000..2f09f19f96
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml
new file mode 100644
index 0000000000..32612a28ca
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml
@@ -0,0 +1,86 @@
+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.SHA512
+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
+
+MIAGCSqGSIb3DQEHA6CAMIACAQAxggGFMIIBgQIBADBpMGQxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIw
+EAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEoMA0GCSqG
+SIb3DQEBAQUABIIBAIf0ggJUZgsEe+JFBXA/FFd3vFU/K7klhDqTf51UD6kui+TV
+3t6UjkTJJDmbEwOJ4Ma8xE10PNP5nBfk2bbNrR0WJB/dwamlcBLcyQmzhSN6sVji
+QIgrZm5X0uKtXnx18+ffAB71KwL4eB9rYr2UMMvQsCIQXU0TMIHJIUltB2SJiFXM
+WwTmEtakzOzxmpBlpWmPGD72/4VOqFMdIVOBGnP4Dg1luFVknHWtcmKpTnte1k3i
+t5zpJf3EuuYDEJbl5XnjyhTAv56x1lm4t0NXvtsKh9hjxdOYLXhajbXEhQ/gXrGh
+myxwQgOpLZZ2oluE+QaKAK3JqyU1feKaHxfwUl0wgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQie4U4HbZUzxIwiexvDB11qCABIIL0KYQgzWfCDawywh7eB9sWnT5
+O0I4g8Y1D7qSa+KY3rgBzurEE1V8gfmPOgRbmlVLfrnlAQrsFKjzozUXllAmIQGs
+UBI6c3+yiW9HgIaoe3RyPJcgDj19Qd/+43dZW+kMC2dAU26jwAb9JG0GW8u5naCG
+QD1PaCFyq1eO6E9imh2any4W/L/HmvrjROGqYSvIr6LMjiPuhJG3tDkcxEFrEgHQ
++gEkAdhr9TmTx8G+vUSbk9owJCf1lz8G1WELRQcdEqpSPkuAnzpjjExpuRsOuB6S
+OcfRGvqlOeB9KzJ9te3/0y/d4iCtY0c38WvAdxXxuxw+NLLRd+9CinHcVK9s9p19
+oPx2k7OndlBeqSjvHui3dznSG3w2njzJi5oxq3Gu3Qnrc63BlaXPfGxIUvfQ+GJ9
++7u3xi6MH3gxvaS4JSITRjf+LuVjv1eqquDWrdz2kd4FUdjk2ie6i0N/tmmxO88I
+8wVhABetEDIBc46A/dHPtuqrsFFYyAgmCq8sdXrFapqB0yzh/LZpLvx6fA4sagIN
+SIHPJUnE1wpt8CXN4TteTyVcq485dmqj7PtqYvIutEqNa5vt5LeSLz27UE6QgkiN
+TT+P65hc6B62jeBl53YxYYF6UjBYugsgQT5FwqjirVuTppv+j/kFf/KI8UKpfwzz
+AfNDGKLgRJiy4vRCst0zyUUkFjq2C14X0M2K0kRk/GhFUkqOT7MuYNMs45qo5mKa
+lOp/uR8COkONGkKx/hHaqHeKYiS5czQsrhnpIJ3sDVO3WPvnB3qcaH52hig2EI8t
+nC2GkMnknfJ/Pka/R2lG083hSp1cCfbQbj4txoO60JpCQ8hRIKhiU00lNNixJxbP
+QrlBa2UfPajVqlnxTzemiS8fEF9cjQ6v9AC9J+YVablxgxFquPX2Nq2aH9WZUcMd
+DVTlERtqWbbZLEiFq5ND4+xaw8Q7GSublrdlWgucHhaRAOG+9Z5aSABKi2BoHiI2
+MTzyEC0rGPuEfDRLWg19xhYAAAAS2WlKgYXQqCKJ9g6CnuPiMT7fhtD5J3hPQLcQ
+EuVrBT4Me73IB3tw+cp9Ih5ntcYtj7NSilb+gj+v5nmE1InbKU25z1eIJM46fYUz
+rS/wXkb8+TiqzBvUVwMxpyWV1jIXrahcftkPN4ewEUq6apxiVLpz2oVUQKgguN2c
+HFqzY1RuByP2Zyv71yHGFXnBIOtJZHp2RnFcEBM9EIfVxd5aCUodqDPNqrsFqPld
+pKdWgFrCHrIkMiqw6vixO2emv23BnNJ20BWa2nFuzDdebpILwO0dcELJHoKh1Ack
+HlwZiIgkIl+ZQgwRnAupDZHG0dTEUemKWGL5vSPQAYSwW/+okDcvHXGqacFF2McC
+WX5doKSML0nU4Nr74cNiH30UkFLi/YaJIFtapVJOSN/3aFW+QMl52XAkteSvPY8Y
+O/Qp81C+alYQEvF1ncKUgByQchTcFdouV/R9B+LIjM0vlqZOM9/+KQ4GZJV4Pw4E
+sAewu+ElGE2nb6Vk1BI9Rxutg1I/84RY2pbXGEBuhHJUwJapsc/kMMO5db52FPNS
+vBtIfrlKTUYGCb5lsQpF0hdYOabhRRpPHkU4UAHV1u+heExgbG8cieeo4/xzf43U
+UvIs/OIi0sEucDOnOzkCAlwiiaRKmnOcYsjMUbIYFHT9kqshO9TxDdEiOCGr88f8
+lwu+K203gVrlWwE5QXCwxb/48E02fcmfJz/R+yh7q4Hus6GIbPGZWIIMIeenRfcU
+/l01SZ05pyJ6HknD/ORKY4KCnheMhIgwu5UqdZdADr4cb3N5ppAtTk97zmwIrPAS
+p7prkRNi4cI8af1P70xaX7wPkAu2SAdaRmXEwrf27fTohwpkev6YPIdHxv20NMEW
+dRoD+3f8hzFP6L8v3bL0TPaMo7LegGse4pZoz4qsI4EtZ1Vb/kZQKGHWuiQppNTw
+BbQIhvyzg58vA0vA3Gz7LrnmZVmHfKbsv2XsMNIGR/JwyVxLyUE1VdLX4r1oXUul
+BpYxhQkBsZaYTBys56BNPIHzPvm+6poiqtNhKXB/TlszulSXqodcW5E/1a+JZ4fH
+RpS0t0FIAgYWwrSmJMXftUIZhse7TmY6Jg8CJs8WrID25cxrXPQeRU4rR9xCJ/xd
+uAAcFQZu+AXlG3in/tGQNT/AZd1zyLVLEaprh7tfrFXsqxIrbhLzE9C14Zbv4LeK
+vWMb5bIzY86LYVJrufGv8jX9h0cd/A6oQZEEkoj96CSEmEYJ/ka40q21C0axvGij
+h/3UKrd8TLBKGn96lS4/o6ZWMsEirPEWBaPZGK2bj0Tp2TbLBxM8EPeFvihInptA
+FGPqn2jUrVogZ+96TXMHsWaVnawX1zLHcS/adb6jswCCykw6kHH93+G0PX3LSRvf
+SvncTMx0banRuRdBGYYf2wdtl2KNaXsJ3WjK3+uRxuwBS5ONtPA3r2bv/R7Qg0be
+NniGFwfwfTri8JwIz52PDain1Gr1NLamcoZQlpOQDqfAikUsjtwpDDFwL8ECpC9J
+/0yptvFIVgGCtcmHHYKgxS1ebigrWVBRB/vXvQG5+auXJ+UI2s53VBADAjoc53yJ
+XzF9Ljo0uedqmdPmN07JGC99FPuy+Tjd5HmloFHA3tfAqPIN2RDZDA++sGOANz71
+SNhDM9qOhkqCieRCzfbE8DcosZoMKCxN0Adm+/mF18RFcrkhRqSapZMvl11Z5Hbh
+zxWJIDQPiyzbQpFWWe8cpDnVzAWC28T/BU2XUounKlHzfL5G2AK7vOy0UQ7uN/vP
+JMjanqbm9FPl+RliECblNUO09k7bR3y72YCMJRilTfv2b1bO3wRjWXSkxgUJ/YSF
+NLgC88u4jk2VynbkqxKtGdus7gDuZvTe5GAa3aR21bP8j++R0ODMNHtKfnmGFLMU
+irFElsJQpej/gtWXDMMsqkMR4WCUm6fkYM4dPbVmxpEbOnWVX4hjqBtiZMKvuCVh
+tW4jDrbvgiZ42f5GpZfE0A0ywzAqEcjXXvx/+8bkC7oYeCFBw8QLbpNcC38hfgcX
+AHYUNC0oPcvRpp5PHmH/tuASnyehv12VaGp/0r2dN+wLbdgCoNaeS98A9wqOsqiA
+JOe/4ka15mqr5aSqoFLrvNrK4jdG1Hi7oBoqRgy43iBInVrw5o/ArgoR2Fj7shCA
+69bZSujkogPGLFzBM+O6K4aa4zZpXkHomkv3nlcDiq64qcfsvP7XXw7icCwm84Z3
+6dNL2Tpq2Og95ZQDIdZ25LO99BMmA6mAOFRHWf1NUsm09fziTEPAXNFKDyf7Oulp
+XctHSkVcwSlRbMXuz464yInztTjRQDFCoviC1sVygdAWVLNoKvcFnDBnH3TZdukH
+O+2KWRP7pyqjiJuAjoII1IdFqa89kS3nSfWoPg6wKtAEAmgkBqtroAiDxy9CaZs/
+a4m26ANPjFdNrXcfRO+Y2S9LrRatWSAlJRoHO/oi1FXNvgs2S+WUWyuiP6ajy7p+
+hrYu75IuNnvczpYdAZ6UWkT9raXk5tQsX//pkhogEq5LucLitBqPhyms6QKeUe5o
+lhvoBYdzr8Zn5QXXWZDpMJIBZQVIuspY7d4puf/4AE8GphaB18rgP6IOWUsa/mus
+enr6XK4e9iOOMu0gYEZSsX+V+61bBWawPkqAGDFdM8fWGEIHy5dbNzXzWQmYFl5n
+gI1wuzS8os0bZ/x/NXR3eWf65o0RR4d/YzS/sgkOGGHB6j/Yifi6YD0wsCB03js7
+bMmB4lfS3DG0whrOPQBoQw95hxgCdUo2U4ImuoTVa0dxM+o628d+17QbooTvqBQa
+JgeigM9qyUORUNd21+5PkeMNL/JH9y1sG0twzjZoJHWjv6Eb9FiemIsUdkExa694
+bMivLnol7cybBM/UCaVp1H74nKtqFogv2cmZJtRNIf0aALtbHISSjLCkY0sKtIFM
+8Nj9a3BrtZkD4dCJotcL/+PYL1R9kM8lVv3D/8jT7nBpp3KB9wGWP+/wKY3CxDAn
+xoBvKCwgI4b71VsUhpb/eiSJDBGRhyBunQArhm8LIAQQnuXpkZPkypYIgw5hsRZZ
+rwAAAAAAAAAAAAA=
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent
new file mode 100644
index 0000000000..8c4c3741c6
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent
@@ -0,0 +1,56 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; 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
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgMFADCABgkqhkiG9w0B
+BwGggCSABEdDb250ZW50LVR5cGU6IHRleHQvcGxhaW4NCg0KVGhpcyBpcyBhIHRl
+c3QgbWVzc2FnZSBmcm9tIEFsaWNlIHRvIEJvYi4NCgAAAAAAAKCCA2IwggNeMIIC
+RqADAgECAgEeMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+EwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlC
+T0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4XDTE5MDcwMzE3MzAwN1oX
+DTI0MDcwMzE3MzAwN1owgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
+bmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1Mx
+IDAeBgkqhkiG9w0BCQEWEUFsaWNlQGV4YW1wbGUuY29tMQ4wDAYDVQQDEwVBbGlj
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOBfD2Up3UqD4VDDHVVP
+HCFalj8dR4PjlGc305O73/HZ8DliaraE+jvuRX+N9pD2yHYyJt5u0nqNHgQtbNVt
+M9pGM7T5FQs0pQHzIP+WxKZD4FUlkI59i8bGLgx0c66/0J8FIPmXcCBabNvT3CvF
+xUHmijXP65uFGIUU2d+IhFEH+0EFUkGWsT2Qrp8Y/qpPk9SmiCnfygiyV/YRV8m2
+xjOU09AWsUGoXbZbOGlJ8ppoaKkN3yScESAei7Yf5tUz7yhOV4+m6Ir2NANAxoRV
+jWZsTrw1CWvR3DMHNzGpoM2XcZ6eNQWsC+lZMKtUs8AnKiAWjNZFWlGLxrABpeB+
+cQcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANPuQhBnlZjyzSZMAwT/Az86G54h/
+sv7N/GjUbtuKibrwedtvh1vugTMGVvi3vzxaI71D0kI4C+GBQ7yp47Qv2Gqz4jt3
+t0PYYpTEZXbpxNWJfC3Yetc2zSz/yS4B66CAs2theWCG+NqswADXiam2U/tPMm8Q
+YlCWZatr9C/ktmyz4UuCW9bDSEItwZy+X/55Z6Yt07FoCx/ZTdgg3jCtwOqkmhIG
+fKXQPKRy0cyRg9ph1Gl71GP5a5e+sWF7sKmJSQ4PtLyPE/39EQuxRz03W6iWY7rW
+76ZuRGp180VS/6792MzGM++u16dtkH/U5PnzqVG7CL3Y+H/evsrVbrIMdTGCAvkw
+ggL1AgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
+BgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UE
+AxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIDBQCgggFhMBgGCSqGSIb3DQEJ
+AzELBgkqhkiG9w0BBwEwTwYJKoZIhvcNAQkEMUIEQD19WOnX3C9YP8Tz7gGDkLPi
+v36orVfLbv7L5+nHNhBNFBFfPHvCLJPPifynWat+Sam6uw+JXECk2raOQRrOnyww
+eAYJKwYBBAGCNxAEMWswaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
+cm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNT
+MRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjB6BgsqhkiG9w0BCRACCzFroGkwZDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50
+YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3Qg
+Q0ECAR4wDQYJKoZIhvcNAQEBBQAEggEAoundvRYJ9fHgAVPoxq5Bsv0R0edWrSDU
+f3tFwwKG8H7hJwMWtGugVOAUfSimlM4foDwJquqTAdY6JVN798wftuWsXT54zkUS
+iB03LpslL7r+gAIa+glmhX6tmLGxIlAa5UyJUHBXoeL3+ze1EoEC+vET5MPh7FnQ
+mC9EP7ZaB1yn8z8N/v5KGzDBC2J9ARZoZ7ckon5cxfW9K69dD+ld184cKeWhPPEl
+5cspbZc2GqUCT0iyKW7M5wuovyOH4BLoSDyh9FFqKeAsyb4g5eQ3cggTZC+rqx3y
+MqxMGaXiLOqxz26zeedkvXI/ZyNeN8zBU9Zo0djCEfCE4GgDw+Kz/wAAAAAAAA==
+--------------ms030903020902020502030404--
+
diff --git a/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent.eml b/comm/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent.eml
new file mode 100644
index 0000000000..36e95acc06
--- /dev/null
+++ b/comm/mailnews/test/data/smime/alice.dsig.SHA512.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.SHA512
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; 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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
+zbNgtMrWvXSl2GL0T48yDpbOYtS4dgAAAAAAAA==
+--------------ms030903020902020502030404--
+