Bug 1532573 - refresh S/MIME test data. r=jorgk
authorKai Engert <kaie@kuix.de>
Wed, 03 Jul 2019 19:42:35 +0200
changeset 36022 1682e3f326c2a85677a0709f8944a03b3066149b
parent 36021 92ded4d692a0289f495d8097ebe6ad2bed97beb9
child 36023 bba6ea26bc60c0de169d162c979aa09cfc32d037
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
bugs1532573
Bug 1532573 - refresh S/MIME test data. r=jorgk
mailnews/test/data/smime/Alice.p12
mailnews/test/data/smime/Bob.p12
mailnews/test/data/smime/Dave.p12
mailnews/test/data/smime/Eve.p12
mailnews/test/data/smime/TestCA.pem
mailnews/test/data/smime/alice.dsig.SHA1.multipart
mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml
mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml
mailnews/test/data/smime/alice.dsig.SHA1.multipart.env
mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml
mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent
mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml
mailnews/test/data/smime/alice.dsig.SHA256.multipart
mailnews/test/data/smime/alice.dsig.SHA256.multipart.bad.eml
mailnews/test/data/smime/alice.dsig.SHA256.multipart.eml
mailnews/test/data/smime/alice.dsig.SHA256.multipart.env
mailnews/test/data/smime/alice.dsig.SHA256.multipart.env.eml
mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent
mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent.eml
mailnews/test/data/smime/alice.dsig.SHA384.multipart
mailnews/test/data/smime/alice.dsig.SHA384.multipart.bad.eml
mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml
mailnews/test/data/smime/alice.dsig.SHA384.multipart.env
mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml
mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent
mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent.eml
mailnews/test/data/smime/alice.dsig.SHA512.multipart
mailnews/test/data/smime/alice.dsig.SHA512.multipart.bad.eml
mailnews/test/data/smime/alice.dsig.SHA512.multipart.eml
mailnews/test/data/smime/alice.dsig.SHA512.multipart.env
mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml
mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent
mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent.eml
mailnews/test/data/smime/alice.env.eml
mailnews/test/data/smime/alice.mime.dsig.SHA1
mailnews/test/data/smime/alice.mime.dsig.SHA256
mailnews/test/data/smime/alice.mime.dsig.SHA384
mailnews/test/data/smime/alice.mime.dsig.SHA512
mailnews/test/data/smime/alice.mime.env
mailnews/test/data/smime/alice.sig.SHA1.opaque
mailnews/test/data/smime/alice.sig.SHA1.opaque.eml
mailnews/test/data/smime/alice.sig.SHA1.opaque.env
mailnews/test/data/smime/alice.sig.SHA1.opaque.env.eml
mailnews/test/data/smime/alice.sig.SHA256.opaque
mailnews/test/data/smime/alice.sig.SHA256.opaque.eml
mailnews/test/data/smime/alice.sig.SHA256.opaque.env
mailnews/test/data/smime/alice.sig.SHA256.opaque.env.eml
mailnews/test/data/smime/alice.sig.SHA384.opaque
mailnews/test/data/smime/alice.sig.SHA384.opaque.eml
mailnews/test/data/smime/alice.sig.SHA384.opaque.env
mailnews/test/data/smime/alice.sig.SHA384.opaque.env.eml
mailnews/test/data/smime/alice.sig.SHA512.opaque
mailnews/test/data/smime/alice.sig.SHA512.opaque.eml
mailnews/test/data/smime/alice.sig.SHA512.opaque.env
mailnews/test/data/smime/alice.sig.SHA512.opaque.env.eml
mailnews/test/data/smime/alice.textplain.sig.SHA1
mailnews/test/data/smime/alice.textplain.sig.SHA256
mailnews/test/data/smime/alice.textplain.sig.SHA384
mailnews/test/data/smime/alice.textplain.sig.SHA512
mailnews/test/data/smime/expiration.txt
index 57c141e901ed9b2510753724e7718aa8f7f08188..a168bdd1bd9956f083f5f708da1cb9ef373cddf1
GIT binary patch
literal 3526
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
UjM)&F++A)hc)sxW(+2?l0R}jWVE_OC
index c0b1d42c0924d23419b1c334e92295ea8d44e84f..db6d43d5ac057baf5e854e90f7330f7d44e1d941
GIT binary patch
literal 3514
zc${t3XEYlO+XwI@B8j~zYP6`4B5AEqq10%s8nr4)qc*i#O0C%YR#eSWo7#I*l&Dc#
z#V8spMvbD1KKK2ecRlBQ|L0s^{?|Fz$KQnr0s$!yK@cjjaLw=&Iv^C76C@Y}#?xUD
zLH|!pse`~%-v4{lAT<BEqNN6ca`50|1Ri{V5QI?wSN-={b}*w?u~|1$rk_Y&i$HCk
zSKt^3B+LlLg9mVg10^BWiUdsQZ+CHAZKseLvWrbswO<1`bOXcxbbeshBl@z{v2(4o
z%<E~DvvAqLuXKTj54v~IdCHa{L%dUb5YRwuVbC)b|Dyx71zx|ma@1@ZlXnNiYp)1~
zFU`H{c>X)unq9^*jE5vAT2-RroOV?^C*hhg26o;3>NvW=PQeZ)S@4k?mJ)QHF3{!6
zn~rVIq|nXMr>33&_q#}cXo8W}T^%+#1$NXjmb#dG-VjBTp2Ik5s5eVb8eHUHC#*%?
zo+R{81XuN4JEDmhMhR<3TB~$4yR9lT-IH3sa9O4bzs+m5`6&E#LTv8jSG6{HY{QqW
z^RF$|jJ(i%-znP0f*<TShWOLjHF=glD@`10uQszZ>zo5TRfYwl548!4r>W~D7Qha@
zz1H7|M0M$*b;|_RVt6#rR+{MreF#NjOjOF}fWF0{M3R(FI$~0AuG=IgUG)x)<)s!3
z1i7NdaV=wueiA>vJbNgwM7^)^R_Mx<GmqN=Y}VQ<ndHUK>_&LJKQd_~F$CFF5_GzF
zVVU_TeDocUKE?Aen%bWFzRpooKcswgofK$KY-&X0gf19a#!I9p@z78l2vin_Z)|qn
zdHLp`DCSkV470HBtK>Hfm&_G6uHHTpbSS+LvzK|`RP^UAk<PT!rzm@75|@ly;9xI<
zXRTANcq=;Hm#jmSFmh2~-a{yVoBx<HeJ9eE-Wmdl{*{Jrne%GQf%?g|3=<{fX+J8M
z9Yt$p+I+yy?+KYq+4?meu<vu^IR-qQZ4vrmNuwHIXMl9u^nRLUr_?tw-O8Q%9yxu}
z;Lt22iICM0+uQMn_OOi!J0mLX^^{uWnC@4Rq@?V1t)_2@U+3^__X|h2E@#T&8~phk
zA1tqNx{JmaJuq%ra!d&x9Fox;2pM6FX|X+y71eo3;F+YG_%ML~URI=%Oz4u|l72nR
zNfYZIkH_w+(~r>;%bkeVsj^JjE_<s6Zn8hwxf>8=S!|X2r%=q?Is0mKMP{t+=kA?y
zrd8=($IiiByXGAC%r8X+z6&()#JUf>_A=XV1f4yR6N4y-T1th)qK?yJ6F_yt@av97
zPoN}81?@$0*RZb2LvN|qF3YZv+=Dg3W?cgb@TKdQt)3~M>u9D^xO|&<_D5%-dsg=)
zb}Uk(;LHk8vzv%(PXKC15EAG$-CDstWM2Mz{$B{0hv6FM-(<e*I&6jEmbUy~JFn7U
zlBF8Q72cWK{5nKCB^{DaH(IMa9(2{=&*W@BoI3&}30%}3kF^DKWKPmwVY)SR^m7Hx
z`8=)SKld-~XCOR2Zo!Vq@=Tkgs^g%tq4gTZhZ-3#3o6NrqfWYoEH7M9x4!emVzG<R
zrA61`G|@*(lC_i?Gv>s+%y_DaZAELY7YFX@EOgHy5_&lg2@zM);+aFdBR~{2k_*bl
zY{Hy}Phckl#4Pt@svJOn)Z`0pGUI_l0rRkK<i1P&CvM@5qZx}empgHC3{zaMNsbOp
z=!B^6woA0`vMhzBj;VHH4pr$yItj%|x+(N$JMD&K_v%0w;?DGrI%RLoX!o69H^-zh
z*f$QD%W|kxP1HrJ-=JyW2dC*Hxno2{=&ibnR32W7q%e$8evcON4ub8!m84=t!gwJ7
z6~HsV6NJG3)NDw0Fsr!dl=@@H$ZJ}cJ&7?)h#*FKYa8$%`QOe$a{gu)1pK!S_;0L2
z{$UmT(*fRU$D}!Ca})N2I??(cR&)OL8T!|z<k%xyzO*yd@AS*<P3&rUac{?db(`9^
zG#MB~3p9P>pU-biFQkyLmM=4G@N`Tt)YF{c=*-&C`NYN0Z^f#wk6-nI8CNB={ubYs
z><Jz9i)@ky9ZqmwYV=9YiRG|Ip0t5Dev>)Q!o_ZVo!{gZ#}2THi48*<^Vz%>)p=DW
zZdMGwwOlv+Ue&Ti?;8Y)tVU_MaPC>8#wN9BE|^zkba|(H<ifqbM4}z00bRRqmJ>Cv
zhE?*58C$gBwkJHyxA4jgxcS!81VtnVI1q4UZsSp*#D&e4_j6<L9q<UM!zc(f7o2b8
zlU%ZzvBken{umsVMA!FF%wFZ^ahw$HPV;nn2o**I%q1#^sB8|^&V_XHi?YY{5<qfL
zeg=1mK>;D}n77Omyh?gmmSph>QvWl#C@GnVloXatBT$Jgn))dBpj(tL^+IT|Usb$2
zi`F2@=?At<d7yCAsq7;D0_{_^8C~bHjLU@gwaVJpno|JA1lsq_Z~3)9VXv~=pD3rI
z9MfqVnGOo#cHq0=CE{p3Swl*p7&2pj_Oc_QImkCj6OT!ZaF{-qXbl#>;&-0F82`Sl
zOQw8ojJHe$^&x`qrwG;dkfFYXgo%RY3zx(*sGlhxB}4jQy<PHT(pIqA`Jx=&fG(Hq
zZg{yub#Gxh5oi4g_37OO@1MJfFWr|{&V;#z>f-uD&@s*rkX*S%%?^kg2XF`W0|yhf
zLAOE`Om)4-U;9Z+&DQIvD>(~)@SLB04DCnKd?0U;`tsgWdk>2nFu^7KM@YFIvze}h
zu=d)G#{^sIw6B-L%h|Ks1;BC0d=^wO=<qXhyB<Jy9gjM@UG0*o#HG+aoOMyCG(eJA
z<+ts|dsWQ76s97EtcWx%L*1>MK$F7CisSqaZF+?TA}4d(HZ~QNXG-=wycKw%9sw1j
zJ5G_>-kU50Or5sWvd~`Qkoa_foJ>m2mZI9#N&D^<{$4A!hg5l8Y<<aJ0wy<>Y6@Z_
zcq}{zQ5bBaz)zD)0ihx;O!r-V({@dAVe@%qIYw)|@qDIS>AdIR>Kc!B;0vFDr5`M_
zo~7V+c8yD=Mu2I{&~2)cf$G*;ddYry_Nln?^5NcQXWr%v*gQxo1|s(~!C=6PF*DXN
z_%YUhv8kT#Tw7d0YGK+}b*J35Rb7k>@PGQ*7fbS%R_6qpUo+hRhN{Ob&!EwuhQP~d
z%{PkVha;77vhO)nJC8l`KZemtndfblfHvUv-*KS!aAea1(I)E<OCiqYx0j`Amf^UN
zVWT6Rx=3t`C%M4h*XUT4ZclA>=-#o4ze7atY;3L7x&iL~S=*C91Y1(Ws)3uqi6uv-
zi07dd*M6V6X`q~2<u!qqglkbo^PzfJE1B8hB5AQn4u#^6={EjNoTtN{+EDd5$sf$c
zLf=cQ56pl-f3uE7%CU)quWqD%YF4)k^^*J)kF{1^XkAfT`wFiMS?G-IHc}V+(&c`q
z=@iFYxu0WQzx>RJf+Ai~cduV^cf18TJxY|}vSoOlKbqBzZY*QI-b8z5%E7N!XIpC5
zl@>t`Hy$0^5D>O93LnVS%o7WS>k_HGM5P9m19Qm_wWtuks+NyXWtW%ncZQc@c0j*s
zvc`>@zORs}P$-zItN%B@)87NBce9!F(i?|HQe4)eQlE7Y!6te~#4P`zkLIjOK099<
zesYz#LS~6srJrVn-c%&bGO+$=Ta5RpCTl85%{<NKoiuo*@AGK}K2=Q5dCGu+In-&B
zmql&b+ebp^SGG&}0Tk!)rL?!qU*HlMyfcg!^$0bim-IzcrA385vUIIPvo%CKlTn{2
zd(j!Y;<vDa6WNbOvi!xKQ4)QqyY5Dq-{_I`UgKH7?sMsm$aFb3ZJh_$>*v5FZaJ+{
z?MOohliC=IFMzf7bQKDDJ@$Qq;|w*;C(5EFZ>2aQcgHNWfwUt&G^TMHs`0F{ahj*>
ze;oEV=q8zl9);8Hh{sM76P38pfo{8knv1g6vjayN+qmg;&(XQOEcT%s#AN9&DTeRn
z%&sRV%yxi4tkQB)ENj}mCVf`-`~kvH?8VNm!{EJ72Yc~q^t>(daSmG1R&n<knUJ4R
zsl=+s!t25OJpH$<6)ZUVv)M1CM@?YcY1C#i=%)ul{K05o15HNQe2La%j$~;pVS%ed
ztTwk<Fe-_!4LhQqQKaf+&S-#IgDwB|S{o2>aa!<rd!H7^cfR{lyMNhmU5etE#>fv_
zmPf_)<i=lqt35x@2=`=0{9Sxcbv`KZWFJ6NfHOST-w=7!HZi30FUpJVuCLQ!BTfM=
z&X6GUA(?8NCE*W+Q-8^`lf-(zTi|1&wL@^xDsb{7TZu3>?KVPNAN8K&tKk5d%P?k}
z`9X?}e_%}f)cM6DH@>MFatZD|LFfU?cCUxQSqVi+E<CKoDuvi-^{PH#zog@0&(c-+
z*pI44toB|=`F-VFq<%;m{HI<t+oz8)f_PwPPGtI3ZWOGtj(H}T;@yMyvp{-hpWE5f
z+YRM!elGj1<+-_3^hO_HaatJyig_-^k9FwoY4q54EplsuVcw*b5W}s38-V{41PXBt
zK?R|N(^G)BC;?#Bq@dhTy8KXW=(vsIS26_w%5%X9W?Wbi8&-YYi2Bx$JRg}4R{iJM
H0|5U5!LfnT
index 68fff6bbab5c76595be6b4902df2b490283aa4a6..a5398d2571335441c1b030961da49bf0fb114d1d
GIT binary patch
literal 3516
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
G0Q?J7j)0T^
index a781c60f55a49d40424736fb135425b3e7519905..fe4ddbe63710b80431b22c2736dac5bbdd6ac5e2
GIT binary patch
literal 3578
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
T;e}TcXriUF*+0($3CX_z@^+T<
--- a/mailnews/test/data/smime/TestCA.pem
+++ b/mailnews/test/data/smime/TestCA.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDdTCCAl2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJVUzET
 MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAG
-A1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQTAgFw0xOTAyMTgw
-OTI1MjdaGA8yMDY5MDIxODA5MjUyN1owZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+A1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQTAgFw0xOTA3MDMx
+NzI5NTZaGA8yMDY5MDcwMzE3Mjk1NlowZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
 CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
 R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDsCdr1gbF+UD8WIePsfd/A7PYBjEUu4LBeUu0hryKWU5fd
-I2QtP1AGlj3oVawAevBGCXuWyZAlaUcZ/EZavdJC5AP5iYO28fPfemug5jEixJWV
-q0lIiBhjX15oJUPbunB2EJbyVlqB8f6TN9J4V92Z1YrlaW5B17ou7ZdrVx+BqJqX
-7U/CKMIqoyKSzT4i1ulYowtfmNoqL7UNR+/0ieX1m2kJOzKrIHv7zhI5lRLnaX/l
-OAVlEWuzWXdL+JQzEel8FBuNYYICuL7hSS538M7uiRoOFQqpjdH/clYiA+ul/TVY
-5mYAaBGaxVSjpzsB4ViQThK3HCYtDwGhd5OI+2pHAgMBAAGjMDAuMBEGCWCGSAGG
+A4IBDwAwggEKAoIBAQDHeHQbBTCx68K9uEp3WgchBcS1qpkm6jgtnlAystUEdaQ8
+KKnGiTq6Uwd2QKD3N71FL9/13/qbr4b80CJ19KomNKpjzyoSxyOc7lWJ/NjZ34O5
+TfT1dVuyh5oDea+3iY54V7Tmdo5fpjZA8Ugp5PCdHb7Az8U7nN4/mkvF+2fwnYda
+ApudiVo4Nb7al/tRQ7eqcEmkdncxFjy7RvqRTvztt1/df6x4w6UWIXdt8cJOqf91
+IThpn0nC6OLQOLtwUms5PnsAyti+wHt/5F2dkLB2f4Gvp6AJM2j5jVQILB+z9MOE
+WnMJzOrg2y+XXoR5VW1+8Hnz7Y3iW+EaV0KSt2Z3AgMBAAGjMDAuMBEGCWCGSAGG
 +EIBAQQEAwIABzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B
-AQsFAAOCAQEAG/L2tV3DqxHXXBBjCkkrXSfujELtU2DoT48MrNlHV9eCAzLsqI8Y
-cz2HdKQ1+YXqCceXsC3Oo4Dw3EI7HxM4KtJoGISNaF0e7c73IKtLf/gb2egl+L2U
-AN22C3V9q3HHvcM4lQh/gEmLLHsR1A5/Ji067p/qE6b6cmCSWx8q/xiuNT4R7JNf
-WG0T4QpySkJ5qdMQnLStaxwJklczmEJp6SD8k+JvdrjnXxyE61J2Hu1knAdnWW5+
-jULKdB2ehBY4kY7jxLsm+jD8vKNDg+27092E6rObt220XSRP8mQfNYeSQIOVkC7o
-1CmVpyFQArBhRdI80ILtbzfzd57q4fRwsQ==
+AQsFAAOCAQEADt9D6vmUvQOSX2qKTHYmbfNA2gHbiXrip9nRJcfzNQlfk0WNOSpo
+1p4+t1t7RJ6kn/OvgPkPYmUUsbJRjg6Sb/Ct+VMI7fcD2/QGxnYRIhi02KhlnvwI
+uIwIjoHNxhmLeTq2QspXiQzwznULJ3LaWmzbFNG401Slf7ucp6CUXQS0uTCbWH2D
+gz3Za8aZ/dJDREEMPCOdqISTVVJfceREdbGTc/j35IRmusoDr5fq7715LnJmMXoo
+gbVat7YIcTtYJbQuuVjXhOTsKkFxMInoMN7T9VZQu2MJC2v1iz5bQS23bYPIi58f
+RRolH2/6nMn6Zf2z09ZVOyumbKfjYj2m3A==
 -----END CERTIFICATE-----
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart
@@ -11,44 +11,44 @@ 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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
-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
+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
-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
-AAAAAAAA
+NzAzMTczMDA3WhcNMjQwNzAzMTczMDA3WjCBgDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoT
+CUJPR1VTIE5TUzEgMB4GCSqGSIb3DQEJARYRQWxpY2VAZXhhbXBsZS5jb20xDjAM
+BgNVBAMTBUFsaWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4F8P
+ZSndSoPhUMMdVU8cIVqWPx1Hg+OUZzfTk7vf8dnwOWJqtoT6O+5Ff432kPbIdjIm
+3m7Seo0eBC1s1W0z2kYztPkVCzSlAfMg/5bEpkPgVSWQjn2LxsYuDHRzrr/QnwUg
++ZdwIFps29PcK8XFQeaKNc/rm4UYhRTZ34iEUQf7QQVSQZaxPZCunxj+qk+T1KaI
+Kd/KCLJX9hFXybbGM5TT0BaxQahdtls4aUnymmhoqQ3fJJwRIB6Lth/m1TPvKE5X
+j6boivY0A0DGhFWNZmxOvDUJa9HcMwc3MamgzZdxnp41BawL6Vkwq1SzwCcqIBaM
+1kVaUYvGsAGl4H5xBwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA0+5CEGeVmPLNJ
+kwDBP8DPzobniH+y/s38aNRu24qJuvB522+HW+6BMwZW+Le/PFojvUPSQjgL4YFD
+vKnjtC/YarPiO3e3Q9hilMRldunE1Yl8Ldh61zbNLP/JLgHroICza2F5YIb42qzA
+ANeJqbZT+08ybxBiUJZlq2v0L+S2bLPhS4Jb1sNIQi3BnL5f/nlnpi3TsWgLH9lN
+2CDeMK3A6qSaEgZ8pdA8pHLRzJGD2mHUaXvUY/lrl76xYXuwqYlJDg+0vI8T/f0R
+C7FHPTdbqJZjutbvpm5EanXzRVL/rv3YzMYz767Xp22Qf9Tk+fOpUbsIvdj4f96+
+ytVusgx1MYICyTCCAsUCAQEwaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs
+aWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMg
+TlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjAJBgUrDgMCGgUAoIIBNTAYBgkq
+hkiG9w0BCQMxCwYJKoZIhvcNAQcBMCMGCSqGSIb3DQEJBDEWBBQCH3ANIhscFLil
+//h1Np3FJ8a3wDB4BgkrBgEEAYI3EAQxazBpMGQxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQK
+EwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEeMHoGCyqGSIb3DQEJ
+EAILMWugaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQG
+A1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQD
+EwtOU1MgVGVzdCBDQQIBHjANBgkqhkiG9w0BAQEFAASCAQBhAYUa+Ccopm7PavBb
+FjOLJVcd2u8KJ2+n2eiDQK8EWN90zd9q/Ba3eVLHBihbuMLgJ1964crCikBJTOSA
+PguHhdiUjs6GVYbRY9sZkYbVjDJ7pqWCj0TRpUuctOtSIfHJ0on+Kc1RPzV4Q9QY
+OKoHT9yRx3bSeNKeUjSzUz/fiMpxImnFerva0CaJCo30f0d7aJsnR1m1QRvbfnYQ
+ONaApLGJRAA79scSTRA8e16iwt5dkkpr+jabpfeHK94dYubk3RmA99NadN1pNvE4
+pOzC6rgBJ/nExeALjXM+bmhdeI6vqCpx99H5xGzV6BpSZAyRk07vT5HyhX4sYl/O
+xieMAAAAAAAA
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart.bad.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,44 +15,44 @@ This is a FAKE message NOT from Alice to
 
 --------------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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
-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
+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
-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
-AAAAAAAA
+NzAzMTczMDA3WhcNMjQwNzAzMTczMDA3WjCBgDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoT
+CUJPR1VTIE5TUzEgMB4GCSqGSIb3DQEJARYRQWxpY2VAZXhhbXBsZS5jb20xDjAM
+BgNVBAMTBUFsaWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4F8P
+ZSndSoPhUMMdVU8cIVqWPx1Hg+OUZzfTk7vf8dnwOWJqtoT6O+5Ff432kPbIdjIm
+3m7Seo0eBC1s1W0z2kYztPkVCzSlAfMg/5bEpkPgVSWQjn2LxsYuDHRzrr/QnwUg
++ZdwIFps29PcK8XFQeaKNc/rm4UYhRTZ34iEUQf7QQVSQZaxPZCunxj+qk+T1KaI
+Kd/KCLJX9hFXybbGM5TT0BaxQahdtls4aUnymmhoqQ3fJJwRIB6Lth/m1TPvKE5X
+j6boivY0A0DGhFWNZmxOvDUJa9HcMwc3MamgzZdxnp41BawL6Vkwq1SzwCcqIBaM
+1kVaUYvGsAGl4H5xBwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA0+5CEGeVmPLNJ
+kwDBP8DPzobniH+y/s38aNRu24qJuvB522+HW+6BMwZW+Le/PFojvUPSQjgL4YFD
+vKnjtC/YarPiO3e3Q9hilMRldunE1Yl8Ldh61zbNLP/JLgHroICza2F5YIb42qzA
+ANeJqbZT+08ybxBiUJZlq2v0L+S2bLPhS4Jb1sNIQi3BnL5f/nlnpi3TsWgLH9lN
+2CDeMK3A6qSaEgZ8pdA8pHLRzJGD2mHUaXvUY/lrl76xYXuwqYlJDg+0vI8T/f0R
+C7FHPTdbqJZjutbvpm5EanXzRVL/rv3YzMYz767Xp22Qf9Tk+fOpUbsIvdj4f96+
+ytVusgx1MYICyTCCAsUCAQEwaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs
+aWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMg
+TlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjAJBgUrDgMCGgUAoIIBNTAYBgkq
+hkiG9w0BCQMxCwYJKoZIhvcNAQcBMCMGCSqGSIb3DQEJBDEWBBQCH3ANIhscFLil
+//h1Np3FJ8a3wDB4BgkrBgEEAYI3EAQxazBpMGQxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQK
+EwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEeMHoGCyqGSIb3DQEJ
+EAILMWugaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQG
+A1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQD
+EwtOU1MgVGVzdCBDQQIBHjANBgkqhkiG9w0BAQEFAASCAQBhAYUa+Ccopm7PavBb
+FjOLJVcd2u8KJ2+n2eiDQK8EWN90zd9q/Ba3eVLHBihbuMLgJ1964crCikBJTOSA
+PguHhdiUjs6GVYbRY9sZkYbVjDJ7pqWCj0TRpUuctOtSIfHJ0on+Kc1RPzV4Q9QY
+OKoHT9yRx3bSeNKeUjSzUz/fiMpxImnFerva0CaJCo30f0d7aJsnR1m1QRvbfnYQ
+ONaApLGJRAA79scSTRA8e16iwt5dkkpr+jabpfeHK94dYubk3RmA99NadN1pNvE4
+pOzC6rgBJ/nExeALjXM+bmhdeI6vqCpx99H5xGzV6BpSZAyRk07vT5HyhX4sYl/O
+xieMAAAAAAAA
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,44 +15,44 @@ 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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
-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
+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
-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
-AAAAAAAA
+NzAzMTczMDA3WhcNMjQwNzAzMTczMDA3WjCBgDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoT
+CUJPR1VTIE5TUzEgMB4GCSqGSIb3DQEJARYRQWxpY2VAZXhhbXBsZS5jb20xDjAM
+BgNVBAMTBUFsaWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4F8P
+ZSndSoPhUMMdVU8cIVqWPx1Hg+OUZzfTk7vf8dnwOWJqtoT6O+5Ff432kPbIdjIm
+3m7Seo0eBC1s1W0z2kYztPkVCzSlAfMg/5bEpkPgVSWQjn2LxsYuDHRzrr/QnwUg
++ZdwIFps29PcK8XFQeaKNc/rm4UYhRTZ34iEUQf7QQVSQZaxPZCunxj+qk+T1KaI
+Kd/KCLJX9hFXybbGM5TT0BaxQahdtls4aUnymmhoqQ3fJJwRIB6Lth/m1TPvKE5X
+j6boivY0A0DGhFWNZmxOvDUJa9HcMwc3MamgzZdxnp41BawL6Vkwq1SzwCcqIBaM
+1kVaUYvGsAGl4H5xBwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA0+5CEGeVmPLNJ
+kwDBP8DPzobniH+y/s38aNRu24qJuvB522+HW+6BMwZW+Le/PFojvUPSQjgL4YFD
+vKnjtC/YarPiO3e3Q9hilMRldunE1Yl8Ldh61zbNLP/JLgHroICza2F5YIb42qzA
+ANeJqbZT+08ybxBiUJZlq2v0L+S2bLPhS4Jb1sNIQi3BnL5f/nlnpi3TsWgLH9lN
+2CDeMK3A6qSaEgZ8pdA8pHLRzJGD2mHUaXvUY/lrl76xYXuwqYlJDg+0vI8T/f0R
+C7FHPTdbqJZjutbvpm5EanXzRVL/rv3YzMYz767Xp22Qf9Tk+fOpUbsIvdj4f96+
+ytVusgx1MYICyTCCAsUCAQEwaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs
+aWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMg
+TlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjAJBgUrDgMCGgUAoIIBNTAYBgkq
+hkiG9w0BCQMxCwYJKoZIhvcNAQcBMCMGCSqGSIb3DQEJBDEWBBQCH3ANIhscFLil
+//h1Np3FJ8a3wDB4BgkrBgEEAYI3EAQxazBpMGQxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQK
+EwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEeMHoGCyqGSIb3DQEJ
+EAILMWugaTBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQG
+A1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMRQwEgYDVQQD
+EwtOU1MgVGVzdCBDQQIBHjANBgkqhkiG9w0BAQEFAASCAQBhAYUa+Ccopm7PavBb
+FjOLJVcd2u8KJ2+n2eiDQK8EWN90zd9q/Ba3eVLHBihbuMLgJ1964crCikBJTOSA
+PguHhdiUjs6GVYbRY9sZkYbVjDJ7pqWCj0TRpUuctOtSIfHJ0on+Kc1RPzV4Q9QY
+OKoHT9yRx3bSeNKeUjSzUz/fiMpxImnFerva0CaJCo30f0d7aJsnR1m1QRvbfnYQ
+ONaApLGJRAA79scSTRA8e16iwt5dkkpr+jabpfeHK94dYubk3RmA99NadN1pNvE4
+pOzC6rgBJ/nExeALjXM+bmhdeI6vqCpx99H5xGzV6BpSZAyRk07vT5HyhX4sYl/O
+xieMAAAAAAAA
 --------------ms030903020902020502030404--
 
index 1e636ea97ae0e4b36aea3acdd3dc5a91cf49e2c4..7ae46f6c8aa47875d938dd012d63bb04f98d5c60
GIT binary patch
literal 3387
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
Rqd;xH0000000000008q=UIG9B
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart.env.eml
@@ -1,82 +1,82 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped clear-signed 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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
-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
-EMA2yn5kovr1BRWfPKb1OMYAAAAAAAAAAAAA
+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
+EI8h7GJccHFHiRCFeqNAbb8AAAAAAAAAAAAA
 
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent
@@ -12,44 +12,44 @@ This is a FAKE message NOT from Alice to
 --------------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
-ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDXzCCA1swggJDoAMC
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
 AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
 bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
-IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMTkwMjE4MDkyNTQ2WhcNMjQw
-MjE4MDkyNTQ2WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW
-MBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMR4wHAYJ
-KoZIhvcNAQkBFg9BbGljZUBib2d1cy5jb20xDjAMBgNVBAMTBUFsaWNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6A0eKJceDthtJ39UGPIyNOQ+abdT
-OnjCS/u/EriNk4YGoLALoy+nPBwcR+DtKXZDMpgp5TUqjSxuMSMUVbqUb0C1A4R/
-YDq2mdYNG/kX4cNVZomo/fJff1SKCD4g6LAy+vmX0Di+GqevVxwqSXKz6kfTPmLT
-MoVApmA2YLQJ++PKDEe+qCNpkI2R/C39Mxk2WHhfpKNo0hu3UwrwZfOzTVCrWG3Q
-87eAxqi5QhFXBilT+GOLr8Ez1pFw0TCEWJ6qpTzHqR0LaoK8Z4YyFjbaPaXHfMWW
-BRy8g4IEiMIlFRo+m9qCQKbNXgbHvrT6F6Ywd3l+rdOFiePPwdSbdddLmwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQDQKKFZzkOUjJFeZla4Am7ujEDlu2EiSqmW3JJb
-wIFT0olQekrpjFpuhSkP72Li30Tlg0qenTTS9YmC2TkjyjRyuhcMc8w1yA/djgw2
-g+0Iouqd8+AQyx9Ac4DkwWL14Sv1l92svcofDzCb2ofRRCyAEGFO4ZCXqDJ1FJgj
-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
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA1.multipart.mismatch-econtent.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -16,44 +16,44 @@ This is a FAKE message NOT from Alice to
 --------------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
-ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDXzCCA1swggJDoAMC
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
 AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
 bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
-IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMTkwMjE4MDkyNTQ2WhcNMjQw
-MjE4MDkyNTQ2WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW
-MBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMR4wHAYJ
-KoZIhvcNAQkBFg9BbGljZUBib2d1cy5jb20xDjAMBgNVBAMTBUFsaWNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6A0eKJceDthtJ39UGPIyNOQ+abdT
-OnjCS/u/EriNk4YGoLALoy+nPBwcR+DtKXZDMpgp5TUqjSxuMSMUVbqUb0C1A4R/
-YDq2mdYNG/kX4cNVZomo/fJff1SKCD4g6LAy+vmX0Di+GqevVxwqSXKz6kfTPmLT
-MoVApmA2YLQJ++PKDEe+qCNpkI2R/C39Mxk2WHhfpKNo0hu3UwrwZfOzTVCrWG3Q
-87eAxqi5QhFXBilT+GOLr8Ez1pFw0TCEWJ6qpTzHqR0LaoK8Z4YyFjbaPaXHfMWW
-BRy8g4IEiMIlFRo+m9qCQKbNXgbHvrT6F6Ywd3l+rdOFiePPwdSbdddLmwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQDQKKFZzkOUjJFeZla4Am7ujEDlu2EiSqmW3JJb
-wIFT0olQekrpjFpuhSkP72Li30Tlg0qenTTS9YmC2TkjyjRyuhcMc8w1yA/djgw2
-g+0Iouqd8+AQyx9Ac4DkwWL14Sv1l92svcofDzCb2ofRRCyAEGFO4ZCXqDJ1FJgj
-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
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart
@@ -11,44 +11,44 @@ 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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
-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
+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
-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
-ba8fHXXI6CAep16mr/7uL6JH5poAAAAAAAA=
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart.bad.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart.bad.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: BAD clear-signed sig.SHA256
 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; 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
@@ -15,44 +15,44 @@ This is a FAKE message NOT from Alice to
 
 --------------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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
-BwEAAKCCA18wggNbMIICQ6ADAgECAgEeMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+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
-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
-ba8fHXXI6CAep16mr/7uL6JH5poAAAAAAAA=
+DTE5MDcwMzE3MzAwN1oXDTI0MDcwMzE3MzAwN1owgYAxCzAJBgNVBAYTAlVTMRMw
+EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYD
+VQQKEwlCT0dVUyBOU1MxIDAeBgkqhkiG9w0BCQEWEUFsaWNlQGV4YW1wbGUuY29t
+MQ4wDAYDVQQDEwVBbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOBfD2Up3UqD4VDDHVVPHCFalj8dR4PjlGc305O73/HZ8DliaraE+jvuRX+N9pD2
+yHYyJt5u0nqNHgQtbNVtM9pGM7T5FQs0pQHzIP+WxKZD4FUlkI59i8bGLgx0c66/
+0J8FIPmXcCBabNvT3CvFxUHmijXP65uFGIUU2d+IhFEH+0EFUkGWsT2Qrp8Y/qpP
+k9SmiCnfygiyV/YRV8m2xjOU09AWsUGoXbZbOGlJ8ppoaKkN3yScESAei7Yf5tUz
+7yhOV4+m6Ir2NANAxoRVjWZsTrw1CWvR3DMHNzGpoM2XcZ6eNQWsC+lZMKtUs8An
+KiAWjNZFWlGLxrABpeB+cQcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANPuQhBnl
+ZjyzSZMAwT/Az86G54h/sv7N/GjUbtuKibrwedtvh1vugTMGVvi3vzxaI71D0kI4
+C+GBQ7yp47Qv2Gqz4jt3t0PYYpTEZXbpxNWJfC3Yetc2zSz/yS4B66CAs2theWCG
++NqswADXiam2U/tPMm8QYlCWZatr9C/ktmyz4UuCW9bDSEItwZy+X/55Z6Yt07Fo
+Cx/ZTdgg3jCtwOqkmhIGfKXQPKRy0cyRg9ph1Gl71GP5a5e+sWF7sKmJSQ4PtLyP
+E/39EQuxRz03W6iWY7rW76ZuRGp180VS/6792MzGM++u16dtkH/U5PnzqVG7CL3Y
++H/evsrVbrIMdTGCAtkwggLVAgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
+R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIBBQCg
+ggFBMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwLwYJKoZIhvcNAQkEMSIEILJr
+dzzDNYWQV/M1oK41/rfKXs+hx4nk6HPGaJpiwfmGMHgGCSsGAQQBgjcQBDFrMGkw
+ZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1v
+dW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRl
+c3QgQ0ECAR4wegYLKoZIhvcNAQkQAgsxa6BpMGQxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQK
+EwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEeMA0GCSqGSIb3DQEB
+AQUABIIBAD8R/CfmwG3HaluS10rh7iqhaWNmC/JO/UvQ6zOf+2ekKB28vR1rRaud
+NOZzE+E6eoT8SKgC9sK2wa7Ywr2+YFrqjVQj7Oo0OJ6uzkId+2jeA1ROyJZGFvPI
+gT6RfTCSLje006GxQmXdxM0FnC+BcIGCFF/AmIAu4oOWx1Yh6ZkIqgiCrN8OeqRn
+lVmaG0TBFivJ5mHXNuPQ8M1xi4uB8QRaTbThTq22hZWoHuCQLHt0zwjkAqg4JZUQ
+skg7YwB8Vff7uzrcZnlzJVjYPObdlJSV9LE4LiRiiCeBIqiv1Xd2fRicRuMp17xS
+MdQvFJGcfqtP6IzDgIMdg4Tw6IH2Gj0AAAAAAAA=
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: clear-signed sig.SHA256
 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; 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
@@ -15,44 +15,44 @@ 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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
-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
+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
-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
-ba8fHXXI6CAep16mr/7uL6JH5poAAAAAAAA=
+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
 --------------ms030903020902020502030404--
 
index cf19f95db7efa09ed06f287a60ce1d133ebefd5a..d2bb1400b1f287e009bd38626be4316ebca54ce2
GIT binary patch
literal 3419
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
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart.env.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart.env.eml
@@ -1,83 +1,83 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped clear-signed sig.SHA256
 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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
-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
-PwAAAAAAAAAAAAA=
+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
+sQAAAAAAAAAAAAA=
 
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent
@@ -12,45 +12,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-T0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4XDTE5MDIxODA5MjU0NloX
-DTI0MDIxODA5MjU0NlowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3Ju
-aWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEe
-MBwGCSqGSIb3DQEJARYPQWxpY2VAYm9ndXMuY29tMQ4wDAYDVQQDEwVBbGljZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOgNHiiXHg7YbSd/VBjyMjTk
-Pmm3Uzp4wkv7vxK4jZOGBqCwC6MvpzwcHEfg7Sl2QzKYKeU1Ko0sbjEjFFW6lG9A
-tQOEf2A6tpnWDRv5F+HDVWaJqP3yX39Uigg+IOiwMvr5l9A4vhqnr1ccKklys+pH
-0z5i0zKFQKZgNmC0CfvjygxHvqgjaZCNkfwt/TMZNlh4X6SjaNIbt1MK8GXzs01Q
-q1ht0PO3gMaouUIRVwYpU/hji6/BM9aRcNEwhFieqqU8x6kdC2qCvGeGMhY22j2l
-x3zFlgUcvIOCBIjCJRUaPpvagkCmzV4Gx760+hemMHd5fq3ThYnjz8HUm3XXS5sC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEA0CihWc5DlIyRXmZWuAJu7oxA5bthIkqp
-ltySW8CBU9KJUHpK6YxaboUpD+9i4t9E5YNKnp000vWJgtk5I8o0croXDHPMNcgP
-3Y4MNoPtCKLqnfPgEMsfQHOA5MFi9eEr9ZfdrL3KHw8wm9qH0UQsgBBhTuGQl6gy
-dRSYI6trP8qBNkqyDkQtsE+Q0xyOUK0iE+cRid+dbhI7QRHgxJnmTT8TUIpG7X/P
-2QFpBiOc+eUzSr6+MUGf9gtaYoOtdw3TZ9/QgVKw6Mr1HrHaL5UXykNN9uQR9SOg
-ECfobQ/gvBZk48ZTwlW2nwYMsgGzXuPOpf+LyiSukxMc1mxTIOyncjGCAtkwggLV
-AgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNV
-BAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxML
-TlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIBBQCgggFBMBgGCSqGSIb3DQEJAzEL
-BgkqhkiG9w0BBwEwLwYJKoZIhvcNAQkEMSIEIIkBFBAciGamC1l8rrQ9Rf3QYbZ8
-NKqgsYvmT/s/qgusMHgGCSsGAQQBgjcQBDFrMGkwZDELMAkGA1UEBhMCVVMxEzAR
-BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNV
-BAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wegYLKoZIhvcN
-AQkQAgsxa6BpMGQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYw
-FAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNV
-BAMTC05TUyBUZXN0IENBAgEeMA0GCSqGSIb3DQEBAQUABIIBALz/uStztR4vzOYR
-sx15VeF+ncoXL7mgt8iDT8Q9EgUJQb6sAm38gFbiGwxBB/jdKQTsF1dYt8J/yrHL
-w4E8DJt+qnei3KTauPDg2lCSo0r978mx1pKxksqxP89va6WPsuaQrBtCIbHEkAhU
-aUFHjjaZa5G2jGlwzVh0YnrZXrLuxPxa2EjdHZt3aGfLdQpqBYoYZYvNvfp/7cLI
-6IFv5uSag7dpCpaleXb0WFnW9UylO3GyIy/my9G7H547VkuusAhzKfs20vXEHnj6
-Q7Z+ptvkTLAmJSHora0xLIiKIKobK/Zkad01iwGmfRqvnQ1M41VZ08gXUl8s6lYb
-X4GxVSMAAAAAAAA=
+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
+fDoI7erSDAkAAAAAAAA=
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA256.multipart.mismatch-econtent.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: BAD mismatch-econtent sig.SHA256
 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; 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
@@ -16,45 +16,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-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
-X4GxVSMAAAAAAAA=
+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
+fDoI7erSDAkAAAAAAAA=
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart
@@ -11,44 +11,44 @@ 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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
-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
+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
-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
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart.bad.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart.bad.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,44 +15,44 @@ This is a FAKE message NOT from Alice to
 
 --------------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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
-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
+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
-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
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,44 +15,44 @@ 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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
-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
+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
-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
+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
 --------------ms030903020902020502030404--
 
index 14bdea9c1ef248c9ea2ee8ace884b6d5a693603f..07f2160fbac825219a7080359b7caa9ffbea6274
GIT binary patch
literal 3451
zc$@)y4TSPAfCdRFhDe6@4FLxOpnx!d0s#Oqf&qmvf&qa70RS**Fk~?cFbM_&RRjhT
z0##En6EG15162eF6AD9NY-wh1a&Bp1F%~cs1_M<D2NMlVZ*^{TVQFq4R%vB-F%mEk
z1_M<D3KI!JPe)Z#AWl<LF%&Qo1_M<D0}~5QQ&S*RWpi{OLqP%oC@>8M2`Yw2hW8Bt
z0RaU71cCtocU7S`%Bf=dE?_1!OC5PY15AYb4Q|{)*-TRFxIHv3edmnl_58GLOeC+F
zwS2n5a#U;&<I4Z_@SdpP3W}JS_-mRsOE_KT)Ko*@rr7crm8z4obY#nNBy*LhXl=$n
z;sAs)@`R~&P+rRJ<XKp`l4THcNpC|x-@#?&&A>=FLQ4UO{HmCtmy?(IicCkLgm<Sq
z_=yrrfO5y^(!)uN43q{q@fBU3A@#qM#xWb&OEI&m5=QXN3tvU`O6?1xQrGX;s{L+i
zDD`kg#rgoLAz|HHfA33R{`kcYV=&~<2q~p&#rnos6(Q$DDQ8+xK};V&*Q9mxLEBH{
z?}(-)Fn|ULDuzgg_YDCD0Wci~31Egu0c8UO0RjXNQckew*@y9dQ%YzNIh-u4pnwE|
z3y|t6Re@3CC38ee<QbC&acKl(^35E?2Jp2*R=YOX`ATGt$=rU9gx1xm1!>Y=wnAHO
z_t_0_wDB4=X|a&Dr)TofKA$J1B2#DS{rGu;T6}xsk)(E#cLo4vhf8=06V1+l>GnMr
z!07QIqn1f<20}R7qH_{gRG5UzHkj8cYMru(y5F1UqL0hQ8E|HRle%PpC={`k&uf|N
z4qp)^MPMpG>KHehp8w#1Yn<-2AQ>b4fke!hP`OmxsYgOiE;@}kOP+h|W<zt*wiMoM
zi3jeIO(@L^y_8lFjQL=#=cR*K#}*vU4YxZtTgukJm{WB%yCms2-HgKwfVy$nO;m}e
zuvl^6XbKJEzSV#^j<U;tR(B!d^RsImg(LTS!jY>M9E~UU>nbb3-*wFl@$630`UOM_
zohVNU1De)AfxyFGP9ScXbACnt=S|}uVSf)b0~OWFk1v6G&|r${0@YP`)x#kwu7FQX
z5I|p<P~jC;GoqbIn!^dXIc9v?#Lkh{+D{PRF9`8s6biO6i{N9tPx_T`H(fp_R<kcm
zZx4a#nA)?Rz9!pvrUk3?D~@gzXABKE&P1rF?l(VcepLyR8XL}oPfD(u@?i=RjnNLU
z+BEz(Nnq*O<U_fZ-F+W0G`32mdHeH4_VBbK!on!+A2E<~Tt6uHgCQx+JI>lJr1bS1
zyRgM5QFvA%q>m0Q+R5Z2b;+dP2xD_zF8}673KSG<op8<&AD<>>J2!$o&R=5vcdSc3
zcK+_AgX|V6vy;<K;Y(d;=A8I!NF)3?KHykz$uh864KvtWHTO#qmiAqoSN#X^9V3Dq
zh*B0EAQY9%M&&r_J-U}vAZd4_wp^*VGVMp}q9m}S9QI9v=jaV41YGoh#1TH&tAQIA
zgR*liQZ9dY&fR^$9iGQCSxijuju3PxpXtXz+-={Dk$fa-JqJn6bQ*?Ph~z4nvMahL
zf6WVOKTYJG#f1!+P_MnThvENq57HH$F4z^DYbvjZoC=>-Clwl$>z~1z@_Jcgku{N~
zUBGxziu`P$nB{;9O26i{qQc<OSpIjZZ$8f!frerBlIO8w@7MyQ5bRuD0HX;p^GN_L
zAj*T9`HI<fU+$40{C6fbbMj5@3Rwl_Hd3oqJ%$#K){i(&HJmKG(f5I!8;rb9JSK(Z
zD#4rC?4(*>5+!X)$g{$1*xaXH@pP$(Y~UAD9s1Y(Hdn6ZN((NUp8JJ>Oaaa2l2`pd
z*f}Gyu|F>RnxB1ORGhPnI784B%JtfJ0)b2@Q=Q0iI5^N9!q*CrNwN>rSi(-EE<d3`
z<b}hzjOgRR9qSmmJHs_lDr=b$@Isann51A`p_AK5#^XB${*pg9>F*LedvZKIsBllo
z#ieJFxBP%5(9~?dKiq@{v}=P`1gnBu84Dh-NCPgWu-~FM>^l%S4{&Ozq0>3w;x`fZ
z<FweS8z{LE{Yg-_<l$Nhx$k<(g6avwf5}J7;eyj;l?85_jI3eK2^&wO1&t7Ao&1?|
z!1LOETNA;Ut3dU_7J}4R`V;v&I?Or6x{WZP!#d5|w%<5j0f+J6l~QpI8(Bu~o(u}&
zD6N3CJ4!{BA_OCS(x@Vdvau<6lCQ&4aYSa}1z7>&6h0B%mrq@{;YsA!KpUo!`B!+t
z^w(0^FP(Q*K1TigdM{pU{g7*21rzpED@)HH3gu<wAhu!+ABtd)Xn#{C)k)CAx^>BV
z?Y$Yp`v@;5UD68R55=>=`HG<D&0j_!R=FEh$}T=kv0%jE9Me1w>2D0xSYc9-klXw3
zLlvZ+T2Te!23_v6paRLbt6%@$yAH9lU&nKDs&b#5Bod_W(nCh#;!<2$MY!lHW`V#T
z-_fYZz2ZIEJmnkUd9;X|U$BA7R6&3~1#WLho`=L~B~S*873RU*KCZ<c$;xEnBOIFf
z*=-IUaMIr)fS`2UmzS${$Y$ia`t&OQ0vv^tSY9utOIr?q-;8tIw4hfj<)Hsgm6}dY
zxFH?j&3;L}Kjl=1W;p%+yGSH~0H*fNCtbHr2-r?^b&6$-@r#nEK>uEOax72HdX=6<
zIYnl;;~$g`P7Kzvj~!weej0pC<UcuOIAiSDmuup0ep=9X+y<v)QlO|?s4#8gH%PT3
zY}u9VgnfT>EjAM|Ze>hHvYu!Uh37fHis|P~H`vDHjA%<cN5W0NOmXl78*I`BBUL<Y
z-2%$Yz%88lBF?DQgNWJS-T0W(W4i-w7f2>2e0%s4tw3H%Nh_+L@Y_RvszCJW%#GIm
zIt$3(iWHJ1VTl3NmC9-=glN*IH3|99y0|MOG;^`z>Wc(r?(47hV8H5gA4~Ln0FsWi
zUaV??9}4QFV>@$;yvngnw->XCC;Fi4XKXj-LKFlS&9X`V<ZO4pFr>d!2^^zTuh`Jo
zqKV>v;S}gyNVjvrcRG&lBTKhOeJ-6dK>dX%#1(PpN+q@Mjx-%&KJG~I&m}9R-;@xf
zaNj7<uOtv}NLakxUMC?DKhY?3KA1{8dHD!=u8OBb&xC$f{PRN=p-DM27#NWQtTLVN
zp;v7PsiG(L@&B9-hEOrfD++QAu?6ZM(^Ij^Kdx2M>qd95D;%BXdhYFjd2<`4>qwXJ
zhk<F1Gc}Tb@T-rM9^Q<!Np<=alI$Z-N<pCG?xn0p*l5n&g^Uh=gycf-uvX9VOT^W9
zyYI6BA&{9C(Q*|}2Y;=1Dr?^&odYQf1UJbHM@{!k6y){RjBa`7ylq$)%I|@Vw@%nZ
z7@TO;4DX+M@7fPr;VACnHo$>Qu4L<@>Kdu@t3|#PMH`=Y3FH~L)UG<(BRVQ~wn#v{
zjY<`d_NWkME})0<d~hS;-&Y4&xFJ$KJUMIImu|5N_Fpx0^X!PkCnS*uaLBY@KQGK}
z4YzTYlh16!Y&s3!!^tm_vzq@jOmP(hCDI;eoxf|9kRFrw=y?W{{RtOawEmO29a2~B
z&3|Ne8^3=xiR<#jX-uHh?4rKX<DZztHm1bpTaqOOB4<P$oSr4>)wER)i)~?Z?FLYH
ze6OK=yO2{-YFbo#4q>eBga$vta)EFrV+JHrdxY-w`BUsD!aHU~a3uIc9&U{fsbf^v
z+(x{gK-)wRq@}GA*`}xKyG$&NIm}v5i?S#EMLj^H2NWR_j&{>{bqyoTvi1@C?Ds)E
z;hp}A<T$R`00{`7Hk?Izk0-4$3x-&#mnBC6(R&GHNHlMox3;4H0QnjN7wk}|B>h@m
zM!Ty&tQ=$xu34%Wb!A=FoXpz0emtu?e?Q&!c@}8-sB9Us_uXXMdZZojSS5)vA57)N
z3B_3(={7nZ7BCT1@p6od_>Ev-VNH{q)BIqD?U}!;@>z@^IT14We+Gxj{)m_T8)6z`
zSz`?+g;pZS=4ygBB(;~PZ+qT@*UmgP<;HUKc41u5T%2t(((W&j34foDqV^Ny(M<*n
zK5TtT2xm^Rn($p~irr&l6Df|NAdwB9FX-5WlaIq4{Wh_zSj`Z>P(r*99w+8feyPc~
zfvtgxI3Adgjz%fyZ<@ou0^p@0G7#FP=BfI>A+pUSdjnEYYZ1qOdg#c0>n6>B2sTON
z8-E7q>c*qoFJFJ-shzbd0CzNoC#_nQ!fg6XYDYo`%2~=0Twc2>U7S<!)n(3K{-FHy
zHw1~?s!F7yn!EM}z6^Pir7_7Az$&mU3t6i_>?a5ert7JDztYLA8LWj^7GXNQ^R-VW
zK+q7_j-FQbw2(I&_>`MGGzho_pjSk1)9uN?;`K{B1F`KgW1-3<QtnZuWx<qH9jb-C
zUh(a|@`btQL02(_fD^>Xtt<+OgRdHa*+aA29H8UCZQ`5wgdg>^WyuT0TEyFtUC+C7
z75%(ckw6JaYG@k>8egjA;!vQLgjxIxC-w>VPd+fWxH9_1>cL?qsHa*Whyw@|0s#aN
d>(fc#BS!?1Ojg3|rDw)|0000000000001c%dSU<o
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart.env.eml
@@ -1,83 +1,83 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped clear-signed 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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
-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
-EJEb842fcu9JgyWlpa2TXKIAAAAAAAAAAAAA
+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
 
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent
@@ -12,45 +12,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-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
-jGjkLUObJRBjsVH8Avs/va2ci/HyAAAAAAAA
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA384.multipart.mismatch-econtent.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -16,45 +16,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-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
-jGjkLUObJRBjsVH8Avs/va2ci/HyAAAAAAAA
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart
@@ -11,45 +11,45 @@ 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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
-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
+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
-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
-ArMKsAAAAAAAAA==
+DTE5MDcwMzE3MzAwN1oXDTI0MDcwMzE3MzAwN1owgYAxCzAJBgNVBAYTAlVTMRMw
+EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYD
+VQQKEwlCT0dVUyBOU1MxIDAeBgkqhkiG9w0BCQEWEUFsaWNlQGV4YW1wbGUuY29t
+MQ4wDAYDVQQDEwVBbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOBfD2Up3UqD4VDDHVVPHCFalj8dR4PjlGc305O73/HZ8DliaraE+jvuRX+N9pD2
+yHYyJt5u0nqNHgQtbNVtM9pGM7T5FQs0pQHzIP+WxKZD4FUlkI59i8bGLgx0c66/
+0J8FIPmXcCBabNvT3CvFxUHmijXP65uFGIUU2d+IhFEH+0EFUkGWsT2Qrp8Y/qpP
+k9SmiCnfygiyV/YRV8m2xjOU09AWsUGoXbZbOGlJ8ppoaKkN3yScESAei7Yf5tUz
+7yhOV4+m6Ir2NANAxoRVjWZsTrw1CWvR3DMHNzGpoM2XcZ6eNQWsC+lZMKtUs8An
+KiAWjNZFWlGLxrABpeB+cQcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANPuQhBnl
+ZjyzSZMAwT/Az86G54h/sv7N/GjUbtuKibrwedtvh1vugTMGVvi3vzxaI71D0kI4
+C+GBQ7yp47Qv2Gqz4jt3t0PYYpTEZXbpxNWJfC3Yetc2zSz/yS4B66CAs2theWCG
++NqswADXiam2U/tPMm8QYlCWZatr9C/ktmyz4UuCW9bDSEItwZy+X/55Z6Yt07Fo
+Cx/ZTdgg3jCtwOqkmhIGfKXQPKRy0cyRg9ph1Gl71GP5a5e+sWF7sKmJSQ4PtLyP
+E/39EQuxRz03W6iWY7rW76ZuRGp180VS/6792MzGM++u16dtkH/U5PnzqVG7CL3Y
++H/evsrVbrIMdTGCAvkwggL1AgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
+R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIDBQCg
+ggFhMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwTwYJKoZIhvcNAQkEMUIEQIDt
+IdbNbMpZ5GN0mWvd8LPPByCCdkoPPPx0FE23D5CwnagYOMkbOV35hzVG+C0VDZqE
++HLxo4Ki0iR/UTmAz5kweAYJKwYBBAGCNxAEMWswaTBkMQswCQYDVQQGEwJVUzET
+MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAG
+A1UEChMJQk9HVVMgTlNTMRQwEgYDVQQDEwtOU1MgVGVzdCBDQQIBHjB6BgsqhkiG
+9w0BCRACCzFroGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
+FjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIG
+A1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJKoZIhvcNAQEBBQAEggEALSlFzzCkvVYr
+Gk+i/7YEmZHg5jDewy4bNl/i2FXNaBhu8cgSKTeHVv3/znoDui55TV7mkvzDOiiG
+3UDwU0Gig4Inq0LrMPgJnVzMbsYx0eToAkNznPbpWqQi063X6DzulxvcJxUDfmge
+x30isoIdRSmsF8nJAj76f64OQqKYNBaZ+RLds4PvdIwHsO3tU+ZZMStqhHlXRb0O
+EHxNTUGxC8FsmthIyCUF+Uuy/EKOFEzlD6l/HbxZbg+UZMPF16d73uQdtq6CE5RS
+7HR367IHdBgph2kpGFmT7VnqnofVCmM5vBK6TU1Iyd1J5MSLBccGvi5yhQHWpFy2
+oLOutbnYBQAAAAAAAA==
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart.bad.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart.bad.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,45 +15,45 @@ This is a FAKE message NOT from Alice to
 
 --------------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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
-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
+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
-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
-ArMKsAAAAAAAAA==
+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
+oLOutbnYBQAAAAAAAA==
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -15,45 +15,45 @@ 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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
-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
+BwEAAKCCA2IwggNeMIICRqADAgECAgEeMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBW
 aWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4X
-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
-ArMKsAAAAAAAAA==
+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
+oLOutbnYBQAAAAAAAA==
 --------------ms030903020902020502030404--
 
index a5e1a0bd059209d22bfa8207582793aaa5e0a41e..2f09f19f96b0aba76f5545f3af1784a030a0f902
GIT binary patch
literal 3467
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
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart.env.eml
@@ -1,84 +1,84 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped clear-signed 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
 
 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
-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
-XgAAAAAAAAAAAAA=
+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
+OwAAAAAAAAAAAAA=
 
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent
@@ -12,45 +12,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-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
+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--
 
--- a/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent.eml
+++ b/mailnews/test/data/smime/alice.dsig.SHA512.multipart.mismatch-econtent.eml
@@ -1,11 +1,11 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+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
@@ -16,45 +16,45 @@ This is a FAKE message NOT from Alice to
 --------------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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
-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
+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
-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
+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
 --------------ms030903020902020502030404--
 
--- a/mailnews/test/data/smime/alice.env.eml
+++ b/mailnews/test/data/smime/alice.env.eml
@@ -1,25 +1,25 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped 
 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
-SIb3DQEBAQUABIIBAG6R/5Cvy7W4KLh3Xf8Wfx7wnoPwtryc79Ebr1pugkO809wM
-Ibq7yWNfgibUWeOvRqB+egvzmqBVPnSwMKXTFynYaAfle644pxxWgmZtpVWljjut
-SzdA5dVF362VEPvE4w23J6F7iBKprQaR/oVuMVkPiKJ60RC2kwWbxqQEjaggZZcf
-p06RmPkoYrNRnC+w1EdW2NgF5pysLbwJeU8pnQ3aHrJJZQCT2DS0x8LEJlD/2nqP
-QkOjbbyEQEkRrBfAaHUe2UWzPR23d+SXWW5A5o+lZ+nUjI8AVIZeJGaqCLrRr1Yh
-AaSGfI6ljhRmDTWMWUYzVges/zy6ytbKGBlyhlMwgAYJKoZIhvcNAQcBMB0GCWCG
-SAFlAwQBAgQQHEXVhM4cyVqmNmnrikcoj6CABIGgb9vItAfaCFrJ50tZjj/N3cjL
-IVCElHrgIR5tPi8mkVY1y7GCd/cdzuFdmxw1iyWP+Zvwrfej8mdm6QFkIS9IllWG
-Lc12Jfp/56qL33J+lgO5aESvyUS0BebFeEw+1fPX6WZ7HCiT7T59fEe/6OY53jwB
-OX4MFJ7oCXuab8+41asBkesqlk/m6nr4Xc0ZQyc6lWOEyadD58qCIlK93oDyqQQQ
-Zx+IX4/BKPtzSyYjK5tmewAAAAAAAAAAAAA=
+SIb3DQEBAQUABIIBAF/hrNlODAcTHs3H3PvosTsDKI0gY/R332XAbJv5HHBTbh+D
+FHyMfkXV8tc6AGf4XVBrPWbsYEXubJXtPvVxKURmTclLsUNQbujxWKc5K2jpOxgm
+Op680+xy/QLmUYJbt/Jvu1hzgBxiP4fNDoosaHhP4WsEMP/hL1697ToqT11dEOch
+TJ+jMFgDdJ+myFemEign3Lcr5EY01rSPgafim6ssVdahBOoc/t99DQmI/Qn21nKC
+XJEC6Yh6/TTh/tTLIyYVeVrzqzbzjBafrUejSWloa+i+CGH9E0I+rUIDe/5jYd88
+sKTLUfEWVg3jKrWQ6zrrzJeMnPWZq30fgT2dHrYwgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQ2xA0IpGGqNlwB1JAEfYHEaCABIGgTXgf5ThLrdarvy596IQ5u36t
+aQWqJch4j3YBkQkWdCng2BqKwBWZMbzYKRSep0ob8h6jRtBOmdweMHkY6p7yP5fr
+7V69e5JB5OsYlgA6JeKmy03TVXfCsoMZHCE3QBDj3bKcf+xt0JavuQGqNPFcxhYt
+7tv6ZIqcGsbw/6TThtABkqqx8bEkbNqh+1kdzzEsp/1j11JbZmNCq+b1UP0pRwQQ
+9M/dXMfv/WndDbButdD9DQAAAAAAAAAAAAA=
 
index d052f233ba5a85dba66720f75ebba94dbd90dcc2..e9dd941c890ca3495b57de4df692138599100e1d
GIT binary patch
literal 1641
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe+klgeRhy5QNs5)h07(HO1H*zQ<|KnA<~V~U
zCbtF5OpHuSjB*CNa3ze~KpiPy1DHcu*o2uvgAIiZ1VJ1QVJ_#yoXoWRqP)yRLoovp
zkRZD-uWx>7UP)qRo<dk=YPq41fdELHOPJHi-#s)~!7n)2P{cq8B*rYv4df|=q!yPb
zI6E51iSrs-8kidx8=4y%7??+i^BS2TaSa+9sO$^{139=qIT^(S9dk01Qyo$(5_1c3
zQuUJaa}D_ncpwgC1<M&UF)AU44I?W9a}y&!15licsfm%1;Xyoqs^(p<=7#}?WkdaC
z6r-lu%epr|o|0~UdGhZ2A8&rJOv>8U^2_?2Yklvx3ExhX8L8dNyHwRH$D*5aHP`r-
zoAH*PqTD7+89yuhpLS%K^Mg>;34OKQ$ByaoloYSqe_=kW!q4di3Q;+?FW=EVdere*
zm+AS}vs)!vMQ+~jXbEKh?Z_JBIBlctgmv>J{;l$#d}UdO=KWI~o5H^dhM(Ma%y`P>
z3t}4`SHy0Mw#fASG%F)xCGUNeIf4pu-P`1!T{V8M;TPV&>_yi%6K02FEup<>IevRg
zIkPX`F=jV6T)E)v^ul@bOj*}(zl=0k9kTg=x|V`i&o$Sm!0uxk7?(b%D`aP4W@KPQ
zOFhh>fHC<!p+)j(n$2d<$qWbW51c>O_PnEh)4#KSGOpy^?&{q2q4IWqd-S_TW45p#
z+xOc<DerZ@<YdA9u+e$X%Ew#uZ)9zLWL>`9`9{)|BdKLCk6i7n(Y;Z1-R!K+|C4%*
zuNO3I&Q7dMX!~(%%>jn%oh!Em|MoY^7f1@2mbyCoi~f^sIh!APH$`7N?BS$)aL&H?
zf0gOWbT4nr;FiDXdqd%#!P*0_mdp}jt66%%W=YY-GZUL{C0@y_zLNYid-}eOiPalc
zc6##hZ`so?{P(XQ_eOVH^XL`Rl6PHuzbwxstMs#L(EoLRZ=5-1{C?f_<+&5;uRQtr
zd1c^kj=eX2)Zg28>T2F5o>Idmrjx)Nb`+Qy4KnGIpFsH-k?R*UF`61kAd)+?AvaPn
zV4#eUVKEeA5n+-q;8l{A5!tcy|Bq6$xkuHHZ9ia8!N#f0#>m3hWG=vBm`zWARIzcx
zoF~A<ZJ51)j&`Hwca|nbhD63zsUPYZ%ks`=eTWt_?p6(#z4e|;J%9Pl7tIdqSt9P2
zoV}m*M{Ij#&~Y}6=pBb1sK-}5Jawqc!PDnSgB^E!>y0UW=h{NsE+*fWoY;1?$EbSQ
z(x!fwi%Y%dY<V4|`0?bW&VQO`1MN*KoUce&tYY`SGx2!YrHV`Qf=o6C+u!dvRj8DC
zv}*UQ3u>KQy<h6xt21V+yGL$yl)hb8CSY-`Vadi$7Y6HZ$Ax?aY^viH9l94g$t(Mp
z+3cm?+qLh>COvy{SF+*z<*1UonPwj?mb^LiY6qkG&m%`4aQ7D5<z>WH^sQf^Rrvkl
h&m%ckUq}U|@JyWS_uhZvr`9^1r1*2k)O#4f001+cMuGqU
index 9cf365f5735ddfebcd448783b6bf30c293c8b057..3643ef3f353a7c22e553e2ec8f7c9b87ffbe5ec0
GIT binary patch
literal 1661
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiIJ7T07(%e1H*zQ<|KnA
z<~V~UCbtF5OpHuSjB+3yP$i7qKpiQD+y<O%%%Lo7!c3vThQbDdAP$ExmvdrHW?Ftx
zUS^`9n1KjLkX@M9H@`HmBr!8jAuKbs+)&6s03^;O%<1Is9vZCR7aVLTVju((V;1HH
z@)SZ+i%S%o9S!8fc?~TM%nghU&5aEV%%jA4jZBcZ28|6=c7}q19NeFrjADY0Iho0+
z4yhH1xdl0?ddc~@hI|G*5QnmY<qVn_m5{>*7@EvYjQk8haW1ANMn;AQ@%*WpcfFb)
z1{{_R^_NkMnr1KS-u!q<y7}eFyYGLz`N1+NYg@}N>vyj8z27E$J5gq&b}#QzRj(Y2
zZqC(Q<6CaVTYidin=EDgtnh!@k!8*gLRBa9)pj2{rpHrKyl(%6`K$^*rxz$h<=nn}
zNBihe$7fxp=U>lmm1q^YdB3A2ko~tKYmno#jkXik&6oJM%75~eWgVLLPjPGt|0WoI
za@#TEDVHyZZFF1_yDi!x)AQ4;jEt4M_f_TyD#&$jlYe&A_`QZ-c>l5&UEfTY9gekx
z_NL|d?J?!dzIex&-P~~Hg0s^L=gl)^UBmq{(qMJS<^$?l3SvFiT%!WJk8NOF`k=0m
zor#%|fe|hBFoOcd<oARY$){;Hn>{Bp9JD`h{#@Jhj`~gi&i=``l6SkSbJvH;+xhL$
z?;4HS!hUSuZxf}w*ZGo@1^2^7=RGSQZ_&SzwfT{C`F7_UNmGubmc2Z3wX;U|M%8t*
zvpWAz>M_1v(6Bi>u`;3U$E`I77_N7&+!p-X-zZ-oDPUUa>g+H2PqyW3e(2p4eeJM^
zlkUMe`{MsqrZ3aIyfK4Y{-*B@g?k2T54>73ONgyz=>?l5MHkOZY`&FvCA0cU^3Uw)
z`!*(4Z&=ys$;ZECPrvZrzk=Kw-EGaIS4>OZb?yDKJeRD}&#poL*ZsY5=9uyOb=Q~Y
zPN=`~<mcy=fx9{O-uO{}Z{Mk_d7F4j4V##50(00^V1_ivq)&c==3}Iszo3cH(Le%`
z<e3e*k%|HXeS{2)p%RP2rtET?!=|kh!atiXSZDfg`>D9|3y*g`c~N{UV^-3^pKS&e
zY@FI`j4X^z<^n8++4S^R6&p9qsRB&ghS>|~8>UG4pQVYB!Cvr>`m+PM$Frg*UH5wU
zPHSOiavJw1zrWrWUK`K<oxVgvcF$hfY}eIuO`a7CKeVc9`Qx#I>D!@g2iM&=w0B=Z
z)T`bQ<u|WPEat5{=Op_(;~sN}--&5%VxLbm+D)uAn51XE<?_OfPN{c~oMoM(-&oMt
zBocpMMuXm?=4r>n6kpEdSjEw_=00E5lJu#Ov!q=PifNyGmU!Ll@r4g(3%k1;Ke9ym
zZh7dpc3bPz6><+I=v0@S=Xk=j!a{Ybz$OptWQLm1@4t6j-ASt~R*kq}^X%@FDO0~}
zw9r#Y>QHY~TCx6Wd0DN*9Jj}s*Y^Y&UeOnsIHzv4|BIf(4b8I6EgxPqev`6g00RK>
CWmAX%
index 5a8d53845be35fcdab9dca7a11a748a1f2ac1767..e93f04bdc74964610bbf337c30825ed2f7509556
GIT binary patch
literal 1677
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiHViL07(%e1H*zQ<|KnA
z<~V~UCbtF5OpHuSjB+3yP$i7qKpiQD+y<O%%%Lo7!c3vThQbDdAP$ExmvdrHW?Ftx
zUS^`9n1KjLkX@M9H@`HmBr!8jAuKbs+)&6s03^;O%<1Is9vZCR7aVLTVju((V;1HH
z@)SZ+i%S%o9S!8fc?~TM%nghU&5aEV%%jA4jZBcZ28|6=c7}q19NeFrjADY0Iho0+
z4yhH1xdl0?ddc~@hI|G*5QnmY<qVn_m5{@Rk(GhDiIJZHD9**y#K_3-Af7)}^R8F(
z!+^uGq5d+8QPb>Y-J2gzNjJYddH4N~H$PY=Wo>KuW&O^zzW3XNZzsx()b8b7s_K<v
z(apJ<YkbSic*{>wZj+^qpB4U3JF?9AL8$74zS{0%$Mkqgir4MGFrQW7=kx-FsGQrE
z?`R)A>iDe7^!)4DtrD#wH}7|}1hW5jWDRnhw$XONy7?0SR{2l9vaCb%{wa=4;ok(q
zPi{MAJmvBQv5k%^Vz)(GWO{y@m65TM_rA&;K?S+)ZSv2q8o$@@3-4d{qU)Opv%|5L
z(B8Bhzdfd$*%$8^vzr^PTyS=J;k<dKtZTSmMjEUR*?d4<OF^vXnrl>G_puF(OCQt~
zvNJI=GBBd09%fL$nEam5BKb7UX0zvHhJ*G8&Yx?0-ci5l-`PJISMqLmb?*95c{{&7
z`dy<jTiB27`)#6>_c~v4vfzH$=)7m;<1P9(vNk`mF5m8aBWcQ!)UuaHu6EYw-l)26
zc2?*ANj=8b3mP_OCsro3{kXN}0K@gpmD_@U`y1s8Bn3=MU7h_!|H-zT%@4hsqOTqH
zaMC?EXJ7ok%JgNrmp5i`%ir|9p>WS&?SWTIW(l#?EWKc}r0C+AiOshXuVhwVN&cBV
zec#5!>J2M9J^A>z?CBT&`&W>Aqr0tn^onW8yRN-omgkaH`q?$;|GK|7&Kxs-zwY|-
z+zItpp8Wj0GH^G?-Wxya@9jHvHE$D7sbLe-OJELr3e1oOne@p|(0q)P^A|KR1{z2p
zl035^H&RhxV2_YtF*IT^2)uM`{rX$aShl})njX)=5c5WR+5X-m;z!qYoN<$u+xVz%
zd#c2{jJccc)(6dJC|YD|P{GEj&Bn;W*kmriVwg=&e^#+^!<;U_#BG?pfWBdjR35N2
zF){?0$8sueuGIbXD|=NS|GXc6{~T-gf3qq3Ok%`}Pd1X9mu+fyI_zH}C4czdiR)io
zlTB+)0>1Oy?)t~BpOYNse}Cht$BWEYZ<R@#Uv1tmrOm_k(&RY9$)(=)y<X`D+`8l+
zm^x?)ig&Mmm)jP%deh{fj`xojCWi!0QD!u~bicxmxi#(kmyLU59G<Fta&@W;RaR{G
zvJ^cQ<iz<{rnW{rGG^wwx_H@+>Hk)0S81{Cn{~EWR>D1UTk5+{dlP+=-?3cmc-_O$
zArV-*)2w)&M%`V-*?cF@PU<+SC6VUG8h!H0fm#0;0@z|o{i3G&Ub^{5KhlDyilrfZ
R^PjiQ(+WTC?qXp80|3U+PznG5
index 99b5f34fab0ad27490b51eda8ec0526610f3782d..09f1bb86542bb3c02ca4182415cb4409bcfca125
GIT binary patch
literal 1693
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiJ6tb07(%e1H*zQ<|KnA
z<~V~UCbtF5OpHuSjB+3yP$i7qKpiQD+y<O%%%Lo7!c3vThQbDdAP$ExmvdrHW?Ftx
zUS^`9n1KjLkX@M9H@`HmBr!8jAuKbs+)&6s03^;O%<1Is9vZCR7aVLTVju((V;1HH
z@)SZ+i%S%o9S!8fc?~TM%nghU&5aEV%%jA4jZBcZ28|6=c7}q19NeFrjADY0Iho0+
z4yhH1xdl0?ddc~@hI|G*5QnmY<qVn_m5{@Rk(GhDiIJZHD9**y#K_3-Af7)}^R8F(
z!+^uGq5d+8QPb>Y-J2gzNjJYddH4N~H$PY=Wo>KuW&O^zzW3XNZzsx()b8b7s_K<v
z(apJ<YkbSic*{>wZj+^qpB4U3JF?9AL8$74zS{0%$Mkqgir4MGFrQW7=kx-FsGQrE
z?`R)A>iDe7^!)4DtrD#wH}7|}1hW5jWDRnhw$XONy7?0SR{2l9vaCb%{wa=4;ok(q
zPi{MAJmvBQv5k%^Vz)(GWO{y@m65TM_rA&;K?S+)ZSv2q8o$@@3-4d{qU)Opv%|5L
z(B8Bhzdfd$*%$8^vzr^PTyS=J;k<dKtZTSmMjEUR*?d4<OF^vXnrl>G_puF(OCQt~
zvNJI=GBBd09%fL$nEam5BKb7UX0zvHhJ*G8&Yx?0-ci5l-`PJISMqLmb?*95c{{&7
z`dy<jTiB27`)#6>_c~v4vfzH$=)7m;<1P9(vNk`mF5m8aBWcQ!)UuaHu6EYw-l)26
zc2?*ANj=8b3mP_OCsro3{kXN}0K@gpmD_@U`y1s8Bn3=MU7h_!|H-zT%@4hsqOTqH
zaMC?EXJ7ok%JgNrmp5i`%ir|9p>WS&?SWTIW(l#?EWKc}r0C+AiOshXuVhwVN&cBV
zec#5!>J2M9J^A>z?CBT&`&W>Aqr0tn^onW8yRN-omgkaH`q?$;|GK|7&Kxs-zwY|-
z+zItpp8Wj0GH^G?-Wxya@9jHvHE$D7sbLe-PhbxF3e1oOne@p|(0q)P^A|KRCK^Z}
zl035^H&Rhx;E#}DF?3>aXn3o5?QG7e$S27qGqdl0*nFN{p{dM^-{wz=i0^j(2^;3F
zkgzx@Z5jKs-PG-et|;%UmLEkQ7dI`sq*5Pf*>HZQK?NJ9HX9=gW0Sc6i(xiB{awYz
z4fBcs6SraZ0{VtIQu)Br#K@ql>3ZH^$=)z+DgQ<Px3SEe_~4nry~BFaX7P`1gr3ci
z$oqIgNYlJM?C<|`Rm{8eDt+UgP5N`#N~7(r!-rtUMa@m>tDRmO{NS7$b0+VY;l(E}
zn4F8}e0v$SMCtO{>o08HO_#o-F3Mb&A$Po1X;YJ|tL7T<lP8(%e$}tzb6PaRL~Q0y
zp}U)#-<R~TZ+QDQ_*tZ(c2-Mexa(d%ff`?5$Bo<vb7tM}IHAh=(|gk&r#=y%r~E7H
zW%oqp@lQ!PeDwPA>U&RQx2<auo)Yw?r2O?J_7Vxr_DoHQ$jNUbU(IX3%9U)nM`)L?
jugA%|o==W+vmR&Lr&rX<cx_3{wgsElZQXf;l>rO@PC#3`
index 6605d0ee5f6e80684149b09f4a92091fbdc26136..bca6133360c758240905c35eb07dc80ebb18b61a
GIT binary patch
literal 650
zc$_n6VB^$k^Jx3d%gD~WpuwPliIKsuiLuq7iLnvLG{`haG2}MjWMd9xVH0Kw4K@@u
z5Cm~Jgt?p(b28KNi}ErP4aE#ZK!WVTyuSIRc_oRNc?w~fspW=31_B^)E@4h5fA`Q}
z1;5~6LlFZZkQlQtH;|_gl3HA%;Oxl6sA0ehcL^gSD+5atBSZYdH8=fu*oEcJ9>4SZ
z#YSspjb4T1FXi`B59G}LDN_)fC*Lem(^Kbq_0x4LhV&n?0ok@`ZxUSJ<xG8R_q9;d
zCC&Gw_eSS{ycZuMmRo9PytI~3vzoW(@|&W+OwR(FqPKs_-yKohAd_U@ewMFGC!@mu
zVK$4w|A+c<d*51V`NzfzJXiFYzt|vxxn%yb6XDB*G}P~G*M8z=a&1e0<MKzdSL=jc
zTgdWC=HLBVUe1ocoZqe$HN{M1df8F+*W}^9E2ov!L@T2{uQvPKBQ}4n`(n?`jO-Wt
zI1>K~JK3#uVy^y|oOs`6!;;g1AH~9WA8T!$@Y?G2ndv=qzRp}-E8l24S8kgDQsgii
z$g*)Jw0SV5GP5u;u?XB2Fj1P=w&G?1dys?RH+I1V4J?fdd@JOiT6nL$wtBx_?TZ%6
z-F0g-Sy!o^sOT?aoX9CwqWR#4RM!E~nTC6AXo}2R?j`+6Zn4`1znORB3@RmF&HH3O
z{q@_pz15Q(pS+fs#$cuTXxVAs%c13mHZ@DiD4IJ6JifbWPW_wQ3)9x`WL#zPG3J<<
z?z`K+Qo80y9sBTq$>p{SjFVPv{J2pi=hnjCk+SCvb(a54z8(~vmh80p+1G%-n(izD
YU(Vl+IsX1{=3U+md0Q|1<z;{a0B!~f(*OVf
--- a/mailnews/test/data/smime/alice.sig.SHA1.opaque
+++ b/mailnews/test/data/smime/alice.sig.SHA1.opaque
@@ -1,42 +1,42 @@
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
 JIAER0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpbg0KDQpUaGlzIGlzIGEgdGVzdCBt
-ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDXzCCA1swggJDoAMC
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
 AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
 bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
-IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMTkwMjE4MDkyNTQ2WhcNMjQw
-MjE4MDkyNTQ2WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW
-MBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMR4wHAYJ
-KoZIhvcNAQkBFg9BbGljZUBib2d1cy5jb20xDjAMBgNVBAMTBUFsaWNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6A0eKJceDthtJ39UGPIyNOQ+abdT
-OnjCS/u/EriNk4YGoLALoy+nPBwcR+DtKXZDMpgp5TUqjSxuMSMUVbqUb0C1A4R/
-YDq2mdYNG/kX4cNVZomo/fJff1SKCD4g6LAy+vmX0Di+GqevVxwqSXKz6kfTPmLT
-MoVApmA2YLQJ++PKDEe+qCNpkI2R/C39Mxk2WHhfpKNo0hu3UwrwZfOzTVCrWG3Q
-87eAxqi5QhFXBilT+GOLr8Ez1pFw0TCEWJ6qpTzHqR0LaoK8Z4YyFjbaPaXHfMWW
-BRy8g4IEiMIlFRo+m9qCQKbNXgbHvrT6F6Ywd3l+rdOFiePPwdSbdddLmwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQDQKKFZzkOUjJFeZla4Am7ujEDlu2EiSqmW3JJb
-wIFT0olQekrpjFpuhSkP72Li30Tlg0qenTTS9YmC2TkjyjRyuhcMc8w1yA/djgw2
-g+0Iouqd8+AQyx9Ac4DkwWL14Sv1l92svcofDzCb2ofRRCyAEGFO4ZCXqDJ1FJgj
-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
+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
--- a/mailnews/test/data/smime/alice.sig.SHA1.opaque.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA1.opaque.eml
@@ -1,47 +1,47 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: opaque-signed sig.SHA1
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
 JIAER0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpbg0KDQpUaGlzIGlzIGEgdGVzdCBt
-ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDXzCCA1swggJDoAMC
+ZXNzYWdlIGZyb20gQWxpY2UgdG8gQm9iLg0KAAAAAAAAoIIDYjCCA14wggJGoAMC
 AQICAR4wDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
 bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VT
-IE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0EwHhcNMTkwMjE4MDkyNTQ2WhcNMjQw
-MjE4MDkyNTQ2WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW
-MBQGA1UEBxMNTW91bnRhaW4gVmlldzESMBAGA1UEChMJQk9HVVMgTlNTMR4wHAYJ
-KoZIhvcNAQkBFg9BbGljZUBib2d1cy5jb20xDjAMBgNVBAMTBUFsaWNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6A0eKJceDthtJ39UGPIyNOQ+abdT
-OnjCS/u/EriNk4YGoLALoy+nPBwcR+DtKXZDMpgp5TUqjSxuMSMUVbqUb0C1A4R/
-YDq2mdYNG/kX4cNVZomo/fJff1SKCD4g6LAy+vmX0Di+GqevVxwqSXKz6kfTPmLT
-MoVApmA2YLQJ++PKDEe+qCNpkI2R/C39Mxk2WHhfpKNo0hu3UwrwZfOzTVCrWG3Q
-87eAxqi5QhFXBilT+GOLr8Ez1pFw0TCEWJ6qpTzHqR0LaoK8Z4YyFjbaPaXHfMWW
-BRy8g4IEiMIlFRo+m9qCQKbNXgbHvrT6F6Ywd3l+rdOFiePPwdSbdddLmwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQDQKKFZzkOUjJFeZla4Am7ujEDlu2EiSqmW3JJb
-wIFT0olQekrpjFpuhSkP72Li30Tlg0qenTTS9YmC2TkjyjRyuhcMc8w1yA/djgw2
-g+0Iouqd8+AQyx9Ac4DkwWL14Sv1l92svcofDzCb2ofRRCyAEGFO4ZCXqDJ1FJgj
-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
+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
 
index df812b4293f29c84c76b142e0688f6df7ec65334..2a0837b0df5189cc81f0c6dbb43ecef8d364530c
GIT binary patch
literal 3035
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
--- a/mailnews/test/data/smime/alice.sig.SHA1.opaque.env.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA1.opaque.env.eml
@@ -1,75 +1,75 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped opaque-signed 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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
-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
-4AAAAAAAAAAAAAA=
+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
+oQAAAAAAAAAAAAA=
 
--- a/mailnews/test/data/smime/alice.sig.SHA256.opaque
+++ b/mailnews/test/data/smime/alice.sig.SHA256.opaque
@@ -1,43 +1,43 @@
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0B
 BwGggCSABEdDb250ZW50LVR5cGU6IHRleHQvcGxhaW4NCg0KVGhpcyBpcyBhIHRl
-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
+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
-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
-X4GxVSMAAAAAAAA=
+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
+fDoI7erSDAkAAAAAAAA=
--- a/mailnews/test/data/smime/alice.sig.SHA256.opaque.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA256.opaque.eml
@@ -1,48 +1,48 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: opaque-signed sig.SHA256
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 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
-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
+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
-T0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4XDTE5MDIxODA5MjU0NloX
-DTI0MDIxODA5MjU0NlowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3Ju
-aWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEe
-MBwGCSqGSIb3DQEJARYPQWxpY2VAYm9ndXMuY29tMQ4wDAYDVQQDEwVBbGljZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOgNHiiXHg7YbSd/VBjyMjTk
-Pmm3Uzp4wkv7vxK4jZOGBqCwC6MvpzwcHEfg7Sl2QzKYKeU1Ko0sbjEjFFW6lG9A
-tQOEf2A6tpnWDRv5F+HDVWaJqP3yX39Uigg+IOiwMvr5l9A4vhqnr1ccKklys+pH
-0z5i0zKFQKZgNmC0CfvjygxHvqgjaZCNkfwt/TMZNlh4X6SjaNIbt1MK8GXzs01Q
-q1ht0PO3gMaouUIRVwYpU/hji6/BM9aRcNEwhFieqqU8x6kdC2qCvGeGMhY22j2l
-x3zFlgUcvIOCBIjCJRUaPpvagkCmzV4Gx760+hemMHd5fq3ThYnjz8HUm3XXS5sC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEA0CihWc5DlIyRXmZWuAJu7oxA5bthIkqp
-ltySW8CBU9KJUHpK6YxaboUpD+9i4t9E5YNKnp000vWJgtk5I8o0croXDHPMNcgP
-3Y4MNoPtCKLqnfPgEMsfQHOA5MFi9eEr9ZfdrL3KHw8wm9qH0UQsgBBhTuGQl6gy
-dRSYI6trP8qBNkqyDkQtsE+Q0xyOUK0iE+cRid+dbhI7QRHgxJnmTT8TUIpG7X/P
-2QFpBiOc+eUzSr6+MUGf9gtaYoOtdw3TZ9/QgVKw6Mr1HrHaL5UXykNN9uQR9SOg
-ECfobQ/gvBZk48ZTwlW2nwYMsgGzXuPOpf+LyiSukxMc1mxTIOyncjGCAtkwggLV
-AgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNV
-BAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxML
-TlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIBBQCgggFBMBgGCSqGSIb3DQEJAzEL
-BgkqhkiG9w0BBwEwLwYJKoZIhvcNAQkEMSIEIIkBFBAciGamC1l8rrQ9Rf3QYbZ8
-NKqgsYvmT/s/qgusMHgGCSsGAQQBgjcQBDFrMGkwZDELMAkGA1UEBhMCVVMxEzAR
-BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNV
-BAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wegYLKoZIhvcN
-AQkQAgsxa6BpMGQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYw
-FAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNV
-BAMTC05TUyBUZXN0IENBAgEeMA0GCSqGSIb3DQEBAQUABIIBALz/uStztR4vzOYR
-sx15VeF+ncoXL7mgt8iDT8Q9EgUJQb6sAm38gFbiGwxBB/jdKQTsF1dYt8J/yrHL
-w4E8DJt+qnei3KTauPDg2lCSo0r978mx1pKxksqxP89va6WPsuaQrBtCIbHEkAhU
-aUFHjjaZa5G2jGlwzVh0YnrZXrLuxPxa2EjdHZt3aGfLdQpqBYoYZYvNvfp/7cLI
-6IFv5uSag7dpCpaleXb0WFnW9UylO3GyIy/my9G7H547VkuusAhzKfs20vXEHnj6
-Q7Z+ptvkTLAmJSHora0xLIiKIKobK/Zkad01iwGmfRqvnQ1M41VZ08gXUl8s6lYb
-X4GxVSMAAAAAAAA=
+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/evsrVbrIMdTGCAtkw
+ggLVAgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
+BgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UE
+AxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIBBQCgggFBMBgGCSqGSIb3DQEJ
+AzELBgkqhkiG9w0BBwEwLwYJKoZIhvcNAQkEMSIEIIkBFBAciGamC1l8rrQ9Rf3Q
+YbZ8NKqgsYvmT/s/qgusMHgGCSsGAQQBgjcQBDFrMGkwZDELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQ
+BgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wegYLKoZI
+hvcNAQkQAgsxa6BpMGQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDAS
+BgNVBAMTC05TUyBUZXN0IENBAgEeMA0GCSqGSIb3DQEBAQUABIIBABC3gc5l0jis
+U2prBP6YpKTjJef8Sp7RegkL37NO1GfEg8lVZiFZGnWGMfGD6fE5tbiixS3HIhnx
+isW6nO3fXwkboPDJCkfyt8C0ysSiIYpKhwKWAZ9Ed2D9Lo3D9UJLuHbpHSTGcGTr
+z4VqoVE50hXAp7LtaVt83ZT+AyLLLLvpp8bcBB2S1CvCdeGFJ3pF56zz9OEm+Sxq
++FsbbyokYg+fIETDeAUGhCRQKAU/QCvQEP3bRcxRt0yTZvX7f60ga9j5kZkbRuiO
+U5CWfXBZRAipsk1fMwkJa/bFqDfVXDXnzke/nHSfw8WtHPL9SeVMqZyS5RBi4Gjd
+fDoI7erSDAkAAAAAAAA=
 
index b89e56376c642d819c17a7a6aac96a753fa7e09d..8678aa4990eb9e98094a2dacf5c34f585ba1cb67
GIT binary patch
literal 3067
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
J00000001{}t@Ho@
--- a/mailnews/test/data/smime/alice.sig.SHA256.opaque.env.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA256.opaque.env.eml
@@ -1,75 +1,75 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped opaque-signed sig.SHA256
 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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
-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
+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
 
--- a/mailnews/test/data/smime/alice.sig.SHA384.opaque
+++ b/mailnews/test/data/smime/alice.sig.SHA384.opaque
@@ -1,43 +1,43 @@
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 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
-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
+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
-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
-jGjkLUObJRBjsVH8Avs/va2ci/HyAAAAAAAA
+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
--- a/mailnews/test/data/smime/alice.sig.SHA384.opaque.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA384.opaque.eml
@@ -1,48 +1,48 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: opaque-signed sig.SHA384
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 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
-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
+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
-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
-jGjkLUObJRBjsVH8Avs/va2ci/HyAAAAAAAA
+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
 
index e1df4837249add8236b342249f3d0504a8b264bb..fafb42fdfbdac1c9aa08fb470e7dd84c93d1019a
GIT binary patch
literal 3083
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
ZK;5g4+pBk_6SS>H0000000000005Wn%h><`
--- a/mailnews/test/data/smime/alice.sig.SHA384.opaque.env.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA384.opaque.env.eml
@@ -1,76 +1,76 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped opaque-signed 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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
-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
-gQAAAAAAAAAAAAA=
+SIb3DQEBAQUABIIBAHSMKtdp1N+HGipEopGMYkW7/PwNQ3CX6hSQjbIV6AihOt9P
+bX/t6ySafwz57Dd4quYOefeJfqh2gB1tqIfT0Z6WZMe/FTF2LUtp5G29xS/JUM5z
+GwZObf8ohF3Omax8Wh/PKHdk3QTxPM0KG/9SD4io80TtFsmM06g3bQvHfXZXbstw
+aYiNt5WJCLcSELLzzVoA1uwnHy2aBVsgS8FVKAsbK39NXw98ElaaVt8cFzWGEPHE
+riAVvNMeUTTK1dJNH0vYat1XqDEyhQ1+oSFuRn4+bJcqkfWOGT1qpWxH94y9Md3P
+BGtCYngroOWSgYTN8ursrE41zG8rm+4nUb0aJAAwgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQCCFIyg+JA2e6KOJoW9C9maCABIIKIJzsV8zIU7U8kPfjVkuQp2j3
++PvqYBpC7deIll3MUNgfSLcEo+5Ckr5jrcYeoQ//Mdh4IjQBmW/lNHkcLuKeevuz
+hH008H7wiRvpAchsxVR9Yv+z4K9G56v5wckzzBjZ3ufwRGqy8p9tFkiOyc77CvGj
+WtsTWBf/qTPtPARQXALuOniobz8V1/j5jFo3jvC4gNYDdnhsT+dhYl86dkllPzGo
+RrlOmkaOc5vpDr8RcvOgf1R0zD17mhR57kAifuLQS9lGuOZQsi7XaA1uWknRWC3Y
+4zyGRVTHY2xI4b0BXJV7RDcthwBat9E/8AAQiipnl1taFOEBWDNI5okGXoUk1iCk
+USBpc6CpsGNXpn3CeynhQ5ZqSnbe6cD08ygBVWNp9eBzpMoqoTfTOw0ZsGDNOoiy
++ns+ooa6k6VpYgXtnxB+2Tyztw3cC19zhB+h+3IpnLX3Q7gvSlg6+cwfmHjZTxZU
+/4WdR+V7feF0qJjPQKREcF0EIxH5MVToO0bHa97TTwTCnyrjK60ZH9mH1uKiZB+o
+6OFDsVub1Il0o0wxVtTyB05rcZDspFlrNM6hAle0odaOEsCL7q9FjwbkLNmKuR1y
+4eMx3Kb3e9J18V+twc/gHuRmPoOQXGwj1uEIZ9Z1+BKHNaF/jjPbBXXO8m9wDtnq
+QFnZ+VPrIWvvvSiBOfO3J86hPlc/nEwRbleFFWNbtfrr7LpA7w3cjQy8QcCpdTA6
+/GmSGW4DereETWR1lpUiaQkvzLoQk26PZzrt7xYbugxi45m41A+JlIhgF11V24i3
+Y8PqnZLaFhvJAKbaBkUQ2gJdT1VX6oZCirEMfpHaZx07pR59ro0WcT5wS6UMmqXw
+i5lkGSa81hSsVgvzHi/MTMi6d/ZnE55yP6++5J+JNDEMXGF6CGPWAfO54iNEdL/K
+nHXkoMt0d+13Q6BaeXMRBD/YBciW0T8UcQMM3pZxpwCz0ym4tVZWu33hRJzvv0XL
+EKZRLe2xD+1HZsVwy0y3NRUttda5xE5W3Mu6vu1GsF3nvVqe55qlTBxdE6ihdMDL
+bWQlb0IXS5OTxkIiNHzUOerDRTa+5Z/6KS9fkrTGOnxbG7mxNPKvwLWY0qK8f8tq
+aasP14/5+uLt0y2pZQat1oqszz/OmD4wR8Lsq/CU1elIgtYJI9AjmmAS+9/JetGF
+BbmzjVo1lOtxOCtAWeyJYuShysLTdWUDssqY5yb/KfWWwqojFRQjYWn+LVxBforl
+zb+Wb5sGjJalJluSuYYkbZDLZQW+D4K/6DQ8mTTx29v/VL2qth3i7DzvCR8y4/Di
+NlLM6TAW+4SxBxMlauXZmn15bxM8tynXna2BI8ES/X+XAJZqvlWZDGfBklaluh6v
+X+74wpBFabrte2ZPzDcuYwFsqR+b/BlAWA71JmubcoS0ydBoq3BU4B/rFxLMMib2
+u+PlJ24TbTRDUSfySswu8ln/SJXoIiKxXZIELJVZ/ZB36XJW7dbEDvXVP9nsnBN8
+meGP8F0aD9HF84l6TUVGQsgYciTLWz3hxyuBOKQWTDNNB4I50nl3q6OgdmQQKw3z
+fKmtcepsExKrmvQWsYBGNPofFFYh7gw/WCiDdYBA17uJEYIsML0I4T1UWqXwo+fn
+MP/G7bmDWQVP1y4xLywHneaTQEhcZuA6tUfN3A7TUwUK1rwlZS67fGjB9+5VMJz0
+PtHPmstdJv1epgFNS9jWE1WBO47lpbFxku8N7dm9hwrJO4zg3COmJkX6LjIu8p9G
+iADqcsfXp2H6FZUx51eSc9CeHv6NY9ekr47Zj3qbaRCy9MOuxTJYotIsFex6TCdr
+BaN1aHzmEeUgdLUJoyiJds4SE258po2dyD3El5HaQ0qPOfSZmTZN7A2HU8EaA1+D
+Iysc+GngNWOdyYoKXDbiyA+qTDVGe9Gv8wQfTR7uKb2Ot8nZF6ZnxCKgkW5IxRZd
+IBZ+0U6UzWlwocJWRrOcp/P2zmJ/TkA7uEx1QG5RWOLJFg2cEta/GjYJyq0odzeU
+XK0lty6BisL8NmRecIZoRAAw4tUo9P3urFdhz4/bfO75CNW3HebQW9XK9unlMfv8
+9Mtf5tLiY/vXIsNf8xbvXBye1clO5D0MCJV4AaXSM9nFyOqilR57k6k6D4qT+xJc
+OrN30d57bBaDlou85A+gAuGKNK1EFTdKqkA2uzw/5f+6uPJwB8m6XQ1udA4Tu8fI
+GaxipFOGe9U1+/61v49V9tYKZuI5Fv2+3feta7wIrZI5/xQDJ7CLPw82YJw1pFX/
+Xytos8bDKeLhgtJwcapzkTvEkpZmJA7o9gKuiC1zir7s4pNO3CJIaiuPvWkd6Ymt
+vYVlDvvmgES4K0Wvxy3i8lOK0IpbX9SXwDvw3eqwUcr/dQD4ftXysQwkdMqoaogR
+9ySvoaNz+3Nn1LNZxdejdOXzscYEzTVQjXNKEKiKb2+TyQepRBdigzsp7SlkLWkx
+NT1Xr0A4ecE0fVy6Jl79V5UT1xzKRAajE2afYtIdSPzyW0bSQ7dRrF7zynDZL7Et
+0Z2xaco8umzQn5gVli1SgabOj952K5jMaNqc7OexOM1x+D6YDqnB5JHQEcT8vKQJ
+KXtk6nAya6XCDeesI3035IMd7fYXMop3xNMYWsJTvCmRY0mA8uWj+M20DX7ErbWY
+F1y0RhOi6dNTai0mAoBdvwRsEOr233iqSfGvkdTaU/o5KSnKzzVrxnunSPEVjjw/
+8e6cMJ4GEpspWfLcDQy0TQghABXRGjnJ9zLxr3Ewyp6+rINnDDhcEJazfznF0c3R
+xuJWMOGKL0UvlPJUEhWrVzqoXwHG7t4t6+s4LZ8oJjW2me4b6JnMorurH4nNi0v0
+MAUCIyV8VhRLpT4BESjdpyqnqpw4TsOttXrcL1uC4yUHzepiDt8cfR0jEFtXY/If
+yWoyqL9FGcsGTkPQaTe9LJOZkd3GwjLevzuviQzhFm4d/pu+GO91ySWpJspoIpYc
+ZCCRpufuTvCxyx8ft0EFLo0LxzDTjojfBc0p0au/+IaGZRK3JNjBoT/h6aOSOr5V
+s1lHD271HLOV+yFwpEvvwJAmoniVLQQNaZMxsRp9lYZR9Q3ZpG5ju9coVlYx31s1
+n3FZvF8vR6hXGw68nWDSnlm87lxRHEzOLRPzScnG6+dhjsopdGwCfaDKGDargejr
+fifrBOrN6oAffAUJR9g2oyJMZLfVpG2bHkOOdg91EXne0qS6UFO2A3oXvsH/T2R9
+t6WSXfCd/vpRF0h4UqYu64hJ7LfTO9qfSotj6qKbcClnpDmBTY2L3gaQqOI5ZDRl
+gmL5k2GAji6IW4D3laMuw3zIvb6+wTdlDKeSnLQQVvFuKhqqLnIspWsk2z//+l7+
+GJ3yv5JVJ8MZVDc1/xhkucSVVGf4LWE1YI5xJEsFUI9kKApe/YtxlfnDu5xhafHG
+Fl2zhbLv4P9k2LFEND4WXaq7PGggx1VHNRzgNNB52QQQ3x3VGEDdq4/bq3elE7St
+RgAAAAAAAAAAAAA=
 
--- a/mailnews/test/data/smime/alice.sig.SHA512.opaque
+++ b/mailnews/test/data/smime/alice.sig.SHA512.opaque
@@ -1,43 +1,43 @@
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 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
-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
+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
-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
+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
--- a/mailnews/test/data/smime/alice.sig.SHA512.opaque.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA512.opaque.eml
@@ -1,48 +1,48 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: opaque-signed sig.SHA512
 Content-Type: application/pkcs7-mime; name=smime.p7m;
     smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=smime.p7m
 Content-Description: S/MIME Cryptographic Signature
 
 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
-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
+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
-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
+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
 
index 836a7a51cfed47367f02e0ae0a71fa46ff9f220b..b3ceab836d5e12e6e2ceaafa3a739d603af43796
GIT binary patch
literal 3115
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
F0036a#K`~v
--- a/mailnews/test/data/smime/alice.sig.SHA512.opaque.env.eml
+++ b/mailnews/test/data/smime/alice.sig.SHA512.opaque.env.eml
@@ -1,76 +1,76 @@
 MIME-Version: 1.0
-From: Alice@bogus.com
-To: Bob@bogus.com
+From: Alice@example.com
+To: Bob@example.com
 Subject: enveloped opaque-signed 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
 
 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
-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
-EM4fq3v3jIkuwpN3UB6BqRYAAAAAAAAAAAAA
+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
 
index 082fc0d9d6d54da917ecc25dd77360fda14efac9..abf83fb6320f6ddea526f84416393170c12082a8
GIT binary patch
literal 1722
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe+klgeRhy5QNs5)h07(Jkf(Dfa7I)|Typq(s
z65Wu>f>bMolGKV4{eqmt%sgH$UapXg%wh!~N(71*mnh_>78fU`rz)fs<>x9m=42+P
zDwO0aIOQkl@p3VM!Gb2{B!edAID;l8w*|~hj7&_7at6F`I~lowPDlZ}h&hynO_(V(
z*ihI&5X9jS=5kKV$xO>H%F9eN6f+P339<|G`sSDBl>nWi5SE!*ZYX3R021dC=5+FR
z4-HoE3l26EF%SZYF$;48c?uyQhdMhN$cghBS{j%e7#o@!8yJ{JiSrtnAaM;E8>s9I
z1p_&_KRFr21i|6skXn(LTac5gmz<w#$Y;O<aVRTT&Y+1=2{~*SSs9p{82K51;#^Ek
zjEoEq;`viG?|L;q3^*(s>Mx@hHO*euz4`H!bo0xTci;bb^Mhql*0z>k*6&>Fd%sQi
zcB0Hk?Oxucs$Mx3-JGkr#<$#zxBL|4Hd)H}S>gY*Bg>p0gsM*HtL;8^Opm9ec-{UB
z^H~*sPA^c1%DH{{j`q=`j?cPG&%d7CD$y!(^L|H5Ap37e)*#1e8*L}7n=kQimH*@`
z%Q`ggpW@gQ{!K9a<hEnRQ!ZZ++vvC=c3ZSXrst<w85t{i@2kuaRFLc5CjacJ@p}!w
z@cv~ly1tn(I~;2X?M=(^+hfX^eesSlySd@Y1!t!h&YNe-x`z8@q`~Tt%?H%A6vTS2
zxkd$cAKSpV^g&%AI}<Y_10!1MVFm?^$?pj*l26lYHhWHHIB0+1{JFO09rc_3o&A$>
zCGU1u=dKTxxAWVh-!&Suh5gvR-zG|Vuk$4*3+{)F&U;oq-lBgaYx5)P^6kzylBOI<
zEqi(7YG;k^jjHQrXLbIc)MI?TpkZ@%Vr4?xk6UXFFkJ6kxh?p&zfrzGQoyv-)!AS4
zpKQz7{Ls58`r2U+C*6Z{_Qn6JOkbvZd1D5*{7v5*3ik}w9(c86mJnOb(hD|AiY}g+
z*nBJTN@n$y<e%Bo_iaq9-mtRMlaGJPo_^uKe+9WWy4#vZub7s+>)QKec`jL{pIw9g
zulsxB%rWEl>#i@)olt+}$<NO#19x-mz44>|-o8^;^EUC68a6SV1m>`#z}#(+NuT@#
z%EyReWI+?7seuF{xicGbBb6%#$_N=2LopT+t7!+)tr++H>h^To?6HTz``=CfF9sEC
zoZ4)RER0R&0xX8v^z=s+8#l~(0!-Y7*$e1sH)?)oX<}qBw+h>pBrn6pX2{i<oy6J_
zqLRn>ouBvoqWFzmPvydRHgf9!TdrI3{Ns+@r%oOYN?%d%yXd^=!&hH6-go%%H0{mK
z*3y;JuB)WqyD!0WB5j89{ZQApOLpFFc(to{(+wK~ucBU+yO*YjRyoae*c#^6-1>XB
z&HmbDk8;x&Wbf)J(1|^E`?AB5tLaK!#%m51I=Qb&yVkp$k;m9*vQY2I=(rzSswSON
zn`(BL@0m`XrA{(Oc*_hU;V=7FbN_YKoOPpOnbL2o43~P-bNiAe9usSyC@3p4X{)Xm
zQ_r@l>q|A##BQ#c(o=tXQ{D9()rvFv?<an(D7$fZ)q%gR6JOlz*j&7F>q$t(0RZi~
BUqb)@
index b1533f50e67ef5a4e7934fcbe4fc911139654c15..78e35b5dea159cebca1afc39f298516ff454c632
GIT binary patch
literal 1742
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiIJ7T07((!f(Dfa7I)|T
zypq(s65Wu>f>bMolGKV4{eqmt%sgH$UapXg%wh!~N(71*mnh_>78fU`rz)fs<>x9m
z=42+PDwO0aIOQkl@p3VM!Gb2{B!edAID;l8w*|~hj7&_7av&!_?PTNzIw8f7+klge
zIh2J>m?<>aP}o2a#NiO;a!$<2Ov^9I%S<#BGY|m@vJ3P2=9lJ`0G*={mYG^^C}bc2
z66X@;bn<r(4OZ|A4mK1q5CVxY3v&Z`3LzkeIy)N3iSrs-8kidx8=4y%7??+i^BS2T
zaSa+9sO$^{139=qIT^(S!QtbOT9KGrkdvyHoS$pRXTSq-C@WabpovilIc$K@!`#Hk
z&j1wXVrpV!WOxwIpQ?G+tNCHTVcAfB8O5k+_OkBHkEf)YU!J`C{>PgiER(XfwfwSv
z=UU(UZNj$`WkzcE@-9{N%CYF?T+KDU<z~F)rzp3{QpV2;|EC>U=KLU3bwXcl_pxJo
zJSD~J_FtIKs_=7qfkITy?aOzxj~;b=)@6GB_3T!OR*{?cJ6ZzSe><`UIZoSXJ7L{?
ziGQp7Ctq3Cp?Uul$ENUag5f8(9W$PC`GVL+#}%>LqAfB#Kh4U>Sjl@|WsabNT=zEl
zXIG8iYxsrtFMHAT&4k(ESW9ScT8`fyQ_k#*cZ}K14OcEWJH2q;JX6*++%F>yR)=gp
zpsuAL)^p7@DzN+52F9fi>I&JJm>C%u(NYgHC}2!}PiT>Rnr5@vb27t0`vd3CwLR~s
z-}LY7pNuPcx4SxbeW<*h-yZ$0(U>jl$M*d;QObLrFF9FoKWuc~v-0s4{To@EA6b`g
zcfOG{<w$DT%Oh7iYjkf^T{k<c^Z%qC<Ld<to3j%u6WV^<T62Kmdgsb*!N2{D@&%Ft
zrlqdV{-Xb6Th8W(-c8Zh4tqH19-Ol;{$FMKGTqA?Gq~k%`rc5uXR!9bt0l99*lLzu
zuvt=c@yx{LTZvaPtFI*g%$~k)V`BA&m7Sh^{9E?)3;+Eq$i30s);xN}wB%ja-Y?5@
z$twNq8uWkN-y3I+8NXk5eR=ML`YTU<eqI^4n`7^dANBY4ow}O0iKo=CiRmUVhg}8c
zaDz<x<R@r8Mk-1cG%-3FNFb6tvmrN9*<zrNkYO=YVo~U16cLc=NL$7oS+j17t?S<l
ziQ8&SRxQ}r{mlQj{VMJ?1{G|a+H8z0j7{bOEQZ<i^j8%dH_WL5Ox%Xq3+NlBNco?o
ziIG8Id*iv(OBQQ_v$9$K%~-PJvFh_bUh^(iadO|^>~|&oNb||iG{s1%(l*17%`ZP%
zZr!oysP1tk$&Xz}cg=ZwKb}*1!H1Jv?w__F*mCN~BE>GRcBW~J^Iggl{_6D}{_5nt
zqwJ-u%CUl!*XLWa76w{g5<Red)7#AGn!8i}F)N+c+5K|)u{$iXldfnVDt*|hUgi3H
z&F3!<)qd(^{fL&%*HTI1pReF@xPq0fMI}Ik)!sq-g23O~u4e+b`%F&z`n!IuLiUZH
z6K6`hz32;`Fs-&A(uHH?Cf|5tPR{IaM^~6%jWK<G&VB!!lKF>^u9f-p*Yl~*$~lvs
V3M4(qxLaez@%Ggv9!^L_0st;8X~6&h
index 296adfea2bb01d70169ec4086c477ab7ec860d66..f887be3a11f3d8abeb6871e6312e9f61357f73ad
GIT binary patch
literal 1758
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiHViL07((!f(Dfa7I)|T
zypq(s65Wu>f>bMolGKV4{eqmt%sgH$UapXg%wh!~N(71*mnh_>78fU`rz)fs<>x9m
z=42+PDwO0aIOQkl@p3VM!Gb2{B!edAID;l8w*|~hj7&_7av&!_?PTNzIw8f7+klge
zIh2J>m?<>aP}o2a#NiO;a!$<2Ov^9I%S<#BGY|m@vJ3P2=9lJ`0G*={mYG^^C}bc2
z66X@;bn<r(4OZ|A4mK1q5CVxY3v&Z`3LzkeIy)N3iSrs-8kidx8=4y%7??+i^BS2T
zaSa+9sO$^{139=qIT^(S!QtbOT9KGrkdvyHoS$pRXTSq-C@WabpovilIcykN8JL?G
z`5A!XTue=jj0_Lr`BOFTdNn@`I4m3LFQXVW&0f~M`SFx=^UITW-~V{?gJn|Iww7Pk
z?_BG9zfJgdqRdF`Uf!juUO5)soU6IUx7>`k{1oLjS<3iX;s3NF%bXvCs!r&u?LKx)
zkEf(~-Tn*nSrvXxFHnfexqbPL_R*t`&$>*{zn<MH(JFHDen(3n`)^0qAjfGNZ6~ao
zFY#}c|KuynIyCQ};@A}aO)&iAwqwRqE?*Ga=(r+wTeL-{=cid287q13tIQEpkn7$i
z|Lm&qdkw$v{$($^zL_vP9BT>fP0R7yW6GI*@s2UOx#7wMXQvm=n`g?phWllt!RnCB
z2h_C`#Coo|Mg?{s+rYT=L0us`6Eh<NBU<WV1_g}C?+GoEPt$BRdroFJXn)}RxwhvW
z^_%{k{gZJe?{-(`t`C*B^V_4}H5#*p{n)<WCQ5m)^Cc$>?uU)edsaT)qJJZ6^CRo>
z?anunrW{EvdwJw)XN~TSs_SNFb^f2!V|=}!VRLq3WkTDJTWbz5T<=`DE%>*;QNBP@
zz_irW*<bXZY|GjF(7P%6+F=hT-Gg)X#s8~JU#5F`V+ObUP2U>|_YBq^c(r7f5L?aC
z3pPuNE}og#d@J!vX7!cipV`y*ZA`4*u(H#WkAKUae&N4=1-Uo6+nPtOn3lZj+WTdB
zE?K3YU4#Cw`+MWeG2{2^t}oA>P=Dpg&(A9ZcXRB$@uU9UzEfB8Hu01iHZi>f=CG&0
z9Bz<FpZo;P$4EuVf+og50|`WuXEx+UDq9Tf5i%@>Ml1#=E>+YYF*DhIt>(dJyWS~J
z{xhFqTCuRl`Tq^Aqh;H_{gkpX2;MIzmcD_pWkIlLqn$wo8>coKBMW1bxd4k{Ha-1W
z#l{VDx&RZmVfF(0hA~okz|zFX5V`+om~;3^_X(5L@*~vSN>6T|D!s>Z>D26kbM}t&
zv%VDV_`#{&vBT|Jk~V9~l<?QD`?UF&Rev!ljQ#a|;*{O<{mZ5-U23#&Cj+nTyTmvr
zc@xodNdgrKty+GcI<n+mZCz&Qf3J66!1^D3zhl3--l%%gt)FbRZcp_Ouad9V8@O)v
z$mrhEaoBKTvz*^yqd(U-`EtkxJ{9~gX^@gMbM1yr8BdsB=smG>dpi4@e5g-ZO=$I`
z<GX_sPn}_0err#tqUGsm|LPT+bi#wf^!%ECO+TKtt=G6wx?`ofY2Mq|pT1$tp7Pc1
lt2YT>;o`IQN>?ur)R+F?d~vGl^=+4LEZDuCu>?}F002b|Y@YxC
index d946336670a89af0f7e7ed55a0255b5188e5bc4a..114a61db5007edb81682b67f0adbb2f263a07271
GIT binary patch
literal 1774
zc$_n6VB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiJ6tb07((!f(Dfa7I)|T
zypq(s65Wu>f>bMolGKV4{eqmt%sgH$UapXg%wh!~N(71*mnh_>78fU`rz)fs<>x9m
z=42+PDwO0aIOQkl@p3VM!Gb2{B!edAID;l8w*|~hj7&_7av&!_?PTNzIw8f7+klge
zIh2J>m?<>aP}o2a#NiO;a!$<2Ov^9I%S<#BGY|m@vJ3P2=9lJ`0G*={mYG^^C}bc2
z66X@;bn<r(4OZ|A4mK1q5CVxY3v&Z`3LzkeIy)N3iSrs-8kidx8=4y%7??+i^BS2T
zaSa+9sO$^{139=qIT^(S!QtbOT9KGrkdvyHoS$pRXTSq-C@WabpovilIcykN8JL?G
z`5A!XTue=jj0_Lr`BOFTdNn@`I4m3LFQXVW&0f~M`SFx=^UITW-~V{?gJn|Iww7Pk
z?_BG9zfJgdqRdF`Uf!juUO5)soU6IUx7>`k{1oLjS<3iX;s3NF%bXvCs!r&u?LKx)
zkEf(~-Tn*nSrvXxFHnfexqbPL_R*t`&$>*{zn<MH(JFHDen(3n`)^0qAjfGNZ6~ao
zFY#}c|KuynIyCQ};@A}aO)&iAwqwRqE?*Ga=(r+wTeL-{=cid287q13tIQEpkn7$i
z|Lm&qdkw$v{$($^zL_vP9BT>fP0R7yW6GI*@s2UOx#7wMXQvm=n`g?phWllt!RnCB
z2h_C`#Coo|Mg?{s+rYT=L0us`6Eh<NBU<WV1_g}C?+GoEPt$BRdroFJXn)}RxwhvW
z^_%{k{gZJe?{-(`t`C*B^V_4}H5#*p{n)<WCQ5m)^Cc$>?uU)edsaT)qJJZ6^CRo>
z?anunrW{EvdwJw)XN~TSs_SNFb^f2!V|=}!VRLq3WkTDJTWbz5T<=`DE%>*;QNBP@
zz_irW*<bXZY|GjF(7P%6+F=hT-Gg)X#s8~JU#5F`V+ObUP2U>|_YBq^c(r7f5L?aC
z3pPuNE}og#d@J!vX7!cipV`y*ZA`4*u(H#WkAKUae&N4=1-Uo6+nPtOn3lZj+WTdB
zE?K3YU4#Cw`+MWeG2{2^t}oA>P=Dpg&(A9ZcXRB$@uU9UzEfB8Hu01iHZlDK=CH58
z9Bz<FpZo;P$4EuVf+og90|`WuXEx+UDq9Tv5i%@>PAm?#wGl6`-_eh-Kl1q<WAlW~
zkM`HCSQ~yi@89X?FOQoE_=*U|+f*OYnS8$U&+^FCb)GAC?dI={aaeL|Tc4xUx%oN<
z6>OZ^Y>X_7P38hDhS~J=cNH5q%qs#++=kf;=o{up<pWC-Bg3MXclU~Me*O4>G5E!?
zb&i|<3SN93wpQUveYNXhrnV1t57n8)wq!2|c_31&v24mY`2{wdt6oiJyk?~uT>brw
z{I;iSV(lu<xe9g2n(NJ0)!+56fl2BYXIg9B+8G-+Dg{VA_2~>K2w(W<`)~8DLXAwn
zJ_<iM{P0cWg&F!T_S>S^W0rrm=l%E3OWNQdcTz2*SVsDGl|^+iN5AgXULVW<GWPm8
z8O^5)Z9b|#J*}BL-ArmJlfTC%&Ac<uxmWC0Zhs*3!oz0am%uE|2RbMBDLj2*Uc@1s
zqQ82z>?fl&K9Wlx>Ac!_K5uj7^OU_s_UX!T=4TEDU(2|7<B;HomIoQkhaYYJ52<JX
Ddun<2
--- a/mailnews/test/data/smime/expiration.txt
+++ b/mailnews/test/data/smime/expiration.txt
@@ -1,1 +1,1 @@
-Sun Feb 18 09:25:46 2024
+Wed Jul 03 17:30:07 2024